use tarball with protected files

Author: kuthiala

src/deploy-config.sh

@@ -124,175 +124,26 @@ fi
 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'."
 
-# Common utility functions
+# Create a NGINX configuration tarball.
 
-# Function to trim whitespace from a string
-trim_whitespace() {
-    local var="$1"
-    # Trim leading whitespace from the file path (var)
-    # ${var%%[![:space:]]*} starts at the file path's end
-    # and finds the longest match of non-whitespace
-    # characters leaving only leading whitespaces
-    # ${var#"..." } removes the leading whitespace found
-    var="${var#"${var%%[![:space:]]*}"}"
-    # Remove trailing whitespace
-    # See explanation above. The process is reversed here.
-    var="${var%"${var##*[![:space:]]}"}"
-    # Check if the file exists in the repository
-    echo "$var"
-}
-
-# Function to encode file content to base64
-encode_file_base64() {
-    local file_path="$1"
-    # Use base64 to encode the file content
-    # -w 0 option is used to avoid line wrapping in the output
-    base64 -w 0 "$file_path"
-}
-
-# Function to build virtual path from relative path
-build_virtual_path() {
-    local relative_path="$1"
-    echo "${transformed_config_dir_path}${relative_path}"
-}
+config_tarball="nginx-config.tar.gz"
 
-# Function to add a file entry to a JSON array
-# The add_file_to_json_array function uses indirect variable references
-# and global assignment to update JSON arrays and flags that track
-# which files have been processed. The variable names for the JSON array 
-# and the "first file" flag are passed as arguments, allowing the
-# function to generically update different arrays 
-# (for regular and protected files) without hardcoding their names.
-# The syntax ${!var} retrieves the value of the variable whose 
-# name is stored in 'var', and declare -g ensures the updated
-# values are set globally, so changes persist outside the function.
-add_file_to_json_array() {
-    local file_path="$1"
-    local virtual_path="$2"
-    local file_type="$3"  # "regular" or "protected"
-    local json_var_name="$4"  # Variable name to modify
-    local first_file_var_name="$5"  # Variable name for first_file flag
-    
-    if [ -f "$file_path" ]; then
-        echo "Processing $file_type file: $file_path -> $virtual_path"
-        
-        # Base64 encode the file content
-        local file_content_b64
-        file_content_b64=$(encode_file_base64 "$file_path")
-        
-        # Get current values using indirect variable references
-        local current_json="${!json_var_name}"
-        local is_first_file="${!first_file_var_name}"
-        
-        # Add comma separator if not the first file
-        if [ "$is_first_file" = false ]; then
-            current_json+=","
-        fi
-        
-        # Add the file entry to JSON array
-        current_json+="{\"content\":\"$file_content_b64\",\"virtual-path\":\"$virtual_path\"}"
-        
-        # Update the variables using indirect assignment
-        declare -g "$json_var_name=$current_json"
-        declare -g "$first_file_var_name=false"
-        
-        if [[ "$debug" == true ]]; then
-            echo "$file_type file virtual path: $virtual_path"
-            echo "$file_type file content (base64): ${file_content_b64:0:50}..."
-        fi
-    else
-        echo "Warning: $file_type file '$file_path' not found"
-    fi
-}
+echo "Creating a tarball from the NGINX configuration directory."
+tar -cvzf "$config_tarball" -C "$config_dir_path" --xform s:'./':"$transformed_config_dir_path": .
+echo "Successfully created the tarball from the NGINX configuration directory."
 
-# Process protected files first to build exclusion list
-protected_files_list=()
-if [ -n "$protected_files" ]; then
-    IFS=',' read -ra files <<< "$protected_files"
-    
-    for file in "${files[@]}"; do
-        file=$(trim_whitespace "$file")
-        if [ -n "$file" ]; then
-            protected_files_list+=("$file")
-        fi
-    done
-fi
-
-# Function to check if a file is in the protected files list
-is_protected_file() {
-    local relative_path="$1"
-    for protected_file in "${protected_files_list[@]}"; do
-        if [ "$relative_path" = "$protected_file" ]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-# Process all configuration files individually (excluding protected files)
-
-echo "Processing NGINX configuration files individually."
-
-# Build the files JSON array
-files_json="["
-# shellcheck disable=SC2034  # Variable is used via indirect reference in add_file_to_json_array
-files_first_file=true
-
-# Find all files in the config directory and process them (excluding protected files)
-while IFS= read -r -d '' file; do
-    # Get relative path from config directory
-    relative_path="${file#"$config_dir_path"}"
-    
-    # Skip if this file is in the protected files list
-    if is_protected_file "$relative_path"; then
-        echo "Skipping protected file from regular files: $relative_path"
-        continue
-    fi
-    
-    # Apply transformation to get virtual path
-    virtual_path=$(build_virtual_path "$relative_path")
-    
-    add_file_to_json_array "$file" "$virtual_path" "regular" "files_json" "files_first_file"
-done < <(find "$config_dir_path" -type f -print0)
+echo "Listing the NGINX configuration file paths in the tarball."
+tar -tf "$config_tarball"
 
-files_json+="]"
+encoded_config_tarball=$(base64 "$config_tarball" -w 0)
 
 if [[ "$debug" == true ]]; then
-    echo "Regular files JSON: $files_json"
+    echo "The base64 encoded NGINX configuration tarball"
+    echo "$encoded_config_tarball"
 fi
+echo ""
 
-# Process protected files if specified
-protected_files_arg=""
-if [ -n "$protected_files" ]; then
-    echo "Processing protected files: $protected_files"
-    
-    # Build the protected files JSON array
-    protected_files_json="["
-    protected_first_file=true
-    IFS=',' read -ra files <<< "$protected_files"
-    
-    for file in "${files[@]}"; do
-        file=$(trim_whitespace "$file")
-        if [ -n "$file" ]; then
-            repo_file_path="${config_dir_path}${file}"
-            virtual_path=$(build_virtual_path "$file")
-            
-            add_file_to_json_array "$repo_file_path" "$virtual_path" "protected" "protected_files_json" "protected_first_file"
-        fi
-    done
-    
-    protected_files_json+="]"
-    
-    if [ "$protected_first_file" = false ]; then
-        protected_files_arg="--protected-files"
-        if [[ "$debug" == true ]]; then
-            echo "Protected files JSON: $protected_files_json"
-        fi
-    fi
-fi
-
-
-# Synchronize the NGINX configuration files to the NGINXaaS for Azure deployment.
+# Synchronize the NGINX configuration tarball to the NGINXaaS for Azure deployment.
 
 echo "Synchronizing NGINX configuration"
 echo "Subscription ID: $subscription_id"
@@ -311,18 +162,47 @@ az_cmd=(
     "deployment"
     "configuration"
     "update"
+    "--verbose"
     "--name" "default"
     "--deployment-name" "$nginx_deployment_name"
     "--resource-group" "$resource_group_name"
     "--root-file" "$transformed_root_config_file_path"
-    "--files" "$files_json"
-    "--verbose"
+    "--package" "data=$encoded_config_tarball"
 )
 
-# Add protected files argument if present
-if [ -n "$protected_files_arg" ]; then
-    az_cmd+=("$protected_files_arg")
-    az_cmd+=("$protected_files_json")
+# Function to trim whitespace from a string
+trim_whitespace() {
+    local var="$1"
+    # Trim leading whitespace from the file path (var)
+    # ${var%%[![:space:]]*} starts at the file path's end
+    # and finds the longest match of non-whitespace
+    # characters leaving only leading whitespaces
+    # ${var#"..." } removes the leading whitespace found
+    var="${var#"${var%%[![:space:]]*}"}"
+    # Remove trailing whitespace
+    # See explanation above. The process is reversed here.
+    var="${var%"${var##*[![:space:]]}"}"
+    # Check if the file exists in the repository
+    echo "$var"
+}
+
+# Add protected-files parameter if provided
+if [[ -n "$protected_files" ]]; then
+    # Convert comma-separated list to JSON array format
+    IFS=',' read -ra files <<< "$protected_files"
+    json_array="["
+    for i in "${files[@]}"; do
+        # Trim whitespace and add quotes
+        file_path="$(trim_whitespace "$i")"
+        if [[ "$json_array" != "[" ]]; then
+            json_array+=","
+        fi
+        json_array+="\"$file_path\""
+    done
+    json_array+="]"
+    
+    az_cmd+=("protected-files=\'$json_array\'")
+    echo "Protected files: $json_array"
 fi
 
 if [[ "$debug" == true ]]; then