Merge pull request #9 from nginxinc/ag-update-tests

Updated test workflow to verify both single and multi file configs

Author: agazeley

.github/workflows/testNginxForAzureDeploy.yml

@@ -7,7 +7,8 @@ on:
 
 env:
   NGINX_DEPLOYMENT_NAME: githhubci-test-dep
-  NGINX_CONFIG_FILE: test/configs/nginx.conf
+  NGINX_TRANSFORMED_CONFIG_DIR_PATH: /etc/nginx/
+  NGINX_ROOT_CONFIG_FILE: nginx.conf
   TEST_RESOURCE_GROUP_NAME: testenv-0da38993-workload
 
 permissions:
@@ -20,23 +21,43 @@ jobs:
     steps:
     - name: 'Checkout repository'
       uses: actions/checkout@v2
-    - name: 'Update config'
-      shell: bash
-      run: |
-        sed -i 's/000000/'"$GITHUB_RUN_ID"'/g' $NGINX_CONFIG_FILE
     - name: 'AZ CLI Login'
       uses: azure/login@v1
       with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-    - name: 'Sync NGINX configuration to NGINX on Azure instance'
+     - name: 'Update config - single file'
+      shell: bash
+      run: |
+        echo "RANDOM=$((RANDOM%10))" >> $GITHUB_ENV
+        sed -i 's/000000/'"${ env.RANDOM }"'/g' tests/configs/single/nginx.conf
+    - name: 'Sync NGINX configuration to NGINX on Azure instance - single file'
+      uses: nginxinc/nginx-for-azure-deploy-action@v0
+      with:
+        subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+        resource-group-name: $TEST_RESOURCE_GROUP_NAME
+        nginx-deployment-name: $NGINX_DEPLOYMENT_NAME
+        nginx-config-directory-path: tests/configs/single/
+        nginx-root-config-file: $NGINX_ROOT_CONFIG_FILE
+        transformed-nginx-config-directory-path: $NGINX_TRANSFORMED_CONFIG_DIR_PATH
+    - name: 'Validate config update - single file'
+      shell: bash
+      run: |
+        wget -O - -o /dev/null http://${{ secrets.NGINX_DEPLOYMENT_IP }} | jq '.request.headers."Github-Run-Id"  | test( "'"${ env.RANDOM }"'")'
+    - name: 'Update config - multi file'
+      shell: bash
+      run: |
+        sed -i 's/000000/'"$GITHUB_RUN_ID"'/g' tests/configs/multi/conf.d/proxy.conf
+    - name: 'Sync NGINX configuration to NGINX on Azure instance - multi file'
       uses: nginxinc/nginx-for-azure-deploy-action@v0
       with:
         subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
         resource-group-name: $TEST_RESOURCE_GROUP_NAME
         nginx-deployment-name: $NGINX_DEPLOYMENT_NAME
-        nginx-config-relative-file-path: $NGINX_CONFIG_FILE
+        nginx-config-directory-path: tests/configs/multi/
+        nginx-root-config-file: $NGINX_ROOT_CONFIG_FILE
+        transformed-nginx-config-directory-path: $NGINX_TRANSFORMED_CONFIG_DIR_PATH
     - name: 'Validate config update'
       shell: bash
       run: |

test/configs/multi/conf.d/proxy.conf

@@ -0,0 +1,8 @@
+proxy_set_header Host $host;
+proxy_set_header X-Real-IP $remote_addr;
+proxy_set_header X-Proxy-App app;
+proxy_set_header Github-Run-Id 000000;
+proxy_buffering on;
+proxy_buffer_size 4k;
+proxy_buffers 8 8k;
+proxy_read_timeout 60s;

test/configs/multi/nginx.conf

@@ -0,0 +1,19 @@
+http {
+    upstream app {
+        zone app 64k;
+        least_conn;
+        server 10.0.1.4:8000;
+    }
+
+    server {
+        listen 80;
+        server_name *.example.com;
+
+        location / {
+            include /etc/nginx/conf.d/proxy.conf;
+            proxy_pass http://app;
+            health_check;
+        }
+        
+    }
+}