@@ -13,8 +13,8 @@ var baseImageUrl = 'ghcr.io/digdir/dialogporten-'
13
13
14
14
// Create resource groups
15
15
resource resourceGroup 'Microsoft.Resources/resourceGroups@2023-07-01' = {
16
- name : '${namePrefix }-rg'
17
- location : location
16
+ name : '${namePrefix }-rg'
17
+ location : location
18
18
}
19
19
20
20
module apiManagement 'apim/create.bicep' = {
@@ -28,12 +28,12 @@ module apiManagement 'apim/create.bicep' = {
28
28
}
29
29
30
30
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
+ }
37
37
}
38
38
39
39
module appConfiguration 'appConfiguration/create.bicep' = {
@@ -59,7 +59,7 @@ module appInsights 'applicationInsights/create.bicep' = {
59
59
// #######################################
60
60
61
61
resource srcKeyVaultResource 'Microsoft.KeyVault/vaults@2023-07-01' existing = {
62
- name : secrets .sourceKeyVaultName
62
+ name : secrets .sourceKeyVaultName
63
63
scope : az .resourceGroup (secrets .sourceKeyVaultSubscriptionId , secrets .sourceKeyVaultResourceGroup )
64
64
}
65
65
@@ -79,37 +79,36 @@ module postgresql 'postgreSql/create.bicep' = {
79
79
params : {
80
80
namePrefix : namePrefix
81
81
location : location
82
- keyVaultName : keyVaultModule .outputs .name
82
+ keyVaultName : keyVaultModule .outputs .name
83
83
srcKeyVault : srcKeyVault
84
84
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
86
86
}
87
87
}
88
88
89
89
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
+ }
100
100
}
101
101
102
102
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
+ }
113
112
}
114
113
115
114
module slackNotifier 'functionApp/slackNotifier.bicep' = {
@@ -188,7 +187,7 @@ module apiBackends 'apim/addBackends.bicep' = {
188
187
189
188
var containerAppsPrincipals = concat (
190
189
containerAppsExternal .outputs .identityPrincipalIds )
191
- // containerAppsInternal.outputs.identityPrincipalIds
190
+ // containerAppsInternal.outputs.identityPrincipalIds
192
191
193
192
module appConfigReaderAccessPolicy 'appConfiguration/addReaderRoles.bicep' = {
194
193
scope : resourceGroup
@@ -204,7 +203,7 @@ module appInsightsReaderAccessPolicy 'applicationInsights/addReaderRoles.bicep'
204
203
name : 'appInsightsReaderAccessPolicy'
205
204
params : {
206
205
appInsightsName : appInsights .outputs .appInsightsName
207
- principalIds : [slackNotifier .outputs .functionAppPrincipalId ]
206
+ principalIds : [ slackNotifier .outputs .functionAppPrincipalId ]
208
207
}
209
208
}
210
209
@@ -213,7 +212,7 @@ module appConfigConfigurations 'appConfiguration/upsertKeyValue.bicep' = {
213
212
name : 'AppConfig_Add_DialogDbConnectionString'
214
213
params : {
215
214
configStoreName : appConfiguration .outputs .name
216
- key : 'Infrastructure:DialogDbConnectionString'
215
+ key : 'Infrastructure:DialogDbConnectionString'
217
216
value : postgresql .outputs .adoConnectionStringSecretUri
218
217
keyValueType : 'keyVaultReference'
219
218
}
@@ -224,7 +223,7 @@ module keyVaultReaderAccessPolicy 'keyvault/addReaderRoles.bicep' = {
224
223
name : 'keyVaultReaderAccessPolicy'
225
224
params : {
226
225
keyvaultName : keyVaultModule .outputs .name
227
- principalIds : concat (containerAppsPrincipals , [slackNotifier .outputs .functionAppPrincipalId ])
226
+ principalIds : concat (containerAppsPrincipals , [ slackNotifier .outputs .functionAppPrincipalId ])
228
227
}
229
228
}
230
229
0 commit comments