Merge dev branch, keeping local DeploymentGuide.md

Author: Rafi-Microsoft

.devcontainer/devcontainer.json

@@ -5,7 +5,10 @@
     "features": {
         "ghcr.io/azure/azure-dev/azd:latest": {},
         "ghcr.io/devcontainers/features/azure-cli:1": {},
-        "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+        "ghcr.io/jlaundry/devcontainer-features/mssql-odbc-driver:1": {
+			"version": "18"
+		}
     },
     "customizations": {
         "vscode": {

.devcontainer/setup_env.sh

@@ -6,4 +6,5 @@ git pull
 # provide execute permission to quotacheck script
 sudo chmod +x ./infra/scripts/checkquota_km.sh
 sudo chmod +x ./infra/scripts/quota_check_params.sh
-sudo chmod +x ./infra/scripts/run_process_data_scripts.sh
+sudo chmod +x ./infra/scripts/process_sample_data.sh
+sudo chmod +x ./infra/scripts/process_custom_data.sh

.github/workflows/codeql.yml

@@ -14,9 +14,15 @@ name: "CodeQL"
 on:
   push:
     branches: [ "main" ]
+    paths:
+      - '**/*.py'
+      - '.github/workflows/codeql.yml'
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ "main" ]
+    paths:
+      - '**/*.py'
+      - '.github/workflows/codeql.yml'
   schedule:
     - cron: '17 11 * * 0'
 

.github/workflows/deploy-KMGeneric.yml

@@ -124,7 +124,7 @@ jobs:
           az deployment group create \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
-            --parameters solutionName=${{env.SOLUTION_PREFIX}} location="${{ env.AZURE_LOCATION }}" contentUnderstandingLocation="swedencentral" secondaryLocation="${{ env.AZURE_LOCATION }}" gptDeploymentCapacity=150 aiServiceLocation="${{ env.AZURE_LOCATION }}" createdBy="Pipeline" tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"
+            --parameters solutionName=${{env.SOLUTION_PREFIX}} location="${{ env.AZURE_LOCATION }}" contentUnderstandingLocation="swedencentral" secondaryLocation="${{ env.AZURE_LOCATION }}" gptDeploymentCapacity=150 aiServiceLocation="${{ env.AZURE_LOCATION }}" createdBy="Pipeline" tags="{'Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"
 
      
 

.github/workflows/deploy-linux.yml

@@ -1,8 +1,24 @@
 name: Deploy-Test-Cleanup Linux
 on:
-  push:
+  pull_request:
     branches:
       - main
+    paths:
+      - 'src/App/**/*.js'
+      - 'src/App/**/*.jsx'
+      - 'src/App/**/*.ts'
+      - 'src/App/**/*.tsx'
+      - 'src/App/**/*.html'
+      - 'src/App/**/*.css'
+      - 'src/App/**/*.scss'
+      - 'src/App/**/*.json'
+      - 'src/**/*.py'
+      - 'src/api/requirements.txt'
+      - 'src/**/*.Dockerfile'
+      - 'infra/**/*.bicep'
+      - 'infra/**/*.json'
+      - 'azure.yaml'
+      - '.github/workflows/deploy-*.yml'
   workflow_dispatch:
     inputs:
       azure_location:
@@ -12,13 +28,14 @@ on:
         type: choice
         options:
           - 'australiaeast'
-          - 'centralus'
-          - 'eastasia'
+          - 'eastus'
           - 'eastus2'
+          - 'francecentral'
           - 'japaneast'
-          - 'northeurope'
-          - 'southeastasia'
+          - 'swedencentral'
           - 'uksouth'
+          - 'westus'
+          - 'westus2'
       resource_group_name:
         description: 'Resource Group Name (Optional)'
         required: false

.github/workflows/deploy-windows.yml

@@ -1,8 +1,8 @@
 name: Deploy-Test-Cleanup Windows
 on:
-  push:
-    branches:
-      - main
+  # push:
+  #   branches:
+  #     - main
   workflow_dispatch:
     inputs:
       azure_location:
@@ -12,13 +12,14 @@ on:
         type: choice
         options:
           - 'australiaeast'
-          - 'centralus'
-          - 'eastasia'
+          - 'eastus'
           - 'eastus2'
+          - 'francecentral'
           - 'japaneast'
-          - 'northeurope'
-          - 'southeastasia'
+          - 'swedencentral'
           - 'uksouth'
+          - 'westus'
+          - 'westus2'
       resource_group_name:
         description: 'Resource Group Name (Optional)'
         required: false

.github/workflows/deploy.yml

@@ -5,6 +5,9 @@ on:
   push:
     branches:
       - main
+    paths:
+      - 'docs/workshop/**'
+      - '.github/workflows/deploy.yml'
 
 permissions:
   contents: write

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

@@ -144,10 +144,6 @@ jobs:
           else
             echo "❌ EXP DISABLED - Skipping EXP parameters"
           fi
-
-          # Set tags for deployment  
-          echo "Setting deployment tags..."
-          azd env set AZURE_TAG_SECURITY_CONTROL="Ignore"
           
           azd up --no-prompt
           

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

@@ -137,10 +137,6 @@ jobs:
             Write-Host "❌ EXP DISABLED - Skipping EXP parameters"
           }
 
-          # Set tags for deployment  
-          Write-Host "Setting deployment tags..."
-          azd env set AZURE_TAG_SECURITY_CONTROL="Ignore"
-
           # Deploy using azd up
           azd up --no-prompt
           

.github/workflows/pylint.yml

@@ -1,6 +1,12 @@
 name: PyLint
 
-on: [push]
+on: 
+  push:
+    paths:
+      - 'src/**/*.py'
+      - 'src/api/requirements*.txt'
+      - '.flake8'
+      - '.github/workflows/pylint.yml'
 
 jobs:
   build: