Merge pull request #38 from nginxinc/ps-dev-swagger-version

Use latest service swagger; Add deprecation warning for certificate deployment; Only output conf when debug flag is set

Author: puneetsarna

github-action/action.yml

@@ -13,6 +13,7 @@ inputs:
   nginx-deployment-location:
     description: "The location where the NGINX deployment is located. Example westcentralus"
     required: false
+    deprecationMessage: "This field is not in use and will be removed in a future release. Consider dropping it from your Github Action configuration."
   nginx-config-directory-path:
     description: 'The NGINX configuration directory path relative to the root of the Git repository, example: "config/".'
     required: false

github-action/src/deploy-certificate.sh

@@ -143,8 +143,8 @@ do
         )
         if [[ "$debug" == true ]]; then
             az_cmd+=("--debug")
+            echo "${az_cmd[@]}"
         fi
-        echo "${az_cmd[@]}"
         set +e
         "${az_cmd[@]}"
         set -e

github-action/src/deploy-config.sh

@@ -133,8 +133,11 @@ echo "Listing the NGINX configuration file paths in the tarball."
 tar -tf "$config_tarball"
 
 encoded_config_tarball=$(base64 "$config_tarball")
-echo "The base64 encoded NGINX configuration tarball"
-echo "$encoded_config_tarball"
+
+if [[ "$debug" == true ]]; then
+    echo "The base64 encoded NGINX configuration tarball"
+    echo "$encoded_config_tarball"
+fi
 echo ""
 
 # Synchronize the NGINX configuration tarball to the NGINXaaS for Azure deployment.
@@ -174,7 +177,7 @@ az_cmd=(
 
 if [[ "$debug" == true ]]; then
     az_cmd+=("--debug")
+    echo "${az_cmd[@]}"
 fi
 
-echo "${az_cmd[@]}"
 "${az_cmd[@]}"

github-action/src/nginx-for-azure-certificate-template.json

@@ -42,7 +42,7 @@
   "resources": [
     {
       "type": "NGINX.NGINXPLUS/nginxDeployments/certificates",
-      "apiVersion": "2021-05-01-preview",
+      "apiVersion": "2024-11-01-preview",
       "name": "[concat(parameters('nginxDeploymentName'), concat('/', parameters('name')))]",
       "location": "[parameters('location')]",
       "properties": {

github-action/src/nginx-for-azure-configuration-template.json

@@ -26,7 +26,7 @@
     "resources": [
         {
             "type": "NGINX.NGINXPLUS/nginxDeployments/configurations",
-            "apiVersion": "2021-05-01-preview",
+            "apiVersion": "2024-11-01-preview",
             "name": "[concat(parameters('nginxDeploymentName'), '/default')]",
             "properties": {
                 "rootFile": "[parameters('rootFile')]",