chore: Main merge to Demo

.github/workflows/test.yml

@@ -8,7 +8,11 @@ on:
     paths:
       - 'src/backend-api/**/*.py'
       - 'src/backend-api/pyproject.toml'
+      - 'src/backend-api/uv.lock'
       - 'src/backend-api/pytest.ini'
+      - 'src/processor/**/*.py'
+      - 'src/processor/pyproject.toml'
+      - 'src/processor/uv.lock'
       - '.github/workflows/test.yml'
   pull_request:
     types:
@@ -22,7 +26,11 @@ on:
     paths:
       - 'src/backend-api/**/*.py'
       - 'src/backend-api/pyproject.toml'
+      - 'src/backend-api/uv.lock'
       - 'src/backend-api/pytest.ini'
+      - 'src/processor/**/*.py'
+      - 'src/processor/pyproject.toml'
+      - 'src/processor/uv.lock'
       - '.github/workflows/test.yml'
 
 permissions:
@@ -36,10 +44,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "3.12"
 
@@ -48,7 +56,7 @@ jobs:
           python -m pip install --upgrade pip
           cd src/backend-api
           pip install -e .
-          pip install pytest pytest-cov
+          pip install pytest pytest-cov pytest-asyncio
 
       - name: Check if Backend Test Files Exist
         id: check_backend_tests
@@ -71,9 +79,26 @@ jobs:
             --cov=src/app \
             --cov-report=term-missing \
             --cov-report=xml:reports/coverage.xml \
+            --cov-fail-under=82 \
             --junitxml=pytest.xml \
             -v
 
+      - name: Prefix coverage XML filenames with repo-root path
+        if: env.skip_backend_tests == 'false'
+        run: |
+          python <<'PY'
+          import xml.etree.ElementTree as ET
+          path = "src/backend-api/reports/coverage.xml"
+          prefix = "src/backend-api/src/app/"
+          tree = ET.parse(path)
+          root = tree.getroot()
+          for cls in root.iter("class"):
+              fname = cls.attrib.get("filename", "")
+              if fname and not fname.startswith(prefix):
+                  cls.attrib["filename"] = prefix + fname
+          tree.write(path, xml_declaration=True, encoding="utf-8")
+          PY
+
       - name: Pytest Coverage Comment
         if: |
           always() &&
@@ -90,3 +115,80 @@ jobs:
         if: env.skip_backend_tests == 'true'
         run: |
           echo "Skipping backend tests because no test files were found."
+
+  processor_tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install Processor Dependencies
+        run: |
+          python -m pip install --upgrade pip
+          cd src/processor
+          pip install -e .
+          pip install pytest pytest-cov pytest-asyncio
+
+      - name: Check if Processor Test Files Exist
+        id: check_processor_tests
+        run: |
+          if [ -z "$(find src/processor/src/tests -type f -name 'test_*.py' 2>/dev/null)" ]; then
+            echo "No processor test files found, skipping processor tests."
+            echo "skip_processor_tests=true" >> $GITHUB_ENV
+          else
+            echo "Processor test files found, running tests."
+            echo "skip_processor_tests=false" >> $GITHUB_ENV
+          fi
+
+      - name: Run Processor Tests with Coverage
+        if: env.skip_processor_tests == 'false'
+        run: |
+          cd src/processor
+          pytest src/tests \
+            --cov=src \
+            --cov-report=term-missing \
+            --cov-report=xml:reports/coverage.xml \
+            --cov-fail-under=82 \
+            --junitxml=pytest.xml \
+            -v
+
+      - name: Prefix coverage XML filenames with repo-root path
+        if: env.skip_processor_tests == 'false'
+        run: |
+          python <<'PY'
+          import xml.etree.ElementTree as ET
+          path = "src/processor/reports/coverage.xml"
+          prefix = "src/processor/src/"
+          tree = ET.parse(path)
+          root = tree.getroot()
+          for cls in root.iter("class"):
+              fname = cls.attrib.get("filename", "")
+              if fname and not fname.startswith(prefix):
+                  cls.attrib["filename"] = prefix + fname
+          tree.write(path, xml_declaration=True, encoding="utf-8")
+          PY
+
+      - name: Pytest Coverage Comment (Processor)
+        if: |
+          always() &&
+          github.event_name == 'pull_request' &&
+          github.event.pull_request.head.repo.fork == false &&
+          env.skip_processor_tests == 'false'
+        uses: MishaKav/pytest-coverage-comment@26f986d2599c288bb62f623d29c2da98609e9cd4  # v1.6.0
+        with:
+          pytest-xml-coverage-path: src/processor/reports/coverage.xml
+          junitxml-path: src/processor/pytest.xml
+          title: Processor Coverage Report
+          unique-id-for-comment: processor
+          report-only-changed-files: true
+
+      - name: Skip Processor Tests
+        if: env.skip_processor_tests == 'true'
+        run: |
+          echo "Skipping processor tests because no test files were found."

.github/workflows/validate-bicep-params.yml

@@ -34,9 +34,16 @@ jobs:
       - name: Validate infra/ parameters
         id: validate_infra
         continue-on-error: true
+        env:
+          ACCELERATOR_NAME: ${{ env.accelerator_name }}
         run: |
           set +e
-          python scripts/validate_bicep_params.py --dir infra --strict --no-color --json-output infra_results.json 2>&1 | tee infra_output.txt
+          RUN_URL="https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
+          python scripts/validate_bicep_params.py --dir infra --strict --no-color \
+            --json-output infra_results.json \
+            --html-output email_body.html \
+            --accelerator-name "${ACCELERATOR_NAME}" \
+            --run-url "${RUN_URL}" 2>&1 | tee infra_output.txt
           EXIT_CODE=${PIPESTATUS[0]}
           set -e
           echo "## Infra Param Validation" >> "$GITHUB_STEP_SUMMARY"
@@ -61,24 +68,21 @@ jobs:
           name: bicep-validation-results
           path: |
             infra_results.json
+            email_body.html
           retention-days: 30
 
       - name: Send schedule notification on failure
         if: github.event_name == 'schedule' && steps.result.outputs.status == 'failure'
         env:
           LOGICAPP_URL: ${{ secrets.EMAILNOTIFICATION_LOGICAPP_URL_TA }}
-          GITHUB_REPOSITORY: ${{ github.repository }}
-          GITHUB_RUN_ID: ${{ github.run_id }}
           ACCELERATOR_NAME: ${{ env.accelerator_name }}
         run: |
-          RUN_URL="https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
-          INFRA_OUTPUT=$(sed 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g' infra_output.txt)
+          EMAIL_BODY=$(cat email_body.html)
 
           jq -n \
             --arg name "${ACCELERATOR_NAME}" \
-            --arg infra "$INFRA_OUTPUT" \
-            --arg url "$RUN_URL" \
-            '{subject: ("Bicep Parameter Validation Report - " + $name + " - Issues Detected"), body: ("<p>Dear Team,</p><p>The scheduled <strong>Bicep Parameter Validation</strong> for <strong>" + $name + "</strong> has detected parameter mapping errors.</p><p><strong>infra/ Results:</strong></p><pre>" + $infra + "</pre><p><strong>Run URL:</strong> <a href=\"" + $url + "\">" + $url + "</a></p><p>Please fix the parameter mapping issues at your earliest convenience.</p><p>Best regards,<br>Your Automation Team</p>")}' \
+            --arg body "$EMAIL_BODY" \
+            '{subject: ("Bicep Parameter Validation Report - " + $name + " - Issues Detected"), body: $body}' \
             | curl -X POST "${LOGICAPP_URL}" \
               -H "Content-Type: application/json" \
               -d @- || echo "Failed to send notification"
@@ -87,18 +91,14 @@ jobs:
         if: github.event_name == 'schedule' && steps.result.outputs.status == 'success'
         env:
           LOGICAPP_URL: ${{ secrets.EMAILNOTIFICATION_LOGICAPP_URL_TA }}
-          GITHUB_REPOSITORY: ${{ github.repository }}
-          GITHUB_RUN_ID: ${{ github.run_id }}
           ACCELERATOR_NAME: ${{ env.accelerator_name }}
         run: |
-          RUN_URL="https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
-          INFRA_OUTPUT=$(sed 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g' infra_output.txt)
+          EMAIL_BODY=$(cat email_body.html)
 
           jq -n \
             --arg name "${ACCELERATOR_NAME}" \
-            --arg infra "$INFRA_OUTPUT" \
-            --arg url "$RUN_URL" \
-            '{subject: ("Bicep Parameter Validation Report - " + $name + " - Passed"), body: ("<p>Dear Team,</p><p>The scheduled <strong>Bicep Parameter Validation</strong> for <strong>" + $name + "</strong> has completed successfully. All parameter mappings are valid.</p><p><strong>infra/ Results:</strong></p><pre>" + $infra + "</pre><p><strong>Run URL:</strong> <a href=\"" + $url + "\">" + $url + "</a></p><p>Best regards,<br>Your Automation Team</p>")}' \
+            --arg body "$EMAIL_BODY" \
+            '{subject: ("Bicep Parameter Validation Report - " + $name + " - Passed"), body: $body}' \
             | curl -X POST "${LOGICAPP_URL}" \
               -H "Content-Type: application/json" \
               -d @- || echo "Failed to send notification"

docs/DeploymentGuide.md

@@ -156,6 +156,7 @@ Select one of the following options to deploy the Container Migration Solution A
 **Required Tools:**
 - [PowerShell 7.0+](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell) 
 - [Azure Developer CLI (azd) 1.18.0+](https://aka.ms/install-azd)
+- [Bicep CLI 0.33.0+](https://learn.microsoft.com/azure/azure-resource-manager/bicep/install)
 - [Python 3.9+](https://www.python.org/downloads/)
 - [Docker Desktop](https://www.docker.com/products/docker-desktop/)
 - [Git](https://git-scm.com/downloads)

infra/main.bicep

@@ -872,7 +872,7 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.13.2'
         principalType: 'ServicePrincipal'
       }
       {
-        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
+        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
         principalId: appIdentity.outputs.principalId
         principalType: 'ServicePrincipal'
       }
@@ -1123,6 +1123,12 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.11.
   params: {
     name: 'cae-${solutionSuffix}'
     location: location
+    tags: {
+      ...resourceGroup().tags
+      ...existingTags
+      ...allTags
+      ...tags
+    }
     managedIdentities: { systemAssigned: true }
     appLogsConfiguration: enableMonitoring
       ? {

infra/main.json

@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.43.1.21952",
-      "templateHash": "1278209883407272359"
+      "version": "0.43.8.12551",
+      "templateHash": "13087590133917597872"
     }
   },
   "parameters": {
@@ -4715,8 +4715,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.43.1.21952",
-              "templateHash": "4488065934246762087"
+              "version": "0.43.8.12551",
+              "templateHash": "4604761290796021104"
             }
           },
           "definitions": {
@@ -26135,8 +26135,8 @@
       },
       "dependsOn": [
         "appIdentity",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
         "virtualNetwork"
       ]
     },
@@ -30103,8 +30103,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.43.1.21952",
-              "templateHash": "17526785557845507677"
+              "version": "0.43.8.12551",
+              "templateHash": "13516349791985095953"
             }
           },
           "definitions": {
@@ -33853,8 +33853,8 @@
       },
       "dependsOn": [
         "aiFoundryAiServices",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "virtualNetwork"
       ]
@@ -33892,8 +33892,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.43.1.21952",
-              "templateHash": "8251376928798842081"
+              "version": "0.43.8.12551",
+              "templateHash": "17583277036649944863"
             }
           },
           "parameters": {
@@ -38362,6 +38362,9 @@
           "location": {
             "value": "[parameters('location')]"
           },
+          "tags": {
+            "value": "[shallowMerge(createArray(resourceGroup().tags, variables('existingTags'), variables('allTags'), parameters('tags')))]"
+          },
           "managedIdentities": {
             "value": {
               "systemAssigned": true

infra/main.parameters.json

@@ -40,6 +40,9 @@
       },
       "imageTag": {
         "value": "${AZURE_ENV_IMAGE_TAG}"
+      },
+      "tags": {
+       "value": "${AZURE_ENV_TAGS}"
       }
     }
 }

infra/main.waf.parameters.json

@@ -55,6 +55,9 @@
       },
       "vmSize": {
         "value": "${AZURE_ENV_VM_SIZE}"
+      },
+      "tags": {
+       "value": "${AZURE_ENV_TAGS}"
       }
     }
 }

infra/main_custom.bicep

@@ -760,7 +760,7 @@ module existingAiFoundryAiServicesDeployments 'modules/ai-services-deployments.b
       {
         principalId: appIdentity.outputs.principalId
         principalType: 'ServicePrincipal'
-        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
+        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
       }
     ]
   }
@@ -814,7 +814,7 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.13.2'
         principalType: 'ServicePrincipal'
       }
       {
-        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
+        roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
         principalId: appIdentity.outputs.principalId
         principalType: 'ServicePrincipal'
       }
@@ -1076,6 +1076,12 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.11.
   params: {
     name: 'cae-${solutionSuffix}'
     location: location
+    tags: {
+      ...resourceGroup().tags
+      ...existingTags
+      ...allTags
+      ...tags
+    }
     managedIdentities: { systemAssigned: true }
     appLogsConfiguration: enableMonitoring
       ? {

infra/modules/cosmosDb.bicep

@@ -49,7 +49,6 @@ module cosmosAccount 'br/public:avm/res/document-db/database-account:0.15.1' = {
   name: take('avm.res.document-db.account.${name}', 64)
   params: {
     name: name
-    enableAnalyticalStorage: true
     location: location
     minimumTlsVersion: 'Tls12'
     defaultConsistencyLevel: 'Session'