Skip to content

Commit 527337c

Browse files
G.ReijnG.Reijn
G.Reijn
authored and
G.Reijn
committed
Fix up parameters
1 parent 04ef03b commit 527337c

File tree

2 files changed

+37
-331
lines changed

2 files changed

+37
-331
lines changed

Tools/Bicep/ptn/basic.bicep

+37-49
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,19 @@ param serverFarmSkuName string = 'S1'
5858
@description('Optional. The name of the API Management service.')
5959
param apiServiceName string = 'apim${resourceGroup().name}'
6060

61+
@description('Optional. Name of the Log Analytics workspace.')
62+
param logAnalyticsWorkspaceName string = 'log${resourceGroup().name}'
63+
64+
@description('Optional. Name of the User Assigned Identity.')
65+
param uamiName string = 'id-${resourceGroup().name}'
66+
67+
@description('Optional. Name of the Deployment Script performing pre and post-deployment tasks.')
68+
param deploymentScriptName string = 'ds-${resourceGroup().name}'
69+
6170
module userAssignedIdentity 'br/public:avm/res/managed-identity/user-assigned-identity:0.4.0' = {
6271
name: 'userAssignedIdentity'
6372
params: {
64-
name: 'id-${resourceGroup().name}'
73+
name: uamiName
6574
location: location
6675
}
6776
}
@@ -73,7 +82,7 @@ module userAssignedIdentity 'br/public:avm/res/managed-identity/user-assigned-id
7382
module logAnalytics 'br/public:avm/res/operational-insights/workspace:0.9.1' = {
7483
name: 'logAnalytics'
7584
params: {
76-
name: 'log${resourceGroup().name}'
85+
name: logAnalyticsWorkspaceName
7786
location: location
7887
}
7988
}
@@ -101,13 +110,6 @@ module appConfig 'br/public:avm/res/app-configuration/configuration-store:0.6.0'
101110
sku: 'Standard'
102111
disableLocalAuth: true
103112
softDeleteRetentionInDays: 7
104-
// keyValues: [
105-
// {
106-
// name: '${appConfigName}/.appconfig.featureflag~2FGenevaLogging'
107-
// value: '{"id":"GenevaLogging","description":"Feature flag to use Geneva Monitoring.","enabled":false,"conditions":{"client_filters":[]}}'
108-
// contentType: 'application/vnd.microsoft.appconfig.ff+json;charset=utf-8'
109-
// }
110-
// ]
111113
}
112114
}
113115

@@ -147,20 +149,6 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.15.0' = {
147149
containerDeleteRetentionPolicyEnabled: false
148150
}
149151
requireInfrastructureEncryption: false
150-
// The encryption property should be set by AVM
151-
// encryption: {
152-
// services: {
153-
// file: {
154-
// keyType: 'Account'
155-
// enabled: true
156-
// }
157-
// blob: {
158-
// keyType: 'Account'
159-
// enabled: true
160-
// }
161-
// }
162-
// keySource: 'Microsoft.Storage'
163-
// }
164152
allowSharedKeyAccess: false
165153
}
166154
}
@@ -370,7 +358,7 @@ module keyVault 'br/public:avm/res/key-vault/vault:0.11.1' = {
370358
module preDeploymentScript 'br/public:avm/res/resources/deployment-script:0.5.1' = {
371359
name: 'preDeploymentScript'
372360
params: {
373-
name: 'ds-${resourceGroup().name}'
361+
name: deploymentScriptName
374362
kind: 'AzurePowerShell'
375363
timeout: 'PT30M'
376364
runOnce: true
@@ -1001,7 +989,7 @@ resource service_apim_rest_name_winget_get_packageget 'Microsoft.ApiManagement/s
1001989
module postDeploymentScript 'br/public:avm/res/resources/deployment-script:0.5.1' = {
1002990
name: 'postDeploymentScript'
1003991
params: {
1004-
name: 'ds-${resourceGroup().name}'
992+
name: deploymentScriptName
1005993
kind: 'AzurePowerShell'
1006994
timeout: 'PT30M'
1007995
runOnce: true
@@ -1056,30 +1044,30 @@ module postDeploymentScript 'br/public:avm/res/resources/deployment-script:0.5.1
10561044
managedIdentities: { userAssignedResourceIds: [userAssignedIdentity.outputs.resourceId] }
10571045
}
10581046
dependsOn: [
1059-
service_apim_rest_name_winget_get_informationget
1060-
service_apim_rest_name_winget_delete_installerdelete
1061-
service_apim_rest_name_winget_get_installerget
1062-
service_apim_rest_name_winget_post_localepost
1063-
service_apim_rest_name_winget_post_manifestpost
1064-
service_apim_rest_name_winget_post_manifestsearchpost
1065-
service_apim_rest_name_winget_post_packagepost
1066-
service_apim_rest_name_winget_post_rebuildpost
1067-
service_apim_rest_name_winget_post_updatepost
1068-
service_apim_rest_name_winget_post_versionpost
1069-
service_apim_rest_name_winget_put_installerput
1070-
service_apim_rest_name_winget_put_localeput
1071-
service_apim_rest_name_winget_put_manifestput
1072-
service_apim_rest_name_winget_put_packageput
1073-
service_apim_rest_name_winget_put_versionput
1074-
service_apim_rest_name_winget_get_versionget
1075-
service_apim_rest_name_winget_delete_versiondelete
1076-
service_apim_rest_name_winget_post_installerpost
1077-
service_apim_rest_name_winget_delete_localedelete
1078-
service_apim_rest_name_winget_delete_manifestdelete
1079-
service_apim_rest_name_winget_get_localeget
1080-
service_apim_rest_name_winget_get_manifestget
1081-
service_apim_rest_name_winget_delete_packagedelete
1082-
service_apim_rest_name_winget_get_packageget
1047+
service_apim_rest_name_winget_get_informationget
1048+
service_apim_rest_name_winget_delete_installerdelete
1049+
service_apim_rest_name_winget_get_installerget
1050+
service_apim_rest_name_winget_post_localepost
1051+
service_apim_rest_name_winget_post_manifestpost
1052+
service_apim_rest_name_winget_post_manifestsearchpost
1053+
service_apim_rest_name_winget_post_packagepost
1054+
service_apim_rest_name_winget_post_rebuildpost
1055+
service_apim_rest_name_winget_post_updatepost
1056+
service_apim_rest_name_winget_post_versionpost
1057+
service_apim_rest_name_winget_put_installerput
1058+
service_apim_rest_name_winget_put_localeput
1059+
service_apim_rest_name_winget_put_manifestput
1060+
service_apim_rest_name_winget_put_packageput
1061+
service_apim_rest_name_winget_put_versionput
1062+
service_apim_rest_name_winget_get_versionget
1063+
service_apim_rest_name_winget_delete_versiondelete
1064+
service_apim_rest_name_winget_post_installerpost
1065+
service_apim_rest_name_winget_delete_localedelete
1066+
service_apim_rest_name_winget_delete_manifestdelete
1067+
service_apim_rest_name_winget_get_localeget
1068+
service_apim_rest_name_winget_get_manifestget
1069+
service_apim_rest_name_winget_delete_packagedelete
1070+
service_apim_rest_name_winget_get_packageget
10831071
]
10841072
}
10851073

0 commit comments

Comments
 (0)