Skip to content

Commit 8919cca

Browse files
committed
checkpoint
1 parent bc046fa commit 8919cca

File tree

1 file changed

+34
-35
lines changed

1 file changed

+34
-35
lines changed

.azure/main.bicep

+34-35
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ var baseImageUrl = 'ghcr.io/digdir/dialogporten-'
1313

1414
// Create resource groups
1515
resource resourceGroup 'Microsoft.Resources/resourceGroups@2023-07-01' = {
16-
name: '${namePrefix}-rg'
17-
location: location
16+
name: '${namePrefix}-rg'
17+
location: location
1818
}
1919

2020
module apiManagement 'apim/create.bicep' = {
@@ -28,12 +28,12 @@ module apiManagement 'apim/create.bicep' = {
2828
}
2929

3030
module keyVaultModule 'keyvault/create.bicep' = {
31-
scope: resourceGroup
32-
name: 'keyVault'
33-
params: {
34-
namePrefix: namePrefix
35-
location: location
36-
}
31+
scope: resourceGroup
32+
name: 'keyVault'
33+
params: {
34+
namePrefix: namePrefix
35+
location: location
36+
}
3737
}
3838

3939
module appConfiguration 'appConfiguration/create.bicep' = {
@@ -59,7 +59,7 @@ module appInsights 'applicationInsights/create.bicep' = {
5959
// #######################################
6060

6161
resource srcKeyVaultResource 'Microsoft.KeyVault/vaults@2023-07-01' existing = {
62-
name: secrets.sourceKeyVaultName
62+
name: secrets.sourceKeyVaultName
6363
scope: az.resourceGroup(secrets.sourceKeyVaultSubscriptionId, secrets.sourceKeyVaultResourceGroup)
6464
}
6565

@@ -79,37 +79,36 @@ module postgresql 'postgreSql/create.bicep' = {
7979
params: {
8080
namePrefix: namePrefix
8181
location: location
82-
keyVaultName: keyVaultModule.outputs.name
82+
keyVaultName: keyVaultModule.outputs.name
8383
srcKeyVault: srcKeyVault
8484
srcSecretName: 'dialogportenPgAdminPassword${environment}'
85-
administratorLoginPassword: contains(keyVault.source.keys, 'dialogportenPgAdminPassword${environment}') ? srcKeyVaultResource.getSecret('dialogportenPgAdminPassword${environment}') : secrets.dialogportenPgAdminPassword
85+
administratorLoginPassword: contains(keyVault.source.keys, 'dialogportenPgAdminPassword${environment}') ? srcKeyVaultResource.getSecret('dialogportenPgAdminPassword${environment}') : secrets.dialogportenPgAdminPassword
8686
}
8787
}
8888

8989
module copyEnvironmentSecrets 'keyvault/copySecrets.bicep' = {
90-
scope: resourceGroup
91-
name: 'copyEnvironmentSecrets'
92-
params: {
93-
srcKeyVaultKeys: keyVault.source.keys
94-
srcKeyVaultName: secrets.sourceKeyVaultName
95-
srcKeyVaultRGNName: secrets.sourceKeyVaultResourceGroup
96-
srcKeyVaultSubId: secrets.sourceKeyVaultSubscriptionId
97-
destKeyVaultName: keyVaultModule.outputs.name
98-
secretPrefix: 'dialogporten--${environment}--'
99-
}
90+
scope: resourceGroup
91+
name: 'copyEnvironmentSecrets'
92+
params: {
93+
srcKeyVaultKeys: keyVault.source.keys
94+
srcKeyVaultName: secrets.sourceKeyVaultName
95+
srcKeyVaultRGNName: secrets.sourceKeyVaultResourceGroup
96+
srcKeyVaultSubId: secrets.sourceKeyVaultSubscriptionId
97+
destKeyVaultName: keyVaultModule.outputs.name
98+
secretPrefix: 'dialogporten--${environment}--'
99+
}
100100
}
101101

102102
module copyCrossEnvironmentSecrets 'keyvault/copySecrets.bicep' = {
103-
scope: resourceGroup
104-
name: 'copyCrossEnvironmentSecrets'
105-
params: {
106-
srcKeyVaultKeys: keyVault.source.keys
107-
srcKeyVaultName: secrets.sourceKeyVaultName
108-
srcKeyVaultRGNName: secrets.sourceKeyVaultResourceGroup
109-
srcKeyVaultSubId: secrets.sourceKeyVaultSubscriptionId
110-
destKeyVaultName: keyVaultModule.outputs.name
111-
secretPrefix: 'dialogporten--any--'
112-
}
103+
scope: resourceGroup
104+
name: 'copyCrossEnvironmentSecrets'
105+
params: { srcKeyVaultKeys: keyVault.source.keys
106+
srcKeyVaultName: secrets.sourceKeyVaultName
107+
srcKeyVaultRGNName: secrets.sourceKeyVaultResourceGroup
108+
srcKeyVaultSubId: secrets.sourceKeyVaultSubscriptionId
109+
destKeyVaultName: keyVaultModule.outputs.name
110+
secretPrefix: 'dialogporten--any--'
111+
}
113112
}
114113

115114
module slackNotifier 'functionApp/slackNotifier.bicep' = {
@@ -188,7 +187,7 @@ module apiBackends 'apim/addBackends.bicep' = {
188187

189188
var containerAppsPrincipals = concat(
190189
containerAppsExternal.outputs.identityPrincipalIds)
191-
// containerAppsInternal.outputs.identityPrincipalIds
190+
// containerAppsInternal.outputs.identityPrincipalIds
192191

193192
module appConfigReaderAccessPolicy 'appConfiguration/addReaderRoles.bicep' = {
194193
scope: resourceGroup
@@ -204,7 +203,7 @@ module appInsightsReaderAccessPolicy 'applicationInsights/addReaderRoles.bicep'
204203
name: 'appInsightsReaderAccessPolicy'
205204
params: {
206205
appInsightsName: appInsights.outputs.appInsightsName
207-
principalIds: [slackNotifier.outputs.functionAppPrincipalId]
206+
principalIds: [ slackNotifier.outputs.functionAppPrincipalId ]
208207
}
209208
}
210209

@@ -213,7 +212,7 @@ module appConfigConfigurations 'appConfiguration/upsertKeyValue.bicep' = {
213212
name: 'AppConfig_Add_DialogDbConnectionString'
214213
params: {
215214
configStoreName: appConfiguration.outputs.name
216-
key: 'Infrastructure:DialogDbConnectionString'
215+
key: 'Infrastructure:DialogDbConnectionString'
217216
value: postgresql.outputs.adoConnectionStringSecretUri
218217
keyValueType: 'keyVaultReference'
219218
}
@@ -224,7 +223,7 @@ module keyVaultReaderAccessPolicy 'keyvault/addReaderRoles.bicep' = {
224223
name: 'keyVaultReaderAccessPolicy'
225224
params: {
226225
keyvaultName: keyVaultModule.outputs.name
227-
principalIds: concat(containerAppsPrincipals, [slackNotifier.outputs.functionAppPrincipalId])
226+
principalIds: concat(containerAppsPrincipals, [ slackNotifier.outputs.functionAppPrincipalId ])
228227
}
229228
}
230229

0 commit comments

Comments
 (0)