Skip to content

Commit f073f80

Browse files
howieleunghowieleung
committed
Revert "Fix ARM"
This reverts commit 4694946.
1 parent 4694946 commit f073f80

File tree

1 file changed

+33
-19
lines changed

1 file changed

+33
-19
lines changed

‎infra/main.json

+33-19
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": "8669457240634692488"
8+
"templateHash": "10307769654054798782"
99
}
1010
},
1111
"parameters": {
@@ -148,13 +148,15 @@
148148
],
149149
"metadata": {
150150
"description": "Format of the chat model to deploy"
151-
}
151+
},
152+
"defaultValue": "OpenAI"
152153
},
153154
"agentName": {
154155
"type": "string",
155156
"metadata": {
156157
"description": "Name of agent to deploy"
157-
}
158+
},
159+
"defaultValue": "agent-template-assistant"
158160
},
159161
"aiAgentID": {
160162
"type": "string",
@@ -167,31 +169,36 @@
167169
"type": "string",
168170
"metadata": {
169171
"description": "Name of the chat model to deploy"
170-
}
172+
},
173+
"defaultValue": "gpt-4o-mini"
171174
},
172175
"agentDeploymentName": {
173176
"type": "string",
174177
"metadata": {
175178
"description": "Name of the model deployment"
176-
}
179+
},
180+
"defaultValue": "gpt-4o-mini"
177181
},
178182
"agentModelVersion": {
179183
"type": "string",
180184
"metadata": {
181185
"description": "Version of the chat model to deploy"
182-
}
186+
},
187+
"defaultValue": "2024-07-18"
183188
},
184189
"agentDeploymentSku": {
185190
"type": "string",
186191
"metadata": {
187192
"description": "Sku of the chat deployment"
188-
}
193+
},
194+
"defaultValue": "GlobalStandard"
189195
},
190196
"agentDeploymentCapacity": {
191197
"type": "int",
192198
"metadata": {
193199
"description": "Capacity of the chat deployment"
194-
}
200+
},
201+
"defaultValue": 50
195202
},
196203
"embedModelFormat": {
197204
"type": "string",
@@ -201,7 +208,8 @@
201208
],
202209
"metadata": {
203210
"description": "Format of the embedding model to deploy"
204-
}
211+
},
212+
"defaultValue": "OpenAI"
205213
},
206214
"embedModelName": {
207215
"type": "string",
@@ -213,31 +221,36 @@
213221
"type": "string",
214222
"metadata": {
215223
"description": "Name of the embedding model deployment"
216-
}
224+
},
225+
"defaultValue": "text-embedding-3-small"
217226
},
218227
"embeddingDeploymentDimensions": {
219228
"type": "string",
220229
"metadata": {
221230
"description": "Embedding model dimensionality"
222-
}
231+
},
232+
"defaultValue": "100"
223233
},
224234
"embedModelVersion": {
225235
"type": "securestring",
226236
"metadata": {
227237
"description": "Version of the embedding model to deploy"
228-
}
238+
},
239+
"defaultValue": "1"
229240
},
230241
"embedDeploymentSku": {
231242
"type": "string",
232243
"metadata": {
233244
"description": "Sku of the embeddings model deployment"
234-
}
245+
},
246+
"defaultValue": "Standard"
235247
},
236248
"embedDeploymentCapacity": {
237249
"type": "int",
238250
"metadata": {
239251
"description": "Capacity of the embedding deployment"
240-
}
252+
},
253+
"defaultValue": 50
241254
},
242255
"useContainerRegistry": {
243256
"type": "bool",
@@ -500,7 +513,7 @@
500513
"_generator": {
501514
"name": "bicep",
502515
"version": "0.33.93.31351",
503-
"templateHash": "17125266340828768318"
516+
"templateHash": "15889232546324762694"
504517
}
505518
},
506519
"parameters": {
@@ -643,7 +656,7 @@
643656
"_generator": {
644657
"name": "bicep",
645658
"version": "0.33.93.31351",
646-
"templateHash": "14438981385886625106"
659+
"templateHash": "13130383671788479174"
647660
}
648661
},
649662
"parameters": {
@@ -3010,7 +3023,7 @@
30103023
"_generator": {
30113024
"name": "bicep",
30123025
"version": "0.33.93.31351",
3013-
"templateHash": "3649699493499251886"
3026+
"templateHash": "12801695898195206028"
30143027
},
30153028
"description": "Creates an Azure AI Search instance."
30163029
},
@@ -3103,6 +3116,7 @@
31033116
"tags": "[parameters('tags')]",
31043117
"identity": "[variables('searchIdentityProvider')]",
31053118
"properties": {
3119+
"authOptions": "[parameters('authOptions')]",
31063120
"disableLocalAuth": "[parameters('disableLocalAuth')]",
31073121
"disabledDataExfiltrationOptions": "[parameters('disabledDataExfiltrationOptions')]",
31083122
"encryptionWithCmk": "[parameters('encryptionWithCmk')]",
@@ -4626,7 +4640,7 @@
46264640
"containerRegistryName": {
46274641
"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]"
46284642
},
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'))))]",
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'))))]",
46304644
"agentDeploymentName": {
46314645
"value": "[parameters('agentDeploymentName')]"
46324646
},
@@ -6284,7 +6298,7 @@
62846298
},
62856299
"AZURE_AIPROJECT_CONNECTION_STRING": {
62866300
"type": "string",
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')))]"
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')))]"
62886302
},
62896303
"AZURE_AI_AGENT_DEPLOYMENT_NAME": {
62906304
"type": "string",

0 commit comments

Comments
 (0)