chore: Merging from main branch

.github/workflows/deploy-waf.yml

@@ -1,9 +1,9 @@
-name: Validate WAF Deployment
+name: Validate WAF Deployment v2
 
 on:
   push:
     branches:
-      - main
+      - macae-v2
   schedule:
     - cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT
 
@@ -105,9 +105,6 @@ jobs:
         id: deploy
         run: |
           set -e
-           # Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
-            current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ")
-
           az deployment group create \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
@@ -121,7 +118,6 @@ jobs:
               enablePrivateNetworking=true \
               enableScalability=true \
               createdBy="Pipeline" \
-              tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"
 
 
       - name: Send Notification on Failure

.github/workflows/deploy.yml

@@ -1,17 +1,16 @@
-name: Validate Deployment
+name: Validate Deployment v2
 
 on:
   workflow_run:
     workflows: ["Build Docker and Optional Push"]
     types:
       - completed
     branches:
-      - main
-      - hotfix
+      - macae-v2
       - dev
   schedule:
     - cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT
-  workflow_dispatch: #Allow manual triggering
+  workflow_dispatch: #Allow manual triggering.
 env:
   GPT_MIN_CAPACITY: 150
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
@@ -115,19 +114,16 @@ jobs:
       - name: Deploy Bicep Template
         id: deploy
         run: |
-          if [[ "${{ env.BRANCH_NAME }}" == "main" ]]; then
+          if [[ "${{ env.BRANCH_NAME }}" == "macae-v2" ]]; then
             IMAGE_TAG="latest"
           elif [[ "${{ env.BRANCH_NAME }}" == "dev" ]]; then
             IMAGE_TAG="dev"
-          elif [[ "${{ env.BRANCH_NAME }}" == "hotfix" ]]; then
-            IMAGE_TAG="hotfix"
-          else
-            IMAGE_TAG="latest"
+          # elif [[ "${{ env.BRANCH_NAME }}" == "hotfix" ]]; then
+          #   IMAGE_TAG="hotfix"
+          # else
+          # IMAGE_TAG="latest"
           fi
 
-          # Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
-            current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ")
-
           az deployment group create \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
@@ -137,11 +133,11 @@ jobs:
               gptModelDeploymentType="GlobalStandard" \
               gptModelName="gpt-4o" \
               gptModelVersion="2024-08-06" \
-              imageTag="${IMAGE_TAG}" \
+              backendContainerImageTag="${IMAGE_TAG}" \
+              frontendContainerImageTag="${IMAGE_TAG}" \
               azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
               gptModelCapacity=150 \
               createdBy="Pipeline" \
-              tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \
             --output json
 
       - name: Extract Web App and API App URLs

docs/quota_check.md

@@ -79,6 +79,7 @@ The final table lists regions with available quota. You can select any of these
    ![git_bash](images/git_bash.png)
 3. Navigate to the `scripts` folder where the script files are located and make the script as executable:
    ```sh
+    cd infra
     cd scripts
     chmod +x quota_check_params.sh
     ```