Merge branch 'dev' of https://github.com/microsoft/content-generation-solution-accelerator into rc-psl-e2efix

Author: Ragini-Microsoft

content-gen/.env.sample .env.samplecontent-gen/.env.sample renamed to .env.sample

@@ -18,9 +18,9 @@ updates:
   # Python (pip) dependencies - grouped
   - package-ecosystem: "pip"
     directories:
-      - "/content-gen/src/backend"
-      - "/content-gen/infra/vscode_web"
-      - "/content-gen/scripts"
+      - "/src/backend"
+      - "/infra/vscode_web"
+      - "/scripts"
     schedule:
       interval: "monthly"
     target-branch: "dependabotchanges"
@@ -35,8 +35,8 @@ updates:
   # npm dependencies - grouped
   - package-ecosystem: "npm"
     directories:
-      - "/content-gen/src/app/frontend"
-      - "/content-gen/src/app/frontend-server"
+      - "/src/app/frontend"
+      - "/src/app/frontend-server"
     schedule:
       interval: "monthly"
     target-branch: "dependabotchanges"

.github/dependabot.yml

@@ -1,36 +1,52 @@
 name: Azure Template Validation
 on:
   workflow_dispatch:
-
+  push:
+    branches:
+      - main
+ 
 permissions:
   contents: read
   id-token: write
   pull-requests: write
-
+ 
 jobs:
   template_validation_job:
     runs-on: ubuntu-latest
+    environment: production
     name: Template validation
-
+ 
     steps:
       # Step 1: Checkout the code from your repository
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # Step 2: Validate the Azure template using microsoft/template-validation-action
+      # Step 2: Pre-authenticate Azure for azd validation
+      - name: Login to Azure
+        shell: bash
+        run: |
+          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 }}"
+ 
+      # Step 3: Validate the Azure template using microsoft/template-validation-action
       - name: Validate Azure Template
         uses: microsoft/template-validation-action@v0.4.3
-        id: validation
         with:
-          workingDirectory: ./content-gen
+          workingDirectory: .
+          validateAzd: ${{ vars.TEMPLATE_VALIDATE_AZD }}
+          useDevContainer: ${{ vars.TEMPLATE_USE_DEV_CONTAINER }}
+          validateTests: ${{ vars.TEMPLATE_VALIDATE_TESTS }}
+        id: validation
         env:
           AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
           AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           AZURE_ENV_NAME: ${{ secrets.AZURE_ENV_NAME }}
           AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
+          AZURE_ENV_OPENAI_LOCATION: ${{ secrets.AZURE_ENV_OPENAI_LOCATION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      # Step 3: Print the result of the validation
+ 
+      # Step 4: Print the result of the validation
       - name: Print result
-        run: cat ${{ steps.validation.outputs.resultFile }}
+        run: cat ${{ steps.validation.outputs.resultFile }}

.github/workflows/azure-dev.yml

@@ -4,12 +4,12 @@ on:
     branches:
       - main
     paths:
-      - 'content-gen/src/**'
-      - '!content-gen/src/tests/**'
-      - 'content-gen/infra/**/*.bicep'
-      - 'content-gen/infra/**/*.json'
-      - 'content-gen/*.yaml'
-      - 'content-gen/scripts/**'
+      - 'src/**'
+      - '!src/tests/**'
+      - 'infra/**/*.bicep'
+      - 'infra/**/*.json'
+      - '*.yaml'
+      - 'scripts/**'
       - '.github/workflows/deploy-*.yml'
   workflow_run:
     workflows: ["Build Docker and Optional Push"]

.github/workflows/deploy-v2.yml

@@ -7,9 +7,9 @@ on:
       - dev
       - demo
     paths:
-      - 'content-gen/src/backend/**'
-      - 'content-gen/src/app/frontend/**'
-      - 'content-gen/src/app/frontend-server/**'
+      - 'src/backend/**'
+      - 'src/app/frontend/**'
+      - 'src/app/frontend-server/**'
       - '.github/workflows/docker-build.yml'
   pull_request:
     types:
@@ -22,9 +22,9 @@ on:
       - dev
       - demo
     paths:
-      - 'content-gen/src/backend/**'
-      - 'content-gen/src/app/frontend/**'
-      - 'content-gen/src/app/frontend-server/**'
+      - 'src/backend/**'
+      - 'src/app/frontend/**'
+      - 'src/app/frontend-server/**'
       - '.github/workflows/docker-build.yml'
   workflow_dispatch:
 
@@ -83,8 +83,8 @@ jobs:
       - name: Build and Push Docker Image for Frontend Server
         uses: docker/build-push-action@v6
         with:
-          context: ./content-gen/src/app
-          file: ./content-gen/src/app/WebApp.Dockerfile
+          context: ./src/app
+          file: ./src/app/WebApp.Dockerfile
           push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo'  || github.ref_name == 'dependabotchanges'  }}
           tags: |
             ${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}/content-gen-app:${{ steps.determine_tag.outputs.tagname }}
@@ -93,8 +93,8 @@ jobs:
       - name: Build and Push Docker Image for Backend Server
         uses: docker/build-push-action@v6
         with:
-          context: ./content-gen/src/backend
-          file: ./content-gen/src/backend/ApiApp.Dockerfile
+          context: ./src/backend
+          file: ./src/backend/ApiApp.Dockerfile
           push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo'  || github.ref_name == 'dependabotchanges' }}
           tags: |
             ${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}/content-gen-api:${{ steps.determine_tag.outputs.tagname }}

.github/workflows/docker-build.yml

@@ -189,7 +189,7 @@ jobs:
           WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
         run: |
           if [[ "$WAF_ENABLED" == "true" ]]; then
-            cp content-gen/infra/main.waf.parameters.json content-gen/infra/main.parameters.json
+            cp infra/main.waf.parameters.json infra/main.parameters.json
             echo "✅ Successfully copied WAF parameters to main parameters file"
           else
             echo "🔧 Configuring Non-WAF deployment - using default main.parameters.json..."
@@ -226,9 +226,6 @@ jobs:
         run: |
           set -e
 
-          # Change to content-gen directory where azure.yaml lives
-          cd content-gen
-
           echo "Creating environment..."
           azd env new "$ENV_NAME" --no-prompt
           echo "Environment created: $ENV_NAME"

.github/workflows/job-deploy-linux.yml

@@ -191,7 +191,7 @@ jobs:
           WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
         run: |
           if [[ "$WAF_ENABLED" == "true" ]]; then
-            cp content-gen/infra/main.waf.parameters.json content-gen/infra/main.parameters.json
+            cp infra/main.waf.parameters.json infra/main.parameters.json
             echo "✅ Successfully copied WAF parameters to main parameters file"
           else
             echo "🔧 Configuring Non-WAF deployment - using default main.parameters.json..."
@@ -229,9 +229,6 @@ jobs:
         run: |
           $ErrorActionPreference = "Stop"
 
-          # Change to content-gen directory where azure.yaml lives
-          Push-Location content-gen
-
           Write-Host "Creating environment..."
           azd env new $env:ENV_NAME --no-prompt
           Write-Host "Environment created: $env:ENV_NAME"

.github/workflows/job-deploy-windows.yml

@@ -338,10 +338,10 @@ jobs:
           IMAGE_MODEL_MIN_CAPACITY: ${{ env.IMAGE_MODEL_MIN_CAPACITY }}
           AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
         run: |
-          chmod +x content-gen/scripts/checkquota.sh
-          if ! content-gen/scripts/checkquota.sh; then
+          chmod +x scripts/checkquota.sh
+          if ! scripts/checkquota.sh; then
             # If quota check fails due to insufficient quota, set the flag
-            if grep -q "No region with sufficient quota found" content-gen/scripts/checkquota.sh; then
+            if grep -q "No region with sufficient quota found" scripts/checkquota.sh; then
               echo "QUOTA_FAILED=true" >> $GITHUB_ENV
             fi
             exit 1  # Fail the pipeline if any other failure occurs

.github/workflows/job-deploy.yml

@@ -65,8 +65,8 @@ jobs:
         env:
           DOCKER_BUILD_SUMMARY: false
         with:
-          context: ./content-gen/src/app
-          file: ./content-gen/src/app/WebApp.Dockerfile
+          context: ./src/app
+          file: ./src/app/WebApp.Dockerfile
           push: true
           tags: |
             ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
@@ -78,8 +78,8 @@ jobs:
         env:
           DOCKER_BUILD_SUMMARY: false
         with:
-          context: ./content-gen/src/backend
-          file: ./content-gen/src/backend/ApiApp.Dockerfile
+          context: ./src/backend
+          file: ./src/backend/ApiApp.Dockerfile
           push: true
           tags: |
             ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-api:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}

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

@@ -3,8 +3,8 @@ name: PyLint
 on: 
   push:
     paths:
-      - 'content-gen/src/backend/**/*.py'
-      - 'content-gen/src/backend/requirements*.txt'
+      - 'src/backend/**/*.py'
+      - 'src/backend/requirements*.txt'
       - '.flake8'
       - '.github/workflows/pylint.yml'
 
@@ -29,9 +29,9 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r content-gen/src/backend/requirements.txt
+          pip install -r src/backend/requirements.txt
           pip install flake8  # Ensure flake8 is installed explicitly
       
       - name: Run flake8
         run: |
-          flake8 --config=.flake8 content-gen/src/backend  # Specify the directory to lint
+          flake8 --config=.flake8 src/backend  # Specify the directory to lint