Merge branch 'main' into psl-oidc

Author: Vamshi-Microsoft

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# These owners will be the default owners for everything in the repo.
+* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @aniaroramsft @Vinay-Microsoft @malrose07 @toherman-msft @nchandhi

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

@@ -181,7 +181,7 @@ jobs:
           echo ""
           echo "✅ All input parameters validated successfully!"
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure Parameters Based on WAF Setting
         shell: bash

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

@@ -183,7 +183,7 @@ jobs:
           echo "✅ All input parameters validated successfully!"
 
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure Parameters Based on WAF Setting
         shell: bash

.github/workflows/job-deploy.yml

@@ -320,7 +320,7 @@ jobs:
           
           
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Login to Azure (OIDC)
         uses: azure/login@v2

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

@@ -29,7 +29,7 @@ jobs:
       IMAGE_TAG: ${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Generate Unique Docker Image Tag
         id: generate_docker_tag

.github/workflows/test-automation-v2.yml

@@ -34,7 +34,7 @@ jobs:
       TEST_REPORT_URL: ${{ steps.upload_report.outputs.artifact-url }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -136,7 +136,7 @@ jobs:
 
       - name: Upload test report
         id: upload_report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: ${{ !cancelled() }}
         with:
           name: test-report

archive-doc-gen/scripts/auth_init.py

@@ -59,7 +59,7 @@ def add_client_secret(credential, app_id):
 
 
 def update_azd_env(name, val):
-    subprocess.run(f"azd env set {name} {val}", shell=True)
+    subprocess.run(["azd", "env", "set", name, val], shell=False, check=True)
 
 
 if __name__ == "__main__":

archive-doc-gen/scripts/data_preparation.py

@@ -152,9 +152,15 @@ def create_or_update_search_index(
     if not admin_key:
         admin_key = json.loads(
             subprocess.run(
-                f"az search admin-key show --subscription {subscription_id} --resource-group {resource_group} --service-name {service_name}",
-                shell=True,
+                [
+                    "az", "search", "admin-key", "show",
+                    "--subscription", subscription_id,
+                    "--resource-group", resource_group,
+                    "--service-name", service_name
+                ],
+                shell=False,
                 capture_output=True,
+                check=True,
             ).stdout
         )["primaryKey"]
 
@@ -312,9 +318,15 @@ def upload_documents_to_index(
     if not admin_key:
         admin_key = json.loads(
             subprocess.run(
-                f"az search admin-key show --subscription {subscription_id} --resource-group {resource_group} --service-name {service_name}",
-                shell=True,
+                [
+                    "az", "search", "admin-key", "show",
+                    "--subscription", subscription_id,
+                    "--resource-group", resource_group,
+                    "--service-name", service_name
+                ],
+                shell=False,
                 capture_output=True,
+                check=True,
             ).stdout
         )["primaryKey"]
 
@@ -349,9 +361,15 @@ def validate_index(service_name, subscription_id, resource_group, index_name):
     api_version = "2024-03-01-Preview"
     admin_key = json.loads(
         subprocess.run(
-            f"az search admin-key show --subscription {subscription_id} --resource-group {resource_group} --service-name {service_name}",
-            shell=True,
+            [
+                "az", "search", "admin-key", "show",
+                "--subscription", subscription_id,
+                "--resource-group", resource_group,
+                "--service-name", service_name
+            ],
+            shell=False,
             capture_output=True,
+            check=True,
         ).stdout
     )["primaryKey"]
 

content-gen/infra/main.bicep

@@ -261,6 +261,7 @@ var imageModelDeployment = imageModelChoice != 'none' ? [
 var aiFoundryAiServicesModelDeployment = concat(baseModelDeployments, imageModelDeployment)
 
 var aiFoundryAiProjectDescription = 'Content Generation AI Foundry Project'
+var existingTags = resourceGroup().tags ?? {}
 
 // ============== //
 // Resources      //
@@ -289,13 +290,15 @@ resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableT
 resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
   name: 'default'
   properties: {
-    tags: {
-      ...resourceGroup().tags
-      ... tags
-      TemplateName: 'ContentGen'
-      Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
-      CreatedBy: createdBy
-    }
+    tags: union(
+      existingTags,
+      tags,
+      {
+        TemplateName: 'ContentGen'
+        Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
+        CreatedBy: createdBy
+      }
+    )
   }
 }
 

content-gen/infra/main.json

@@ -321,6 +321,7 @@
     "imageModelDeployment": "[if(not(equals(parameters('imageModelChoice'), 'none')), createArray(createObject('format', 'OpenAI', 'name', variables('imageModelConfig')[parameters('imageModelChoice')].name, 'model', variables('imageModelConfig')[parameters('imageModelChoice')].name, 'sku', createObject('name', variables('imageModelConfig')[parameters('imageModelChoice')].sku, 'capacity', parameters('imageModelCapacity')), 'version', variables('imageModelConfig')[parameters('imageModelChoice')].version, 'raiPolicyName', 'Microsoft.Default')), createArray())]",
     "aiFoundryAiServicesModelDeployment": "[concat(variables('baseModelDeployments'), variables('imageModelDeployment'))]",
     "aiFoundryAiProjectDescription": "Content Generation AI Foundry Project",
+    "existingTags": "[coalesce(resourceGroup().tags, createObject())]",
     "logAnalyticsWorkspaceResourceName": "[format('log-{0}', variables('solutionSuffix'))]",
     "applicationInsightsResourceName": "[format('appi-{0}', variables('solutionSuffix'))]",
     "userAssignedIdentityResourceName": "[format('id-{0}', variables('solutionSuffix'))]",
@@ -377,7 +378,7 @@
       "apiVersion": "2021-04-01",
       "name": "default",
       "properties": {
-        "tags": "[shallowMerge(createArray(resourceGroup().tags, parameters('tags'), createObject('TemplateName', 'ContentGen', 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF'), 'CreatedBy', parameters('createdBy'))))]"
+        "tags": "[union(variables('existingTags'), parameters('tags'), createObject('TemplateName', 'ContentGen', 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF'), 'CreatedBy', parameters('createdBy')))]"
       }
     },
     "aiSearchFoundryConnection": {