Merge branch 'dev' of https://github.com/microsoft/Container-Migration-Solution-Accelerator into psl-ts-cleanup

Author: Tejasri-Microsoft

.github/workflows/test.yml

@@ -9,6 +9,8 @@ on:
       - 'src/backend-api/**/*.py'
       - 'src/backend-api/pyproject.toml'
       - 'src/backend-api/pytest.ini'
+      - 'src/processor/**/*.py'
+      - 'src/processor/pyproject.toml'
       - '.github/workflows/test.yml'
   pull_request:
     types:
@@ -23,6 +25,8 @@ on:
       - 'src/backend-api/**/*.py'
       - 'src/backend-api/pyproject.toml'
       - 'src/backend-api/pytest.ini'
+      - 'src/processor/**/*.py'
+      - 'src/processor/pyproject.toml'
       - '.github/workflows/test.yml'
 
 permissions:
@@ -36,10 +40,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 +52,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 +75,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 +111,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."

infra/main.bicep

@@ -1110,6 +1110,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

@@ -1063,6 +1063,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'

src/backend-api/pyproject.toml

@@ -16,23 +16,26 @@ dependencies = [
     "httpx==0.28.1",
     "pydantic-settings==2.10.1",
     "python-dotenv==1.2.2",
-    "python-multipart==0.0.26",
+    "python-multipart==0.0.27",
     "protobuf==7.34.0",
     "sas-cosmosdb==0.1.4",
     "semantic-kernel==1.40.0",
     "uvicorn==0.35.0",
 ]
 
 [dependency-groups]
-dev = ["pytest>=9.0.3", "pytest-cov>=6.2.1"]
+dev = ["pytest>=9.0.3", "pytest-cov>=6.2.1", "pytest-asyncio>=0.23.0"]
+
+[tool.coverage.run]
+omit = ["src/tests/*"]
 
 [tool.uv]
 override-dependencies = [
     "av==16.0.0",
     "starlette==0.49.1",
     "aiohttp==3.13.4",
     "azure-core==1.38.0",
-    "urllib3==2.6.3",
+    "urllib3==2.7.0",
     "requests==2.33.0",
     "werkzeug==3.1.4",
     "pygments==2.20.0",

src/backend-api/src/tests/application/test_application.py

@@ -0,0 +1,38 @@
+"""Tests for application.Application bootstrap."""
+
+from application import Application
+from libs.base.typed_fastapi import TypedFastAPI
+from libs.services.interfaces import IDataService, IHttpService, ILoggerService
+from libs.services.process_services import ProcessService
+
+
+def test_application_initializes_typed_fastapi():
+    app = Application()
+    assert isinstance(app.app, TypedFastAPI)
+    assert app.app.title == "FastAPI Application"
+    assert app.app.version == "1.0.0"
+
+
+def test_application_sets_app_context_on_app():
+    app = Application()
+    assert app.app.app_context is app.application_context
+
+
+def test_application_registers_core_services():
+    app = Application()
+    ctx = app.application_context
+    assert ctx.get_service(ILoggerService) is not None
+    assert ctx.get_service(IHttpService) is not None
+    assert ctx.get_service(IDataService) is not None
+    assert ctx.get_service(ProcessService) is not None
+
+
+def test_application_includes_routers():
+    app = Application()
+    paths = {route.path for route in app.app.routes}
+    # router_files
+    assert "/api/file/upload" in paths
+    # router_process
+    assert "/api/process/create" in paths
+    # http_probes
+    assert "/health" in paths