@@ -99,16 +99,16 @@ steps:
99
99
workingDirectory : ' ${{ parameters.workingDir }}/lz-platform-connectivity-hub-nva'
100
100
101
101
- task : AzureCLI@2
102
- displayName : Azure Policy - Enable Private DNS Zone Policies (if deployPrivateDnsZones =true in config)
102
+ displayName : Azure Policy - Enable Private DNS Zone Policies (if privateDnsZones.enabled =true in config)
103
103
inputs :
104
104
azureSubscription : $(serviceConnection)
105
105
scriptType : ' bash'
106
106
scriptLocation : ' inlineScript'
107
107
inlineScript : |
108
108
$(var-bashPreInjectScript)
109
109
110
- DEPLOY_PRIVATE_DNS_ZONES=`jq -r .parameters.deployPrivateDnsZones .value ${{ parameters.networkingConfigurationPath }}`
111
- PRIVATE_DNS_ZONES_RESOURCE_GROUP=`jq -r .parameters.rgPrivateDnsZonesName .value ${{ parameters.networkingConfigurationPath }}`
110
+ DEPLOY_PRIVATE_DNS_ZONES=`jq -r .parameters.privateDnsZones .value.enabled ${{ parameters.networkingConfigurationPath }}`
111
+ PRIVATE_DNS_ZONES_RESOURCE_GROUP=`jq -r .parameters.privateDnsZones .value.resourceGroupName ${{ parameters.networkingConfigurationPath }}`
112
112
113
113
case $DEPLOY_PRIVATE_DNS_ZONES in
114
114
(true)
@@ -136,22 +136,22 @@ steps:
136
136
workingDirectory : ' $(System.DefaultWorkingDirectory)/policy/custom/assignments'
137
137
138
138
- task : AzureCLI@2
139
- displayName : Azure Policy - Enable DDoS Standard (if deployDdosStandard =true in config)
139
+ displayName : Azure Policy - Enable DDoS Standard (if ddosStandard.enabled =true in config)
140
140
inputs :
141
141
azureSubscription : $(serviceConnection)
142
142
scriptType : ' bash'
143
143
scriptLocation : ' inlineScript'
144
144
inlineScript : |
145
145
$(var-bashPreInjectScript)
146
146
147
- DEPLOY_DDOS_STANDARD=`jq -r .parameters.deployDdosStandard .value ${{ parameters.networkingConfigurationPath }}`
147
+ DEPLOY_DDOS_STANDARD=`jq -r .parameters.ddosStandard .value.enabled ${{ parameters.networkingConfigurationPath }}`
148
148
149
149
case $DEPLOY_DDOS_STANDARD in
150
150
(true)
151
151
echo "DDoS Standard is enabled, creating Azure Policy assignment to protect for all Virtual Networks in '$(var-topLevelManagementGroupName)' management group."
152
152
153
- DDOS_STANDARD_RESOURCE_GROUP_NAME=`jq -r .parameters.rgDdosName .value ${{ parameters.networkingConfigurationPath }}`
154
- DDOS_STANDARD_PLAN_NAME=`jq -r .parameters.ddosPlanName .value ${{ parameters.networkingConfigurationPath }}`
153
+ DDOS_STANDARD_RESOURCE_GROUP_NAME=`jq -r .parameters.ddosStandard .value.resourceGroupName ${{ parameters.networkingConfigurationPath }}`
154
+ DDOS_STANDARD_PLAN_NAME=`jq -r .parameters.ddosStandard .value.planName ${{ parameters.networkingConfigurationPath }}`
155
155
156
156
# Identify the Resource Id for DDOS Standard Plan
157
157
DDOS_PLAN_ID=`az network ddos-protection show -g $DDOS_STANDARD_RESOURCE_GROUP_NAME -n $DDOS_STANDARD_PLAN_NAME --subscription ${{ parameters.networkingSubscriptionId }} --query id -o tsv`
0 commit comments