Skip to content

Commit 5eb49ba

Browse files
Merge pull request #38 from TravisHilbert/OneClickURL
Fixing double name store error
2 parents d62b16e + 90ad7a6 commit 5eb49ba

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

infra/main.bicep

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var containerName = 'appstorage'
5757
var llmModel = 'gpt-4o'
5858
var prefixCleaned = replace(toLower(finalName), '-', '')
5959
var storageSkuName = 'Standard_LRS'
60-
var storageContainerName = '${prefixCleaned}contstorage'
60+
var storageContainerName = '${prefixCleaned}ctstor'
6161
var gptModelVersion = '2024-08-06'
6262
var storageNameCleanedContainer = replace(storageContainerName, '-', '')
6363
var aiServicesName = '${prefixCleaned}-aiservices'
@@ -363,7 +363,7 @@ resource containerAppBackend 'Microsoft.App/containerApps@2023-05-01' = {
363363
}
364364
}
365365
resource storageContianerApp 'Microsoft.Storage/storageAccounts@2022-09-01' = {
366-
name: storageNameCleanedContainer
366+
name: storageContainerName
367367
location: location
368368
sku: {
369369
name: storageSkuName
@@ -438,7 +438,7 @@ var containerNames = [
438438

439439
// Create a blob container resource for each container name.
440440
resource containers 'Microsoft.Storage/storageAccounts/blobServices/containers@2021-08-01' = [for containerName in containerNames: {
441-
name: '${storageNameCleanedContainer}/default/${containerName}'
441+
name: '${storageContainerName}/default/${containerName}'
442442
properties: {
443443
publicAccess: 'None'
444444
}

infra/main.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"metadata": {
55
"_generator": {
66
"name": "bicep",
7-
"version": "0.33.93.31351",
8-
"templateHash": "4845784968033668710"
7+
"version": "0.34.1.11899",
8+
"templateHash": "2685036763676904152"
99
}
1010
},
1111
"parameters": {
@@ -74,7 +74,7 @@
7474
"llmModel": "gpt-4o",
7575
"prefixCleaned": "[replace(toLower(variables('finalName')), '-', '')]",
7676
"storageSkuName": "Standard_LRS",
77-
"storageContainerName": "[format('{0}contstorage', variables('prefixCleaned'))]",
77+
"storageContainerName": "[format('{0}ctstor', variables('prefixCleaned'))]",
7878
"gptModelVersion": "2024-08-06",
7979
"storageNameCleanedContainer": "[replace(variables('storageContainerName'), '-', '')]",
8080
"aiServicesName": "[format('{0}-aiservices', variables('prefixCleaned'))]",
@@ -186,7 +186,7 @@
186186
},
187187
{
188188
"name": "AZURE_BLOB_ACCOUNT_NAME",
189-
"value": "[variables('storageNameCleanedContainer')]"
189+
"value": "[variables('storageContainerName')]"
190190
},
191191
{
192192
"name": "AZURE_BLOB_CONTAINER_NAME",
@@ -237,13 +237,13 @@
237237
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry')]",
238238
"[resourceId('Microsoft.Resources/deployments', toLower(format('{0}conAppsEnv', variables('prefixCleaned'))))]",
239239
"[resourceId('Microsoft.Resources/deployments', toLower(format('{0}database', variables('prefixCleaned'))))]",
240-
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageNameCleanedContainer'))]"
240+
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageContainerName'))]"
241241
]
242242
},
243243
{
244244
"type": "Microsoft.Storage/storageAccounts",
245245
"apiVersion": "2022-09-01",
246-
"name": "[variables('storageNameCleanedContainer')]",
246+
"name": "[variables('storageContainerName')]",
247247
"location": "[variables('location')]",
248248
"sku": {
249249
"name": "[variables('storageSkuName')]"
@@ -296,15 +296,15 @@
296296
{
297297
"type": "Microsoft.Authorization/roleAssignments",
298298
"apiVersion": "2022-04-01",
299-
"scope": "[format('Microsoft.Storage/storageAccounts/{0}', variables('storageNameCleanedContainer'))]",
299+
"scope": "[format('Microsoft.Storage/storageAccounts/{0}', variables('storageContainerName'))]",
300300
"name": "[guid(resourceId('Microsoft.App/containerApps', toLower(format('{0}containerBackend', variables('prefixCleaned')))), 'Storage Blob Data Contributor')]",
301301
"properties": {
302302
"roleDefinitionId": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe')]",
303303
"principalId": "[reference(resourceId('Microsoft.App/containerApps', toLower(format('{0}containerBackend', variables('prefixCleaned')))), '2023-05-01', 'full').identity.principalId]"
304304
},
305305
"dependsOn": [
306306
"[resourceId('Microsoft.App/containerApps', toLower(format('{0}containerBackend', variables('prefixCleaned'))))]",
307-
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageNameCleanedContainer'))]"
307+
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageContainerName'))]"
308308
]
309309
},
310310
{
@@ -328,7 +328,7 @@
328328
},
329329
"type": "Microsoft.Storage/storageAccounts/blobServices/containers",
330330
"apiVersion": "2021-08-01",
331-
"name": "[format('{0}/default/{1}', variables('storageNameCleanedContainer'), variables('containerNames')[copyIndex()])]",
331+
"name": "[format('{0}/default/{1}', variables('storageContainerName'), variables('containerNames')[copyIndex()])]",
332332
"properties": {
333333
"publicAccess": "None"
334334
},
@@ -360,8 +360,8 @@
360360
"metadata": {
361361
"_generator": {
362362
"name": "bicep",
363-
"version": "0.33.93.31351",
364-
"templateHash": "11665286146084422127"
363+
"version": "0.34.1.11899",
364+
"templateHash": "11366093186241764702"
365365
}
366366
},
367367
"parameters": {
@@ -458,8 +458,8 @@
458458
"metadata": {
459459
"_generator": {
460460
"name": "bicep",
461-
"version": "0.33.93.31351",
462-
"templateHash": "4388214478635448075"
461+
"version": "0.34.1.11899",
462+
"templateHash": "10079365566064414507"
463463
}
464464
},
465465
"parameters": {
@@ -596,8 +596,8 @@
596596
"metadata": {
597597
"_generator": {
598598
"name": "bicep",
599-
"version": "0.33.93.31351",
600-
"templateHash": "10270252950808398257"
599+
"version": "0.34.1.11899",
600+
"templateHash": "18164503561501536590"
601601
}
602602
},
603603
"parameters": {

0 commit comments

Comments
 (0)