Merge pull request #292 from microsoft/dev

fix: Dev to main merge

Author: Roopan-Microsoft

.github/workflows/azure-dev.yaml

@@ -29,6 +29,7 @@ jobs:
           AZURE_ENV_NAME: ${{ secrets.AZURE_ENV_NAME }}
           AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}
 
       # Step 3: Print the result of the validation
       - name: Print result

.github/workflows/deploy.yml

@@ -33,16 +33,16 @@ jobs:
 
       - name: Login to Azure
         run: |
-          az login --service-principal -u ${{ secrets.AZURE_MAINTENANCE_CLIENT_ID }} -p ${{ secrets.AZURE_MAINTENANCE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
-          az account set --subscription ${{ secrets.AZURE_MAINTENANCE_SUBSCRIPTION_ID }}
+          az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
+          az account set --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: Run Quota Check
         id: quota-check
         run: |
-          export AZURE_MAINTENANCE_CLIENT_ID=${{ secrets.AZURE_MAINTENANCE_CLIENT_ID }}
+          export AZURE_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}
           export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
-          export AZURE_MAINTENANCE_CLIENT_SECRET=${{ secrets.AZURE_MAINTENANCE_CLIENT_SECRET }}
-          export AZURE_MAINTENANCE_SUBSCRIPTION_ID="${{ secrets.AZURE_MAINTENANCE_SUBSCRIPTION_ID }}"
+          export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
+          export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
           export GPT_MIN_CAPACITY="100"
           export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
 
@@ -144,15 +144,15 @@ jobs:
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.json \
             --parameters \
-              environmentName="${{ env.ENVIRONMENT_NAME }}" \
+              solutionName="${{ env.ENVIRONMENT_NAME }}" \
               enablePrivateNetworking="false" \
               secondaryLocation="eastus2" \
               contentUnderstandingLocation="WestUS" \
               deploymentType="GlobalStandard" \
               gptModelName="gpt-4o" \
               gptModelVersion="2024-08-06" \
               gptDeploymentCapacity="30" \
-              aiDeploymentsLocation="${{ env.AZURE_LOCATION }}" \
+              aiServiceLocation="${{ env.AZURE_LOCATION }}" \
               tags="{'CreatedBy':'Pipeline', 'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \
             --query "properties.outputs" -o json); then
               echo "❌ Deployment failed. See logs above."
@@ -301,8 +301,8 @@ jobs:
 
       - name: Login to Azure
         run: |
-          az login --service-principal -u ${{ secrets.AZURE_MAINTENANCE_CLIENT_ID }} -p ${{ secrets.AZURE_MAINTENANCE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
-          az account set --subscription ${{ secrets.AZURE_MAINTENANCE_SUBSCRIPTION_ID }}
+          az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
+          az account set --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: Delete Bicep Deployment
         if: always()
@@ -459,7 +459,7 @@ jobs:
             
             echo "Processing KeyVault: $keyvault_name"
             # Check if the KeyVault is soft-deleted
-            deleted_vaults=$(az keyvault list-deleted --query "[?name=='$keyvault_name']" -o json --subscription ${{ secrets.AZURE_MAINTENANCE_SUBSCRIPTION_ID }})
+            deleted_vaults=$(az keyvault list-deleted --query "[?name=='$keyvault_name']" -o json --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }})
 
             # If the KeyVault is found in the soft-deleted state, purge it
             if [ "$(echo "$deleted_vaults" | jq length)" -gt 0 ]; then

.github/workflows/test-automation.yml

@@ -31,8 +31,8 @@ jobs:
 
       - name: Login to Azure
         run: |
-          az login --service-principal -u ${{ secrets.AZURE_MAINTENANCE_CLIENT_ID }} -p ${{ secrets.AZURE_MAINTENANCE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
-          az account set --subscription ${{ secrets.AZURE_MAINTENANCE_SUBSCRIPTION_ID }}
+          az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
+          az account set --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: Install dependencies
         run: |

azure.yaml

@@ -11,12 +11,30 @@ metadata:
   name: content-processinge@1.0
 
 hooks:
-  postprovision:
+  postdeploy:
     posix:
       shell: sh
-      run: sed -i 's/\r$//' ./infra/scripts/post_deployment.sh; ./infra/scripts/post_deployment.sh
+      run: |  
+        echo "🧭 Web App Details:"
+        echo "✅ Name: $CONTAINER_WEB_APP_NAME"
+        echo "🌐 Endpoint: https://$CONTAINER_WEB_APP_FQDN"
+        echo "🔗 Portal URL: https://portal.azure.com/#resource/subscriptions/$AZURE_SUBSCRIPTION_ID/resourceGroups/$AZURE_RESOURCE_GROUP/providers/Microsoft.App/containerApps/$CONTAINER_WEB_APP_NAME"
+
+        echo "🧭 API App Details:"
+        echo "✅ Name: $CONTAINER_API_APP_NAME"
+        echo "🌐 Endpoint: https://$CONTAINER_API_APP_FQDN"
+        echo "🔗 Portal URL: https://portal.azure.com/#resource/subscriptions/$AZURE_SUBSCRIPTION_ID/resourceGroups/$AZURE_RESOURCE_GROUP/providers/Microsoft.App/containerApps/$CONTAINER_API_APP_NAME"
       interactive: true
     windows:
       shell: pwsh
-      run: ./infra/scripts/post_deployment.ps1
+      run: |  
+        Write-Host "🧭 Web App Details:"
+        Write-Host "✅ Name: $env:CONTAINER_WEB_APP_NAME"
+        Write-Host "🌐 Endpoint: https://$env:CONTAINER_WEB_APP_FQDN"
+        Write-Host "🔗 Portal URL: https://portal.azure.com/#resource/subscriptions/$env:AZURE_SUBSCRIPTION_ID/resourceGroups/$env:AZURE_RESOURCE_GROUP/providers/Microsoft.App/containerApps/$env:CONTAINER_WEB_APP_NAME" -ForegroundColor Cyan
+        
+        Write-Host "🧭 API App Details:"
+        Write-Host "✅ Name: $env:CONTAINER_API_APP_NAME"
+        Write-Host "🌐 Endpoint: https://$env:CONTAINER_API_APP_FQDN"
+        Write-Host "🔗 Portal URL: https://portal.azure.com/#resource/subscriptions/$env:AZURE_SUBSCRIPTION_ID/resourceGroups/$env:AZURE_RESOURCE_GROUP/providers/Microsoft.App/containerApps/$env:CONTAINER_API_APP_NAME" -ForegroundColor Cyan
       interactive: true

docs/ConfigureAppAuthentication.md

@@ -13,7 +13,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
 
 1. Add Authentication Provider in Web Application
 
-   - Go to deployed Container App and select `ca-cps-<randomname>-web` and click **Add Identity Provider** button in Authentication.  
+   - Go to deployed Container App and select `ca-<randomname>-web` and click **Add Identity Provider** button in Authentication.  
      ![add_auth_provider_web_1](./images/add_auth_provider_web_1.png)
 
    - Select **Microsoft** and set **Client secret expiration**, then click **Add** button.  
@@ -29,7 +29,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
 
 1. Add Authentication Provider in API Service
 
-   - Go to deployed Container App and select `ca-cps-<randomname>-api` and click **Add Identity Provider** button in Authentication.  
+   - Go to deployed Container App and select `ca-<randomname>-api` and click **Add Identity Provider** button in Authentication.  
      ![add_auth_provider_api_1](./images/add_auth_provider_api_1.png)
 
    - Select **Microsoft** and set **Client secret expiration**.  
@@ -42,7 +42,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
 
 1. Set Redirect URI in Single Page Application Platform
 
-   - Go to deployed Container App `ca-cps-<randomname>-web` and select **Authentication** menu, then select created Application Registration.  
+   - Go to deployed Container App `ca-<randomname>-web` and select **Authentication** menu, then select created Application Registration.  
      ![configure_app_registration_web_1](./images/configure_app_registration_web_1.png)
 
    - Select **Authentication**, then select **+ Add a platform** menu.  
@@ -51,15 +51,15 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
    - Select **Single-page application**.  
      ![configure_app_registration_web_3](./images/configure_app_registration_web_3.png)
 
-   - Add Container App `ca-cps-<randomname>-web`'s URL.  
+   - Add Container App `ca-<randomname>-web`'s URL.  
      ![configure_app_registration_web_4](./images/configure_app_registration_web_4.png)
 
    - You may get this URL from here in your Container App.  
      ![configure_app_registration_web_5](./images/configure_app_registration_web_5.png)
 
 2. Add Permission and Grant Permission
 
-   - Add Permission for API application. Select **+ Add a permission** button, then search API application with name `ca-cps-<randomname>-api`.  
+   - Add Permission for API application. Select **+ Add a permission** button, then search API application with name `ca-<randomname>-api`.  
      ![configure_app_registration_web_6](./images/configure_app_registration_web_6.png)  
      ![configure_app_registration_web_7](./images/configure_app_registration_web_7.png)
 
@@ -86,7 +86,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
 
 1. Grab Scope Name for Impersonation
 
-   - Go to deployed Container App `ca-cps-<randomname>-api` and select **Authentication** menu, then select created Application Registration.  
+   - Go to deployed Container App `ca-<randomname>-api` and select **Authentication** menu, then select created Application Registration.  
      ![configure_app_registration_api_1](./images/configure_app_registration_api_1.png)
 
    - Select **Expose an API** in the left menu. Copy the Scope name, then paste it in some temporary place.  
@@ -95,7 +95,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
 
 ## Step 4: Add Web Application's Client Id to Allowed Client Applications List in API Application Registration
 
-1. Go to the deployed Container App `ca-cps-<randomname>-api`, select **Authentication**, and then click **Edit**.  
+1. Go to the deployed Container App `ca-<randomname>-api`, select **Authentication**, and then click **Edit**.  
    ![add_client_id_to_api_1](./images/add_client_id_to_api_1.png)
 
 2. Select **Allow requests from specific client applications**, then click the **pencil** icon to add the Client Id.