Skip to content

Commit b5a4db6

Browse files
Merge pull request #33 from microsoft/TempletAuthUpdates
remove auth check from deployt
2 parents 93feeb6 + ea960af commit b5a4db6

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

infra/main.bicep

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
@description('Prefix for all resources created by this template. This prefix will be used to create unique names for all resources. The prefix must be unique within the resource group.')
22
param ResourcePrefix string
33

4-
@description('Authorization requires permission to create an app identity in the subscription. See readme for details.')
5-
param Authorization bool = false
6-
74
@allowed([
85
'australiaeast'
96
'brazilsouth'
@@ -48,8 +45,7 @@ var randomSuffix = substring(environmentName, 0, min(10, length(environmentName)
4845
// Combine the base name with the random suffix
4946
var finalName = '${ResourcePrefix}-${randomSuffix}'
5047

51-
var backEndVersion = Authorization ? 'rcauth' : 'rcnoauth'
52-
var frontEndVersion = Authorization ? 'rcauth' : 'rcnoauth'
48+
var imageVersion = 'rc1'
5349
var location = resourceGroup().location
5450
var dblocation = resourceGroup().location
5551
var cosmosdbDatabase = 'cmsadb'
@@ -252,7 +248,7 @@ module containerAppFrontend 'br/public:avm/res/app/container-app:0.13.0' = {
252248
value: 'https://${containerAppBackend.properties.configuration.ingress.fqdn}'
253249
}
254250
]
255-
image: 'cmsacontainerreg.azurecr.io/cmsafrontend:${frontEndVersion}'
251+
image: 'cmsacontainerreg.azurecr.io/cmsafrontend:${imageVersion}'
256252
name: 'cmsafrontend'
257253
resources: {
258254
cpu: '1'
@@ -294,7 +290,7 @@ resource containerAppBackend 'Microsoft.App/containerApps@2023-05-01' = {
294290
containers: [
295291
{
296292
name: 'cmsabackend'
297-
image: 'cmsacontainerreg.azurecr.io/cmsabackend:${backEndVersion}'
293+
image: 'cmsacontainerreg.azurecr.io/cmsabackend:${imageVersion}'
298294
env: [
299295
{
300296
name: 'COSMOSDB_ENDPOINT'

infra/main.json

Lines changed: 4 additions & 12 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": "17465000776634471517"
8+
"templateHash": "4845784968033668710"
99
}
1010
},
1111
"parameters": {
@@ -15,13 +15,6 @@
1515
"description": "Prefix for all resources created by this template. This prefix will be used to create unique names for all resources. The prefix must be unique within the resource group."
1616
}
1717
},
18-
"Authorization": {
19-
"type": "bool",
20-
"defaultValue": false,
21-
"metadata": {
22-
"description": "Authorization requires permission to create an app identity in the subscription. See readme for details."
23-
}
24-
},
2518
"AiLocation": {
2619
"type": "string",
2720
"allowedValues": [
@@ -69,8 +62,7 @@
6962
"variables": {
7063
"randomSuffix": "[substring(parameters('environmentName'), 0, min(10, length(parameters('environmentName'))))]",
7164
"finalName": "[format('{0}-{1}', parameters('ResourcePrefix'), variables('randomSuffix'))]",
72-
"backEndVersion": "[if(parameters('Authorization'), 'rcauth', 'rcnoauth')]",
73-
"frontEndVersion": "[if(parameters('Authorization'), 'rcauth', 'rcnoauth')]",
65+
"imageVersion": "rc1",
7466
"location": "[resourceGroup().location]",
7567
"dblocation": "[resourceGroup().location]",
7668
"cosmosdbDatabase": "cmsadb",
@@ -170,7 +162,7 @@
170162
"containers": [
171163
{
172164
"name": "cmsabackend",
173-
"image": "[format('cmsacontainerreg.azurecr.io/cmsabackend:{0}', variables('backEndVersion'))]",
165+
"image": "[format('cmsacontainerreg.azurecr.io/cmsabackend:{0}', variables('imageVersion'))]",
174166
"env": [
175167
{
176168
"name": "COSMOSDB_ENDPOINT",
@@ -5426,7 +5418,7 @@
54265418
"value": "[format('https://{0}', reference(resourceId('Microsoft.App/containerApps', toLower(format('{0}containerBackend', variables('prefixCleaned')))), '2023-05-01').configuration.ingress.fqdn)]"
54275419
}
54285420
],
5429-
"image": "[format('cmsacontainerreg.azurecr.io/cmsafrontend:{0}', variables('frontEndVersion'))]",
5421+
"image": "[format('cmsacontainerreg.azurecr.io/cmsafrontend:{0}', variables('imageVersion'))]",
54305422
"name": "cmsafrontend",
54315423
"resources": {
54325424
"cpu": "1",

0 commit comments

Comments
 (0)