Merge pull request #479 from microsoft/psl-cps-v2

feat: CPS V2 changes to dev

Author: Prajwal-Microsoft

.coverage

@@ -7,8 +7,7 @@ FROM ghcr.io/astral-sh/uv:$UV_VERSION AS uv
 # Use Debian-based VS Code Dev Container as base
 FROM mcr.microsoft.com/vscode/devcontainers/base:$DEBIAN_VERSION
 
-# Remove Yarn repository to avoid GPG key expiration issue
-RUN rm -f /etc/apt/sources.list.d/yarn.list
+ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
 
 # Install dependencies and Node.js 20+ from NodeSource
 RUN apt-get update \
@@ -18,13 +17,16 @@ RUN apt-get update \
     && apt-get install -y nodejs \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
-    && curl -fsSL https://aka.ms/install-azd.sh | bash
+    && curl -fsSL https://aka.ms/install-azd.sh | bash \
+    && ln -sf /usr/bin/python3 /usr/bin/python
 
 # Copy UV binaries
 COPY --from=uv --chown=vscode: /uv /uvx /bin/
 
 # Install global NPM packages
-RUN npm install -g tslint-to-eslint-config typescript yarn react-app-rewired
+RUN npm install -g tslint-to-eslint-config typescript react-app-rewired \
+    && corepack enable \
+    && corepack prepare pnpm@10.28.2 --activate
 
 # Set default shell
 SHELL ["/bin/bash", "-c"]

.devcontainer/Dockerfile

@@ -18,7 +18,7 @@ cd ../../
 
 echo "Installing dependencies for ContentProcessorWeb..."
 cd ./src/ContentProcessorWeb
-yarn install
+pnpm install
 
 cd ../../
 
@@ -27,6 +27,6 @@ sed -i 's/\r$//' infra/scripts/post_deployment.sh
 sudo chmod +x infra/scripts/docker-build.sh
 sudo chmod +x infra/scripts/post_deployment.sh
 sudo chmod +x src/ContentProcessorAPI/samples/upload_files.sh
-sudo chmod +x src/ContentProcessorAPI/samples/schemas/register_schema.sh
+# register_schema.py is cross-platform and does not need chmod
 
 echo "Setup complete! 🎉"

.devcontainer/setupEnv.sh

@@ -2,7 +2,7 @@ name: Build and Push Docker Images
 
 on:
   push:
-    branches: [main, dev, demo, hotfix]
+    branches: [main, dev, demo, hotfix, psl-docker-build-and-push-v2, psl-cps-v2]
     paths:
       - 'src/ContentProcessor/src/**'
       - 'src/**/Dockerfile'
@@ -21,7 +21,7 @@ on:
       - 'src/ContentProcessorWeb/env.sh'
       - '.github/workflows/build-docker-image.yml'
   pull_request:
-    branches: [main, dev, demo, hotfix]
+    branches: [main, dev, demo, hotfix, psl-docker-build-and-push-v2, psl-cps-v2]
     types: [opened, ready_for_review, reopened, synchronize]
     paths:
       - 'src/ContentProcessor/src/**'
@@ -69,15 +69,15 @@ jobs:
         run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
 
       - name: Login to Azure
-        if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' }}
+        if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' || github.ref_name == 'psl-docker-build-and-push-v2' || github.ref_name == 'psl-cps-v2' }}
         uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: Log in to Azure Container Registry
-        if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' }}
+        if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' || github.ref_name == 'psl-docker-build-and-push-v2' || github.ref_name == 'psl-cps-v2' }}
         run: az acr login --name ${{ env.ACR_LOGIN_SERVER }}
 
       - name: Get registry
@@ -92,7 +92,7 @@ jobs:
           DATE="${{ steps.date.outputs.date }}"
           GITHUB_RUN_NUMBER="${{ github.run_number }}"
           if [[ "$BRANCH" == "main" ]]; then
-            BASE_TAG="latest"
+            BASE_TAG="latest_v2"
           elif [[ "$BRANCH" == "dev" ]]; then
             BASE_TAG="dev"
           elif [[ "$BRANCH" == "demo" ]]; then
@@ -101,6 +101,10 @@ jobs:
             BASE_TAG="hotfix"
           elif [[ "$BRANCH" == "dependabotchanges" ]]; then
             BASE_TAG="dependabotchanges"
+          elif [[ "$BRANCH" == "psl-docker-build-and-push-v2" ]]; then
+            BASE_TAG="latest_v2"
+          elif [[ "$BRANCH" == "psl-cps-v2" ]]; then
+            BASE_TAG="latest_v2"
             
           else
             BASE_TAG="pullrequest-ignore"
@@ -115,7 +119,7 @@ jobs:
         with:
           context: ./src/ContentProcessor
           file: ./src/ContentProcessor/Dockerfile
-          push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' }}
+          push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' || github.ref_name == 'psl-docker-build-and-push-v2' || github.ref_name == 'psl-cps-v2' }}
           tags: |
             ${{ steps.registry.outputs.ext_registry }}/contentprocessor:${{ env.BASE_TAG }}
             ${{ steps.registry.outputs.ext_registry }}/contentprocessor:${{ env.DATE_TAG }}
@@ -125,7 +129,7 @@ jobs:
         with:
           context: ./src/ContentProcessorAPI
           file: ./src/ContentProcessorAPI/Dockerfile
-          push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' }}
+          push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' || github.ref_name == 'psl-docker-build-and-push-v2' || github.ref_name == 'psl-cps-v2' }}
           tags: |
             ${{ steps.registry.outputs.ext_registry }}/contentprocessorapi:${{ env.BASE_TAG }}
             ${{ steps.registry.outputs.ext_registry }}/contentprocessorapi:${{ env.DATE_TAG }}
@@ -135,7 +139,17 @@ jobs:
         with:
           context: ./src/ContentProcessorWeb
           file: ./src/ContentProcessorWeb/Dockerfile
-          push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' }}
+          push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' || github.ref_name == 'psl-docker-build-and-push-v2' || github.ref_name == 'psl-cps-v2' }}
           tags: |
             ${{ steps.registry.outputs.ext_registry }}/contentprocessorweb:${{ env.BASE_TAG }}
             ${{ steps.registry.outputs.ext_registry }}/contentprocessorweb:${{ env.DATE_TAG }}
+
+      - name: Build and Push ContentProcessorWorkflow Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: ./src/ContentProcessorWorkflow
+          file: ./src/ContentProcessorWorkflow/Dockerfile
+          push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' || github.ref_name == 'psl-docker-build-and-push-v2' || github.ref_name == 'psl-cps-v2' }}
+          tags: |
+            ${{ steps.registry.outputs.ext_registry }}/contentprocessorworkflow:${{ env.BASE_TAG }}
+            ${{ steps.registry.outputs.ext_registry }}/contentprocessorworkflow:${{ env.DATE_TAG }}

.github/workflows/build-docker-image.yml

@@ -1,4 +1,4 @@
-name: Deploy-Test-Cleanup (v2)
+name: Deploy-Test-Cleanup (v2) Linux
 on:
   push:
     branches:
@@ -22,14 +22,6 @@ on:
       - '.github/workflows/deploy-linux.yml'
   workflow_dispatch:
     inputs:
-      runner_os:
-        description: 'Deployment Environment'
-        required: false
-        type: choice
-        options:
-          - 'codespace'
-          - 'Local'
-        default: 'codespace'
       azure_location:
         description: 'Azure Location For Deployment'
         required: false
@@ -103,7 +95,6 @@ on:
 permissions:
   contents: read
   actions: read
-  id-token: write
 jobs:
   validate-inputs:
     runs-on: ubuntu-latest
@@ -119,13 +110,11 @@ jobs:
       azure_env_log_analytics_workspace_id: ${{ steps.validate.outputs.azure_env_log_analytics_workspace_id }}
       azure_existing_ai_project_resource_id: ${{ steps.validate.outputs.azure_existing_ai_project_resource_id }}
       existing_webapp_url: ${{ steps.validate.outputs.existing_webapp_url }}
-      runner_os: ${{ steps.validate.outputs.runner_os }}
     steps:
       - name: Validate Workflow Input Parameters
         id: validate
         shell: bash
         env:
-          INPUT_RUNNER_OS: ${{ github.event.inputs.runner_os }}
           INPUT_AZURE_LOCATION: ${{ github.event.inputs.azure_location }}
           INPUT_RESOURCE_GROUP_NAME: ${{ github.event.inputs.resource_group_name }}
           INPUT_WAF_ENABLED: ${{ github.event.inputs.waf_enabled }}
@@ -140,15 +129,6 @@ jobs:
           echo "🔍 Validating workflow input parameters..."
           VALIDATION_FAILED=false
           
-          # Derive actual runner from runner_os input
-          RUNNER_OS_INPUT="${INPUT_RUNNER_OS:-codespace}"
-          if [[ "$RUNNER_OS_INPUT" == "codespace" ]]; then
-            RUNNER_OS="ubuntu-latest"
-          else
-            RUNNER_OS="windows-latest"
-          fi
-          echo "✅ runner_os derived as: '$RUNNER_OS'"
-          
           # Validate azure_location (Azure region format)
           LOCATION="${INPUT_AZURE_LOCATION:-australiaeast}"
           
@@ -271,7 +251,6 @@ jobs:
           
           # Output validated values
           echo "passed=true" >> $GITHUB_OUTPUT
-          echo "runner_os=$RUNNER_OS" >> $GITHUB_OUTPUT
           echo "azure_location=$LOCATION" >> $GITHUB_OUTPUT
           echo "resource_group_name=$INPUT_RESOURCE_GROUP_NAME" >> $GITHUB_OUTPUT
           echo "waf_enabled=$WAF_ENABLED" >> $GITHUB_OUTPUT
@@ -288,7 +267,7 @@ jobs:
     if: needs.validate-inputs.outputs.validation_passed == 'true'
     uses: ./.github/workflows/deploy-orchestrator.yml
     with:
-      runner_os: ${{ needs.validate-inputs.outputs.runner_os || 'ubuntu-latest' }}
+      runner_os: ubuntu-latest
       azure_location: ${{ needs.validate-inputs.outputs.azure_location || 'australiaeast' }}
       resource_group_name: ${{ needs.validate-inputs.outputs.resource_group_name || '' }}
       waf_enabled: ${{ needs.validate-inputs.outputs.waf_enabled == 'true' }}

.github/workflows/deploy-v2.yml .github/workflows/deploy-linux.yml.github/workflows/deploy-v2.yml renamed to .github/workflows/deploy-linux.yml

@@ -64,6 +64,9 @@ on:
 
 env:
   AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}
+permissions:
+  contents: read
+  actions: read
 jobs:
   docker-build:
     uses: ./.github/workflows/job-docker-build.yml
@@ -102,7 +105,7 @@ jobs:
     secrets: inherit
 
   cleanup-deployment:
-    if: "!cancelled() && needs.deploy.outputs.RESOURCE_GROUP_NAME != '' && inputs.existing_webapp_url == '' && (inputs.trigger_type != 'workflow_dispatch' || inputs.cleanup_resources)"    
+    if: "!cancelled() && needs.deploy.result == 'success' && needs.deploy.outputs.RESOURCE_GROUP_NAME != '' && inputs.existing_webapp_url == '' && (inputs.trigger_type != 'workflow_dispatch' || inputs.cleanup_resources)"    
     needs: [docker-build, deploy, e2e-test]
     uses: ./.github/workflows/job-cleanup-deployment.yml
     with: