copilot fixes

Rafi-Microsoft · Rafi-Microsoft · commit d0cda0af822c · 2025-12-22T14:23:25.000+05:30
diff --git a/.github/workflows/deploy-orchestrator.yml b/.github/workflows/deploy-orchestrator.yml
@@ -72,7 +72,7 @@ jobs:
     needs: [deploy]
     uses: ./.github/workflows/test-automation-v2.yml
     with:
-      Test_URL: ${{ needs.deploy.outputs.WEB_APPURL || inputs.existing_webapp_url }}
+      TEST_URL: ${{ needs.deploy.outputs.WEB_APPURL || inputs.existing_webapp_url }}
       TEST_SUITE: ${{ inputs.trigger_type == 'workflow_dispatch' && inputs.run_e2e_tests || 'GoldenPath-Testing' }}
     secrets: inherit
 
diff --git a/.github/workflows/job-deploy-linux.yml b/.github/workflows/job-deploy-linux.yml
@@ -149,7 +149,7 @@ jobs:
           # Deploy
           azd up --no-prompt
           
-          echo "✅ azd deployment completed"
+          echo "✅ Azure Developer CLI (azd) deployment completed"
 
       - name: Get Deployment Outputs
         id: get_output
@@ -167,10 +167,10 @@ jobs:
           
           # Get AKS node resource group if AKS exists
           if [ -n "$AZURE_AKS_NAME" ]; then
-            krg_name=$(az aks show --name "$AZURE_AKS_NAME" --resource-group "${{ inputs.RESOURCE_GROUP_NAME }}" --query "nodeResourceGroup" -o tsv || echo "")
-            if [ -n "$krg_name" ]; then
-              echo "krg_name=$krg_name" >> $GITHUB_ENV
-              echo "AKS node resource group: $krg_name"
+            aks_node_resource_group=$(az aks show --name "$AZURE_AKS_NAME" --resource-group "${{ inputs.RESOURCE_GROUP_NAME }}" --query "nodeResourceGroup" -o tsv || echo "")
+            if [ -n "$aks_node_resource_group" ]; then
+              echo "aks_node_resource_group=$aks_node_resource_group" >> $GITHUB_ENV
+              echo "AKS node resource group: $aks_node_resource_group"
             fi
           fi
 
@@ -183,17 +183,18 @@ jobs:
           yes
           "@
           $input | pwsh ./resourcedeployment.ps1
-          Write-Host "Resource Group Name is ${{ env.RESOURCE_GROUP_NAME }}"
-          Write-Host "Kubernetes resource group is ${{ env.AZURE_AKS_NAME }}"
+          Write-Host "Resource Group: ${{ inputs.RESOURCE_GROUP_NAME }}"
+          Write-Host "AKS Cluster Name: ${{ env.AZURE_AKS_NAME }}"
+          Write-Host "AKS Node Resource Group: ${{ env.aks_node_resource_group }}"
         env:
           # From GitHub secrets (for login)
           AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           AZURE_TENANT_ID:       ${{ secrets.AZURE_TENANT_ID }}
           AZURE_CLIENT_ID:       ${{ secrets.AZURE_CLIENT_ID }}
           AZURE_CLIENT_SECRET:   ${{ secrets.AZURE_CLIENT_SECRET }}
 
-          # From deployment outputs step (these come from $GITHUB_ENV)
-          RESOURCE_GROUP_NAME:          ${{ env.RESOURCE_GROUP_NAME }}
+          # From workflow inputs and deployment outputs
+          RESOURCE_GROUP_NAME:          ${{ inputs.RESOURCE_GROUP_NAME }}
           AZURE_RESOURCE_GROUP_ID:       ${{ env.AZURE_RESOURCE_GROUP_ID }}
           STORAGE_ACCOUNT_NAME:          ${{ env.STORAGE_ACCOUNT_NAME }}
           AZURE_SEARCH_SERVICE_NAME:     ${{ env.AZURE_SEARCH_SERVICE_NAME }}
@@ -218,8 +219,8 @@ jobs:
         run: |
           # Get the Web App URL and save it to GITHUB_OUTPUT
           echo "Retrieving Web App URL..."
-          public_ip_name=$(az network public-ip list --resource-group ${{ env.krg_name }} --query "[?contains(name, 'kubernetes-')].name" -o tsv)
-          fqdn=$(az network public-ip show --resource-group ${{ env.krg_name }} --name $public_ip_name --query "dnsSettings.fqdn" -o tsv)
+          public_ip_name=$(az network public-ip list --resource-group ${{ env.aks_node_resource_group }} --query "[?contains(name, 'kubernetes-')].name" -o tsv)
+          fqdn=$(az network public-ip show --resource-group ${{ env.aks_node_resource_group }} --name $public_ip_name --query "dnsSettings.fqdn" -o tsv)
           if [ -n "$fqdn" ]; then
             echo "WEB_APPURL=https://$fqdn" >> $GITHUB_OUTPUT
             echo "Web App URL is https://$fqdn"
diff --git a/.github/workflows/job-deploy.yml b/.github/workflows/job-deploy.yml
@@ -94,22 +94,23 @@ jobs:
       QUOTA_FAILED: ${{ steps.quota_failure_output.outputs.QUOTA_FAILED }}
       
     steps:
-      - name: Validate and Auto-Configure EXP
+      - name: Validate EXP Configuration
         shell: bash
         run: |
           echo "🔍 Validating EXP configuration..."
           
-          if [[ "${{ inputs.EXP }}" != "true" ]]; then
-            if [[ -n "${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}" ]]; then
-              echo "🔧 AUTO-ENABLING EXP: EXP parameter values were provided but EXP was not explicitly enabled."
-              echo ""
-              echo "You provided values for:"
-              [[ -n "${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}" ]] && echo "  - Azure Log Analytics Workspace ID: '${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}'"
-              echo ""
-              echo "✅ Automatically enabling EXP to use these values."
-              echo "EXP=true" >> $GITHUB_ENV
-              echo "📌 EXP has been automatically enabled for this deployment."
-            fi
+          if [[ "${{ inputs.EXP }}" == "false" && -n "${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}" ]]; then
+            echo "⚠️ WARNING: EXP is disabled but Log Analytics Workspace ID was provided."
+            echo "The provided workspace ID will be ignored unless EXP is enabled."
+            echo ""
+            echo "Provided but unused:"
+            echo "  - Azure Log Analytics Workspace ID: '${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}'"
+            echo ""
+            echo "To use these values, set EXP=true in your workflow dispatch."
+          elif [[ "${{ inputs.EXP }}" == "true" ]]; then
+            echo "✅ EXP is enabled"
+          else
+            echo "ℹ️ EXP is disabled"
           fi
           
       - name: Checkout Code
@@ -247,18 +248,18 @@ jobs:
           if [[ "$BRANCH_NAME" == "main" ]]; then
             IMAGE_TAG="latest_waf"
             echo "Using main branch - image tag: latest_waf"
-            elif [[ "$BRANCH_NAME" == "dev" ]]; then
-              IMAGE_TAG="dev"
-              echo "Using dev branch - image tag: dev"
-            elif [[ "$BRANCH_NAME" == "demo" ]]; then
-              IMAGE_TAG="demo"
-              echo "Using demo branch - image tag: demo"
-            else
-              IMAGE_TAG="latest_waf"
-              echo "Using default for branch '$BRANCH_NAME' - image tag: latest_waf"
-            fi
-            
-            echo "Using existing Docker image tag: $IMAGE_TAG"
+          elif [[ "$BRANCH_NAME" == "dev" ]]; then
+            IMAGE_TAG="dev"
+            echo "Using dev branch - image tag: dev"
+          elif [[ "$BRANCH_NAME" == "demo" ]]; then
+            IMAGE_TAG="demo"
+            echo "Using demo branch - image tag: demo"
+          else
+            IMAGE_TAG="latest_waf"
+            echo "Using default for branch '$BRANCH_NAME' - image tag: latest_waf"
+          fi
+          
+          echo "Using existing Docker image tag: $IMAGE_TAG"
           
           echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
           echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/job-send-notification.yml b/.github/workflows/job-send-notification.yml
@@ -182,7 +182,7 @@ jobs:
             -d "$EMAIL_BODY" || echo "Failed to send test failure notification"
 
       - name: Send Existing URL Success Notification
-        if: inputs.deploy_result == 'skipped' && inputs.existing_webapp_url != '' && inputs.e2e_test_result == 'success' && (inputs.TEST_SUCCESS == 'true' || inputs.TEST_SUCCESS == '')
+        if: inputs.deploy_result == 'skipped' && inputs.existing_webapp_url != '' && inputs.e2e_test_result == 'success'
         shell: bash
         run: |
           RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
diff --git a/.github/workflows/test-automation-v2.yml b/.github/workflows/test-automation-v2.yml
@@ -3,7 +3,7 @@ name: Test Automation Dkm-v2
 on:
     workflow_call:
         inputs:
-          Test_URL:
+          TEST_URL:
             required: true
             type: string
             description: "Web URL for Dkm"
@@ -21,7 +21,7 @@ on:
             value: ${{ jobs.test.outputs.TEST_REPORT_URL }}
 
 env:
-    url: ${{ inputs.Test_URL }}
+    url: ${{ inputs.TEST_URL }}
     accelerator_name: "DKM"
     test_suite: ${{ inputs.TEST_SUITE }}
 
