Skip to content

Commit fd0a44e

Browse files
SpringstoneSpringstone
authored
Remove Azure Gov options from portal accelerator (#2009)
1 parent 613649d commit fd0a44e

File tree

3 files changed

+37
-30
lines changed

3 files changed

+37
-30
lines changed

‎docs/wiki/Whats-new.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## In this Section
22

33
- [Updates](#updates)
4+
- [June 2025](#june-2025)
45
- [May 2025](#may-2025)
56
- [April 2025](#april-2025)
67
- [March 2025](#march-2025)
@@ -56,6 +57,12 @@ This article will be updated as and when changes are made to the above and anyth
5657

5758
Here's what's changed in Enterprise Scale/Azure Landing Zones:
5859

60+
### June 2025
61+
62+
#### Tooling
63+
64+
- Updated the portal accelerator to remove sovereign cloud options as the ALZ team are unable to validate portal deployments in those environments. The only supported environment for Azure Landing Zones via the portal accelerator is Azure Public Cloud.
65+
5966
### May 2025
6067

6168
#### Policy

‎eslzArm/eslz-portal.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
{
1313
"name": "cloudEnvironment",
1414
"type": "Microsoft.Common.Section",
15-
"label": "Select cloud environment",
15+
"label": "Configure cloud environment",
1616
"elements": [
1717
{
1818
"name": "selection",
1919
"type": "Microsoft.Common.DropDown",
20-
"visible": true,
20+
"visible": false,
2121
"label": "Azure cloud environment",
22-
"defaultValue": "[if(contains(steps('basics').resourceScope.location.name, 'china'), 'Azure China Cloud', if(contains(steps('basics').resourceScope.location.name, 'usgov'), 'Azure US Government', if(contains(steps('basics').resourceScope.location.name, 'usdod'), 'Azure US Government', 'Azure Cloud')))]",
22+
"defaultValue": "Azure Cloud",
2323
"multiselect": false,
2424
"selectAll": false,
2525
"filter": false,
@@ -45,7 +45,7 @@
4545
{
4646
"name": "warning",
4747
"type": "Microsoft.Common.InfoBox",
48-
"visible": true,
48+
"visible": false,
4949
"options": {
5050
"icon": "Warning",
5151
"text": "This value should be automatically set based on the list of available locations. Only change this if you believe the value to be incorrect.",
@@ -294,7 +294,7 @@
294294
{
295295
"name": "cuaSettingsInfo",
296296
"type": "Microsoft.Common.InfoBox",
297-
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]",
297+
"visible": true,
298298
"options": {
299299
"text": "Microsoft can identify the deployments of the Azure Resource Manager templates with the deployed Azure resources. Microsoft collects this information to provide the best experiences with their products and to operate their business. The telemetry is collected through customer usage attribution. The data is collected and governed by Microsoft's privacy policies, located at the trust center. Visit this link to find out more.",
300300
"uri": "https://github.com/Azure/Enterprise-Scale/wiki/Deploying-Enterprise-Scale-CustomerUsage",
@@ -304,9 +304,9 @@
304304
{
305305
"name": "telemetryOptOut",
306306
"type": "Microsoft.Common.OptionsGroup",
307-
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]",
307+
"visible": true,
308308
"label": "Customer Usage Selection Options",
309-
"defaultValue": "[if(equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'), 'Enabled', 'Disabled')]",
309+
"defaultValue": "Enabled",
310310
"constraints": {
311311
"allowedValues": [
312312
{
@@ -322,7 +322,7 @@
322322
}
323323
}
324324
],
325-
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
325+
"visible": true
326326
}
327327
]
328328
},
@@ -701,7 +701,7 @@
701701
"label": "Enable Microsoft Defender for Cloud for open-source relational databases",
702702
"defaultValue": "Yes (recommended)",
703703
"toolTip": "If 'Yes' is selected, Microsoft Defender for Cloud will be enabled for open-source relational databases.<br>Uses the custom initiative <a href=\"https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Deploy-MDFC-Config.html\">Deploy Microsoft Defender for Cloud configuration</a>.",
704-
"visible": "[and(equals(steps('management').enableAsc,'Yes'), equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'))]",
704+
"visible": "[equals(steps('management').enableAsc,'Yes')]",
705705
"constraints": {
706706
"allowedValues": [
707707
{
@@ -721,7 +721,7 @@
721721
"label": "Enable Microsoft Defender for Cloud for Cosmos DB",
722722
"defaultValue": "Yes (recommended)",
723723
"toolTip": "If 'Yes' is selected, Microsoft Defender for Cloud will be enabled for Cosmos DB.<br>Uses the custom initiative <a href=\"https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Deploy-MDFC-Config.html\">Deploy Microsoft Defender for Cloud configuration</a>.",
724-
"visible": "[and(equals(steps('management').enableAsc,'Yes'), equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'))]",
724+
"visible": "[equals(steps('management').enableAsc,'Yes')]",
725725
"constraints": {
726726
"allowedValues": [
727727
{
@@ -741,7 +741,7 @@
741741
"label": "Enable Microsoft Defender for Cloud for AppServices",
742742
"defaultValue": "Yes (recommended)",
743743
"toolTip": "If 'Yes' is selected, Microsoft Defender for Cloud will be enabled for AppServices.<br>Uses the custom initiative <a href=\"https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Deploy-MDFC-Config.html\">Deploy Microsoft Defender for Cloud configuration</a>.",
744-
"visible": "[and(equals(steps('management').enableAsc,'Yes'), equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'))]",
744+
"visible": "[equals(steps('management').enableAsc,'Yes')]",
745745
"constraints": {
746746
"allowedValues": [
747747
{
@@ -761,7 +761,7 @@
761761
"label": "Enable Microsoft Defender for Cloud for Storage",
762762
"defaultValue": "Yes (recommended)",
763763
"toolTip": "If 'Yes' is selected, Microsoft Defender for Cloud will be enabled for Storage.<br>Uses the custom initiative <a href=\"https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Deploy-MDFC-Config.html\">Deploy Microsoft Defender for Cloud configuration</a>.",
764-
"visible": "[and(equals(steps('management').enableAsc,'Yes'), or(equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'), equals(steps('basics').cloudEnvironment.selection, 'AzureUSGovernment')))]",
764+
"visible": "[equals(steps('management').enableAsc,'Yes')]",
765765
"constraints": {
766766
"allowedValues": [
767767
{
@@ -801,7 +801,7 @@
801801
"label": "Enable Microsoft Defender for Cloud for SQL servers on machines",
802802
"defaultValue": "Yes (recommended)",
803803
"toolTip": "If 'Yes' is selected, Microsoft Defender for Cloud will be enabled for SQL servers on virtual machines.<br>Uses the custom initiative <a href=\"https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Deploy-MDFC-Config.html\">Deploy Microsoft Defender for Cloud configuration</a>.",
804-
"visible": "[and(equals(steps('management').enableAsc,'Yes'), equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'))]",
804+
"visible": "[equals(steps('management').enableAsc,'Yes')]",
805805
"constraints": {
806806
"allowedValues": [
807807
{
@@ -821,7 +821,7 @@
821821
"label": "Enable Microsoft Defender for Cloud for Key Vault",
822822
"defaultValue": "Yes (recommended)",
823823
"toolTip": "If 'Yes' is selected, Microsoft Defender for Cloud will be enabled for Key Vault.<br>Uses the custom initiative <a href=\"https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Deploy-MDFC-Config.html\">Deploy Microsoft Defender for Cloud configuration</a>.",
824-
"visible": "[and(equals(steps('management').enableAsc,'Yes'), equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'))]",
824+
"visible": "[equals(steps('management').enableAsc,'Yes')]",
825825
"constraints": {
826826
"allowedValues": [
827827
{
@@ -841,7 +841,7 @@
841841
"label": "Enable Microsoft Defender for Cloud for Azure Resource Manager",
842842
"defaultValue": "Yes (recommended)",
843843
"toolTip": "If 'Yes' is selected, Microsoft Defender for Cloud will be enabled for Resource Manager.<br>Uses the custom initiative <a href=\"https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Deploy-MDFC-Config.html\">Deploy Microsoft Defender for Cloud configuration</a>.",
844-
"visible": "[and(equals(steps('management').enableAsc,'Yes'), or(equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'), equals(steps('basics').cloudEnvironment.selection, 'AzureUSGovernment')))]",
844+
"visible": "[equals(steps('management').enableAsc,'Yes')]",
845845
"constraints": {
846846
"allowedValues": [
847847
{
@@ -861,7 +861,7 @@
861861
"label": "Enable Microsoft Defender for Cloud for APIs",
862862
"defaultValue": "Yes (recommended)",
863863
"toolTip": "If 'Yes' is selected, Microsoft Defender for Cloud will be enabled for APIs.<br>Uses the custom initiative <a href=\"https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Deploy-MDFC-Config.html\">Deploy Microsoft Defender for Cloud configuration</a>.",
864-
"visible": "[and(equals(steps('management').enableAsc,'Yes'), or(equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'), equals(steps('basics').cloudEnvironment.selection, 'AzureUSGovernment')))]",
864+
"visible": "[equals(steps('management').enableAsc,'Yes')]",
865865
"constraints": {
866866
"allowedValues": [
867867
{
@@ -881,7 +881,7 @@
881881
"label": "Enable Microsoft Defender CSPM",
882882
"defaultValue": "Yes (recommended)",
883883
"toolTip": "If 'Yes' is selected, Microsoft Defender CSPM will be enabled.<br>Uses the custom initiative <a href=\"https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Deploy-MDFC-Config.html\">Deploy Microsoft Defender for Cloud configuration</a>.",
884-
"visible": "[and(equals(steps('management').enableAsc,'Yes'), or(equals(steps('basics').cloudEnvironment.selection, 'AzureCloud'), equals(steps('basics').cloudEnvironment.selection, 'AzureUSGovernment')))]",
884+
"visible": "[equals(steps('management').enableAsc,'Yes')]",
885885
"constraints": {
886886
"allowedValues": [
887887
{
@@ -5114,7 +5114,7 @@
51145114
"visible": true
51155115
}
51165116
],
5117-
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
5117+
"visible": true
51185118
},
51195119
{
51205120
"name": "corpOnlineSettingsInfo",
@@ -5330,7 +5330,7 @@
53305330
"visible": true
53315331
}
53325332
],
5333-
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
5333+
"visible": true
53345334
},
53355335
{
53365336
"name": "onlineSection",
@@ -5376,7 +5376,7 @@
53765376
}
53775377
}
53785378
],
5379-
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
5379+
"visible": true
53805380
}
53815381
]
53825382
},
@@ -5511,7 +5511,7 @@
55115511
}
55125512
}
55135513
],
5514-
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
5514+
"visible": true
55155515
},
55165516
{
55175517
"name": "wlcAIReady",
@@ -5915,7 +5915,7 @@
59155915
}
59165916
}
59175917
],
5918-
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
5918+
"visible": true
59195919
},
59205920
{
59215921
"name": "wlcAnalytics",
@@ -8185,7 +8185,7 @@
81858185
{
81868186
"name": "decommSettingsInfo",
81878187
"type": "Microsoft.Common.InfoBox",
8188-
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]",
8188+
"visible": true,
81898189
"options": {
81908190
"text": "The following policies will be enabled: <ul><li>Deny the deployment of new resources<li>Deploy an auto VM shutdown policy at UTC 00:00</ul>",
81918191
"uri": "https://aka.ms/alz/policies",
@@ -8217,7 +8217,7 @@
82178217
"visible": true
82188218
}
82198219
],
8220-
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
8220+
"visible": true
82218221
},
82228222
{
82238223
"name": "sandboxSection",
@@ -8227,7 +8227,7 @@
82278227
{
82288228
"name": "sandboxSettingsInfo",
82298229
"type": "Microsoft.Common.InfoBox",
8230-
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]",
8230+
"visible": true,
82318231
"options": {
82328232
"text": "The following policies will be enabled: <ul><li>Deny vNET peering across subscriptions<li>Deny the deployment of vWAN/ER/VPN gateways</ul>",
82338233
"uri": "https://aka.ms/alz/policies",
@@ -8259,7 +8259,7 @@
82598259
"visible": true
82608260
}
82618261
],
8262-
"visible": "[equals(steps('basics').cloudEnvironment.selection, 'AzureCloud')]"
8262+
"visible": true
82638263
}
82648264
]
82658265
},

‎src/portal/release.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"azureLandingZoneTemplateDetailsUri": "https://github.com/Azure/Enterprise-Scale/tree/2025-05-14",
3-
"templateUri": "https://raw.githubusercontent.com/Azure/Enterprise-Scale/2025-05-14/eslzArm/eslzArm.json",
4-
"templateUriBlob": "https://github.com/Azure/Enterprise-Scale/blob/2025-05-14/eslzArm/eslzArm.json",
5-
"uiFormDefinitionUri": "https://raw.githubusercontent.com/Azure/Enterprise-Scale/2025-05-14/eslzArm/eslz-portal.json"
2+
"azureLandingZoneTemplateDetailsUri": "https://github.com/Azure/Enterprise-Scale/tree/2025-06-12",
3+
"templateUri": "https://raw.githubusercontent.com/Azure/Enterprise-Scale/2025-06-12/eslzArm/eslzArm.json",
4+
"templateUriBlob": "https://github.com/Azure/Enterprise-Scale/blob/2025-06-12/eslzArm/eslzArm.json",
5+
"uiFormDefinitionUri": "https://raw.githubusercontent.com/Azure/Enterprise-Scale/2025-06-12/eslzArm/eslz-portal.json"
66
}

0 commit comments

Comments
 (0)