diff --git a/infra/app/function.bicep b/infra/app/function.bicep index ad2b2b76c..6752c26f6 100644 --- a/infra/app/function.bicep +++ b/infra/app/function.bicep @@ -123,7 +123,7 @@ module storageBlobRoleFunction '../core/security/role.bicep' = if (authType == ' } // Storage Queue Data Contributor -module storageQueueRoleFunction '../core/security/role.bicep' = if (authType == 'rbac') { +module storageQueueRoleFunction '../core/security/role.bicep' = { name: 'storage-queue-role-function' params: { principalId: function.outputs.identityPrincipalId diff --git a/infra/main.bicepparam b/infra/main.bicepparam index c212ee1bf..65a58328f 100644 --- a/infra/main.bicepparam +++ b/infra/main.bicepparam @@ -22,7 +22,7 @@ param azureOpenAIModelVersion = readEnvironmentVariable('AZURE_OPENAI_MODEL_VERS var subscriptionId = readEnvironmentVariable('AZURE_SUBSCRIPTION_ID', 'subscription_id') param resourceToken = toLower(uniqueString(subscriptionId, environmentName, location)) -// Retrieve the Search Name from the Searc Endpoint which will be in the format +// Retrieve the Search Name from the Search Endpoint which will be in the format // "https://uniquename.search.windows.net/" It will end in a slash. Bicep forces us to have a default, so we use // a default that we can manipulate in the same way to reduce another condition. // length(azureAISearchEndpoint) - 9) cuts the https:// and the trailing slash. We then take the first "part" of diff --git a/infra/main.json b/infra/main.json index 0cdae722c..7cc267dd8 100644 --- a/infra/main.json +++ b/infra/main.json @@ -5,7 +5,7 @@ "_generator": { "name": "bicep", "version": "0.26.54.24096", - "templateHash": "4295550392354123736" + "templateHash": "16664155418767856780" } }, "parameters": { @@ -6551,7 +6551,7 @@ "_generator": { "name": "bicep", "version": "0.26.54.24096", - "templateHash": "17960689149478457729" + "templateHash": "1284439119819629713" } }, "parameters": { @@ -7512,7 +7512,6 @@ ] }, { - "condition": "[equals(parameters('authType'), 'rbac')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2022-09-01", "name": "storage-queue-role-function", @@ -7763,7 +7762,7 @@ "_generator": { "name": "bicep", "version": "0.26.54.24096", - "templateHash": "17960689149478457729" + "templateHash": "1284439119819629713" } }, "parameters": { @@ -8724,7 +8723,6 @@ ] }, { - "condition": "[equals(parameters('authType'), 'rbac')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2022-09-01", "name": "storage-queue-role-function",