Update root file path handling

Author: bangbingsyb

README.md

@@ -37,9 +37,9 @@ jobs:
         subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
         resource-group-name: ${{ secrets.AZURE_RESOURCE_GROUP_NAME }}
         nginx-deployment-name: ${{ secrets.NGINX_DEPLOYMENT_NAME }}
-        nginx-config-directory-path: config
-        nginx-root-config-file-name: nginx.conf
-        transformed-nginx-config-directory-path: /etc/nginx
+        nginx-config-directory-path: config/
+        nginx-root-config-file: nginx.conf
+        transformed-nginx-config-directory-path: /etc/nginx/
 ```
 
 ### Sample workflow that authenticates with Azure using OIDC
@@ -79,7 +79,7 @@ jobs:
         subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
         resource-group-name: ${{ secrets.AZURE_RESOURCE_GROUP_NAME }}
         nginx-deployment-name: ${{ secrets.NGINX_DEPLOYMENT_NAME }}
-        nginx-config-directory-path: config
-        nginx-root-config-file-name: nginx.conf
-        transformed-nginx-config-directory-path: /etc/nginx
+        nginx-config-directory-path: config/
+        nginx-root-config-file: nginx.conf
+        transformed-nginx-config-directory-path: /etc/nginx/
 ```

action.yml

@@ -11,17 +11,16 @@ inputs:
     description: 'The name of the NGINX for Azure deployment.'
     required: true
   nginx-config-directory-path:
-    description: 'The NGINX configuration directory path relative to the root of the Git repository, example: "config".'
+    description: 'The NGINX configuration directory path relative to the root of the Git repository, example: "config/".'
     required: true
-  nginx-root-config-file-name:
+  nginx-root-config-file:
     description: >
-     'The root NGINX configuration file name, example: "nginx.conf". The root file must be in the NGINX configuration directory 
-     but not in its subdirectory.'
+     'The root NGINX configuration file path relative to the NGINX configuration directory in the Git repository, example: "nginx.conf".'
     required: false
     default: 'nginx.conf'
   transformed-nginx-config-directory-path:
     description: >
-     'The transformed absolute path of the NGINX configuration directory in NGINX for Azure deployment, example: "/etc/nginx". 
+     'The transformed absolute path of the NGINX configuration directory in NGINX for Azure deployment, example: "/etc/nginx/". 
      If the "include" directive in the NGINX configuration files uses absolute paths, the path transformation 
      can be used to overwrite the file paths when the action synchronizes the files to the NGINX for Azure deployment.'
     required: false
@@ -30,5 +29,5 @@ runs:
   using: "composite"
   steps:
     - name: 'Synchronize NGINX configuration from the Git repository to an NGINX for Azure deployment'
-      run: ${{github.action_path}}/src/deploy-config.sh ${{ inputs.subscription-id }} ${{ inputs.resource-group-name }} ${{ inputs.nginx-deployment-name }} ${{ inputs.nginx-config-directory-path }} ${{ inputs.nginx-root-config-file-name }} ${{ inputs.transformed-nginx-config-directory-path }}
+      run: ${{github.action_path}}/src/deploy-config.sh ${{ inputs.subscription-id }} ${{ inputs.resource-group-name }} ${{ inputs.nginx-deployment-name }} ${{ inputs.nginx-config-directory-path }} ${{ inputs.nginx-root-config-file }} ${{ inputs.transformed-nginx-config-directory-path }}
       shell: bash

src/deploy-config.sh

@@ -6,15 +6,15 @@ subscription_id=$1
 resource_group_name=$2
 nginx_deployment_name=$3
 config_dir_path=$4
-root_config_file_name=$5
+root_config_file=$5
 transformed_config_dir_path=${6:-''}
 
 # Validation and preprocessing
 
 if [[ "$config_dir_path" = /* ]]
 then
     echo "The NGINX configuration directory path in the repository '$config_dir_path' must be a relative path."
-    exit 2
+    exit 1
 elif [[ ! "$config_dir_path" = */ ]]
 then
     echo "The NGINX configuration directory path '$config_dir_path' does not end with '/'. Appending a trailing '/'."
@@ -26,32 +26,40 @@ then
     echo "The NGINX configuration directory '$config_dir_path' was found."
 else 
     echo "The NGINX configuration directory '$config_dir_path' does not exist."
-    exit 2
+    exit 1
 fi
 
-root_config_file_path="$config_dir_path$root_config_file_name"
-if [[ -f "$root_config_file_path" ]]
+if [[ "$root_config_file" = /* ]]
 then
-    echo "The root NGINX configuration file '$root_config_file_path' was found."
+    echo "The NGINX configuration root file path '$root_config_file' must be a relative path to the NGINX configuration directory."
+    exit 1
+fi
+
+root_config_file=$(echo $root_config_file | sed 's:^\.\/*::')
+
+root_config_file_repo_path="$config_dir_path$root_config_file"
+if [[ -f "$root_config_file_repo_path" ]]
+then
+    echo "The root NGINX configuration file '$root_config_file_repo_path' was found."
 else 
-    echo "The root NGINX configuration file '$root_config_file_path' does not exist."
-    exit 2
+    echo "The root NGINX configuration file '$root_config_file_repo_path' does not exist."
+    exit 1
 fi
 
 if [[ -n "$transformed_config_dir_path" ]]
 then
     if [[ ! "$transformed_config_dir_path" = /* ]]
     then
         echo "The specified transformed NGINX configuration directory path '$transformed_config_dir_path' must be an absolute path that starts with '/'."
-        exit 2
+        exit 1
     elif [[ ! "$transformed_config_dir_path" = */ ]]
     then
         echo "The specified transformed NGINX configuration directory path '$transformed_config_dir_path' does not end with '/'. Appending a trailing '/'."
         transformed_config_dir_path="$transformed_config_dir_path/"
     fi
 fi
 
-transformed_root_config_file_path="$transformed_config_dir_path$root_config_file_name"
+transformed_root_config_file_path="$transformed_config_dir_path$root_config_file"
 echo "The transformed root NGINX configuration file path is '$transformed_root_config_file_path'."
 
 # Create a NGINX configuration tarball.