Skip to content

Commit 4694946

Browse files
committed
Fix ARM
1 parent 3b4c783 commit 4694946

File tree

1 file changed

+19
-33
lines changed

1 file changed

+19
-33
lines changed

infra/main.json

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.33.93.31351",
8-
"templateHash": "10307769654054798782"
8+
"templateHash": "8669457240634692488"
99
}
1010
},
1111
"parameters": {
@@ -148,15 +148,13 @@
148148
],
149149
"metadata": {
150150
"description": "Format of the chat model to deploy"
151-
},
152-
"defaultValue": "OpenAI"
151+
}
153152
},
154153
"agentName": {
155154
"type": "string",
156155
"metadata": {
157156
"description": "Name of agent to deploy"
158-
},
159-
"defaultValue": "agent-template-assistant"
157+
}
160158
},
161159
"aiAgentID": {
162160
"type": "string",
@@ -169,36 +167,31 @@
169167
"type": "string",
170168
"metadata": {
171169
"description": "Name of the chat model to deploy"
172-
},
173-
"defaultValue": "gpt-4o-mini"
170+
}
174171
},
175172
"agentDeploymentName": {
176173
"type": "string",
177174
"metadata": {
178175
"description": "Name of the model deployment"
179-
},
180-
"defaultValue": "gpt-4o-mini"
176+
}
181177
},
182178
"agentModelVersion": {
183179
"type": "string",
184180
"metadata": {
185181
"description": "Version of the chat model to deploy"
186-
},
187-
"defaultValue": "2024-07-18"
182+
}
188183
},
189184
"agentDeploymentSku": {
190185
"type": "string",
191186
"metadata": {
192187
"description": "Sku of the chat deployment"
193-
},
194-
"defaultValue": "GlobalStandard"
188+
}
195189
},
196190
"agentDeploymentCapacity": {
197191
"type": "int",
198192
"metadata": {
199193
"description": "Capacity of the chat deployment"
200-
},
201-
"defaultValue": 50
194+
}
202195
},
203196
"embedModelFormat": {
204197
"type": "string",
@@ -208,8 +201,7 @@
208201
],
209202
"metadata": {
210203
"description": "Format of the embedding model to deploy"
211-
},
212-
"defaultValue": "OpenAI"
204+
}
213205
},
214206
"embedModelName": {
215207
"type": "string",
@@ -221,36 +213,31 @@
221213
"type": "string",
222214
"metadata": {
223215
"description": "Name of the embedding model deployment"
224-
},
225-
"defaultValue": "text-embedding-3-small"
216+
}
226217
},
227218
"embeddingDeploymentDimensions": {
228219
"type": "string",
229220
"metadata": {
230221
"description": "Embedding model dimensionality"
231-
},
232-
"defaultValue": "100"
222+
}
233223
},
234224
"embedModelVersion": {
235225
"type": "securestring",
236226
"metadata": {
237227
"description": "Version of the embedding model to deploy"
238-
},
239-
"defaultValue": "1"
228+
}
240229
},
241230
"embedDeploymentSku": {
242231
"type": "string",
243232
"metadata": {
244233
"description": "Sku of the embeddings model deployment"
245-
},
246-
"defaultValue": "Standard"
234+
}
247235
},
248236
"embedDeploymentCapacity": {
249237
"type": "int",
250238
"metadata": {
251239
"description": "Capacity of the embedding deployment"
252-
},
253-
"defaultValue": 50
240+
}
254241
},
255242
"useContainerRegistry": {
256243
"type": "bool",
@@ -513,7 +500,7 @@
513500
"_generator": {
514501
"name": "bicep",
515502
"version": "0.33.93.31351",
516-
"templateHash": "15889232546324762694"
503+
"templateHash": "17125266340828768318"
517504
}
518505
},
519506
"parameters": {
@@ -656,7 +643,7 @@
656643
"_generator": {
657644
"name": "bicep",
658645
"version": "0.33.93.31351",
659-
"templateHash": "13130383671788479174"
646+
"templateHash": "14438981385886625106"
660647
}
661648
},
662649
"parameters": {
@@ -3023,7 +3010,7 @@
30233010
"_generator": {
30243011
"name": "bicep",
30253012
"version": "0.33.93.31351",
3026-
"templateHash": "12801695898195206028"
3013+
"templateHash": "3649699493499251886"
30273014
},
30283015
"description": "Creates an Azure AI Search instance."
30293016
},
@@ -3116,7 +3103,6 @@
31163103
"tags": "[parameters('tags')]",
31173104
"identity": "[variables('searchIdentityProvider')]",
31183105
"properties": {
3119-
"authOptions": "[parameters('authOptions')]",
31203106
"disableLocalAuth": "[parameters('disableLocalAuth')]",
31213107
"disabledDataExfiltrationOptions": "[parameters('disabledDataExfiltrationOptions')]",
31223108
"encryptionWithCmk": "[parameters('encryptionWithCmk')]",
@@ -4640,7 +4626,7 @@
46404626
"containerRegistryName": {
46414627
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'container-apps'), '2022-09-01').outputs.registryName.value]"
46424628
},
4643-
"projectConnectionString": "[if(empty(if(empty(parameters('aiExistingProjectConnectionString')), split(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value, '/')[2], '')), createObject('value', parameters('aiExistingProjectConnectionString')), createObject('value', format('{0};{1};{2};{3}', if(empty(parameters('aiExistingProjectConnectionString')), split(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value, '/')[2], ''), subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName'))), variables('projectName'))))]",
4629+
"projectConnectionString": "[if(empty(if(and(and(empty(parameters('aiExistingProjectConnectionString')), not(empty(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value))), contains(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value, '/')), split(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value, '/')[2], '')), createObject('value', parameters('aiExistingProjectConnectionString')), createObject('value', format('{0};{1};{2};{3}', if(and(and(empty(parameters('aiExistingProjectConnectionString')), not(empty(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value))), contains(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value, '/')), split(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value, '/')[2], ''), subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName'))), variables('projectName'))))]",
46444630
"agentDeploymentName": {
46454631
"value": "[parameters('agentDeploymentName')]"
46464632
},
@@ -6298,7 +6284,7 @@
62986284
},
62996285
"AZURE_AIPROJECT_CONNECTION_STRING": {
63006286
"type": "string",
6301-
"value": "[if(empty(if(empty(parameters('aiExistingProjectConnectionString')), split(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value, '/')[2], '')), parameters('aiExistingProjectConnectionString'), format('{0};{1};{2};{3}', if(empty(parameters('aiExistingProjectConnectionString')), split(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value, '/')[2], ''), subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName'))), variables('projectName')))]"
6287+
"value": "[if(empty(if(and(and(empty(parameters('aiExistingProjectConnectionString')), not(empty(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value))), contains(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value, '/')), split(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value, '/')[2], '')), parameters('aiExistingProjectConnectionString'), format('{0};{1};{2};{3}', if(and(and(empty(parameters('aiExistingProjectConnectionString')), not(empty(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value))), contains(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value, '/')), split(reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName')))), 'Microsoft.Resources/deployments', 'ai'), '2022-09-01').outputs.discoveryUrl.value, '/')[2], ''), subscription().subscriptionId, if(not(empty(parameters('resourceGroupName'))), parameters('resourceGroupName'), format('{0}{1}', variables('abbrs').resourcesResourceGroups, parameters('environmentName'))), variables('projectName')))]"
63026288
},
63036289
"AZURE_AI_AGENT_DEPLOYMENT_NAME": {
63046290
"type": "string",

0 commit comments

Comments
 (0)