updated search service

Author: AjitPadhi-Microsoft

infra/main.bicep

@@ -113,10 +113,10 @@ param enableRedundancy bool = false
 param enablePrivateNetworking bool = true
 
 @description('Optional. The Container Registry hostname where the docker images are located.')
-param acrName string = 'byocgacontainerreg'
+param acrName string = 'testapwaf'
 
 @description('Optional. Image Tag.')
-param imageTag string = 'latest'
+param imageTag string = 'waf'
 
 @description('Optional. Enable/Disable usage telemetry for module.')
 param enableTelemetry bool = true
@@ -679,16 +679,16 @@ module aiSearch 'br/public:avm/res/search/search-service:0.11.1' = {
     replicaCount: 1
     partitionCount: 1
     roleAssignments: [
-      {
-        roleDefinitionIdOrName: 'Cognitive Services Contributor' // Cognitive Search Contributor
-        principalId: userAssignedIdentity.outputs.principalId
-        principalType: 'ServicePrincipal'
-      }
-      {
-        roleDefinitionIdOrName: 'Cognitive Services OpenAI User'//'5e0bd9bd-7b93-4f28-af87-19fc36ad61bd'// Cognitive Services OpenAI User
-        principalId: userAssignedIdentity.outputs.principalId
-        principalType: 'ServicePrincipal'
-      }
+      // {
+      //   roleDefinitionIdOrName: 'Cognitive Services Contributor' // Cognitive Search Contributor
+      //   principalId: userAssignedIdentity.outputs.principalId
+      //   principalType: 'ServicePrincipal'
+      // }
+      // {
+      //   roleDefinitionIdOrName: 'Cognitive Services OpenAI User'//'5e0bd9bd-7b93-4f28-af87-19fc36ad61bd'// Cognitive Services OpenAI User
+      //   principalId: userAssignedIdentity.outputs.principalId
+      //   principalType: 'ServicePrincipal'
+      // }
       {
         roleDefinitionIdOrName: 'Search Index Data Contributor' // 1407120a-92aa-4202-b7e9-c0e197c71c8f
         principalId: userAssignedIdentity.outputs.principalId
@@ -729,9 +729,6 @@ resource aiSearchFoundryConnection 'Microsoft.CognitiveServices/accounts/project
       location: aiSearch.outputs.location
     }
   }
-  dependsOn: [
-    aiFoundryAiServicesProject
-  ]
 }
 
 module existing_AIProject_SearchConnectionModule 'modules/deploy_aifp_aisearch_connection.bicep' = if (useExistingAiFoundryAiProject) {

infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.37.4.10188",
-      "templateHash": "16064952426626724338"
+      "templateHash": "12183275118675645429"
     },
     "name": "Document Generation Solution Accelerator",
     "description": "CSA CTO Gold Standard Solution Accelerator for Document Generation.\n"
@@ -211,14 +211,14 @@
     },
     "acrName": {
       "type": "string",
-      "defaultValue": "byocgacontainerreg",
+      "defaultValue": "testapwaf",
       "metadata": {
         "description": "Optional. The Container Registry hostname where the docker images are located."
       }
     },
     "imageTag": {
       "type": "string",
-      "defaultValue": "latest",
+      "defaultValue": "waf",
       "metadata": {
         "description": "Optional. Image Tag."
       }
@@ -401,7 +401,6 @@
         }
       },
       "dependsOn": [
-        "aiFoundryAiServicesProject",
         "aiSearch"
       ]
     },
@@ -30020,16 +30019,6 @@
           },
           "roleAssignments": {
             "value": [
-              {
-                "roleDefinitionIdOrName": "Cognitive Services Contributor",
-                "principalId": "[reference('userAssignedIdentity').outputs.principalId.value]",
-                "principalType": "ServicePrincipal"
-              },
-              {
-                "roleDefinitionIdOrName": "Cognitive Services OpenAI User",
-                "principalId": "[reference('userAssignedIdentity').outputs.principalId.value]",
-                "principalType": "ServicePrincipal"
-              },
               {
                 "roleDefinitionIdOrName": "Search Index Data Contributor",
                 "principalId": "[reference('userAssignedIdentity').outputs.principalId.value]",
@@ -38209,8 +38198,8 @@
         }
       },
       "dependsOn": [
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
         "network",
         "userAssignedIdentity"
       ]