From f224a1e326bdd957899ec1d8be66fb228bbfb71f Mon Sep 17 00:00:00 2001 From: Jack Tracey <41163455+jtracey93@users.noreply.github.com> Date: Tue, 21 Jan 2025 18:58:01 +0000 Subject: [PATCH] fix: ALZ Portal ARG query drop downs not working (#1890) --- eslzArm/eslz-portal.json | 309 ++++++++++++++++++++++++++++++++------- 1 file changed, 260 insertions(+), 49 deletions(-) diff --git a/eslzArm/eslz-portal.json b/eslzArm/eslz-portal.json index 33100bc954..b4391871a8 100644 --- a/eslzArm/eslz-portal.json +++ b/eslzArm/eslz-portal.json @@ -63,7 +63,7 @@ "type": "Microsoft.Solutions.ArmApiControl", "request": { "method": "POST", - "path": "providers/Microsoft.ResourceGraph/resources?api-version=2021-03-01", + "path": "/providers/Microsoft.ResourceGraph/resources?api-version=2021-03-01", "body": { "query": "ResourceContainers | where type =~ 'microsoft.resources/subscriptions' | where properties.state =~ 'enabled' | project label=tostring(name), description=subscriptionId, value=subscriptionId | order by label asc" } @@ -82,7 +82,7 @@ "type": "Microsoft.Solutions.ArmApiControl", "request": { "method": "POST", - "path": "providers/Microsoft.ResourceGraph/resources?api-version=2021-03-01", + "path": "/providers/Microsoft.ResourceGraph/resources?api-version=2021-03-01", "body": { "query": "policyresources | where type == 'microsoft.authorization/policysetdefinitions' | extend metadataCategory=tostring(properties.metadata.category) | extend metadataDeprecated=tostring(properties.metadata.deprecated) | extend displayName=tostring(properties.displayName) | extend description=tostring(properties.description) | where properties.metadata.category =~ 'Regulatory Compliance' | where metadataDeprecated != 'true' | extend valueOutput=pack('displayName', displayName, 'id', id, 'description', description) | project id, name, displayName, description, metadataCategory, valueOutput | project label=displayName, description, value=valueOutput | order by label asc" } @@ -947,11 +947,11 @@ "type": "Microsoft.Common.TextBlock", "visible": true, "options": { - "text": "AMBA for ALZ is a best practice collection of alerts for resources commonly deployed into Azure landing zones and demonstrates how to deploy alerts at scale using Azure Policy.", - "link": { - "label": "Learn more", - "uri": "https://aka.ms/amba/alz" - } + "text": "AMBA for ALZ is a best practice collection of alerts for resources commonly deployed into Azure landing zones and demonstrates how to deploy alerts at scale using Azure Policy.", + "link": { + "label": "Learn more", + "uri": "https://aka.ms/amba/alz" + } } } ] @@ -1314,10 +1314,10 @@ "defaultValue": "id-amba-prod-001", "toolTip": "Specify the name of the user assigned managed identity for monitoring purpose.", "constraints": { - "required": true, - "regex": "", - "validationMessage": "", - "validations": [] + "required": true, + "regex": "", + "validationMessage": "", + "validations": [] }, "infoMessages": [], "visible": true @@ -1348,7 +1348,9 @@ "name": "ambaAgArmRole", "type": "Microsoft.Common.DropDown", "label": "ARM Roles for action group notifications", - "defaultValue": ["Owner"], + "defaultValue": [ + "Owner" + ], "multiselect": true, "selectAll": true, "filter": false, @@ -1806,7 +1808,7 @@ "value": "privatelink.wvd.microsoft.com" }, { - "value" : "privatelink-global.wvd.microsoft.com" + "value": "privatelink-global.wvd.microsoft.com" } ], "visible": "[and(or(equals(steps('connectivity').enableHub, 'vhub'), equals(steps('connectivity').enableHub, 'nva')), not(equals(steps('connectivity').enablePrivateDnsZones,'No')))]", @@ -2693,7 +2695,17 @@ "name": "firewallZones", "type": "Microsoft.Common.DropDown", "label": "Select Availability Zones for the Azure Firewall", - "defaultValue": [{"value": "1"}, {"value": "2"}, {"value": "3"}], + "defaultValue": [ + { + "value": "1" + }, + { + "value": "2" + }, + { + "value": "3" + } + ], "multiselect": true, "selectAll": true, "filter": true, @@ -3159,7 +3171,7 @@ "type": "Microsoft.Common.Section", "label": "Secondary Region Networking", "visible": "[and(not(equals(steps('connectivity').enableHub, 'No')), equals(steps('core').deploySecondaryRegion, 'Yes'))]", - "elements":[ + "elements": [ { "name": "secondaryRegionNetworkInfo", "type": "Microsoft.Common.InfoBox", @@ -3808,7 +3820,17 @@ "name": "firewallZonesSecondary", "type": "Microsoft.Common.DropDown", "label": "Select Availability Zones for the Azure Firewall in your second region", - "defaultValue": [{"value": "1"}, {"value": "2"}, {"value": "3"}], + "defaultValue": [ + { + "value": "1" + }, + { + "value": "2" + }, + { + "value": "3" + } + ], "multiselect": true, "selectAll": true, "filter": true, @@ -4269,9 +4291,9 @@ ] } } - ] - } - ] + ] + } + ] }, { "name": "identity", @@ -4492,7 +4514,7 @@ "type": "Microsoft.Common.Section", "label": "Secondary Region Identity", "visible": "[and(not(equals(steps('connectivity').enableHub, 'No')), equals(steps('core').deploySecondaryRegion, 'Yes'))]", - "elements":[ + "elements": [ { "name": "esIdentityConnectivitySecondary", "type": "Microsoft.Common.OptionsGroup", @@ -4532,7 +4554,7 @@ "visible": "[and(equals(steps('identity').esIdentitySecondarySubSection.esIdentityConnectivitySecondary, 'Yes'), not(equals(steps('connectivity').enableHub,'No')))]" } ] - } + } ] }, { @@ -5404,7 +5426,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').wlcCMK.enableWsCMKInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -5500,7 +5529,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').wlcAIReady.enableWsBotServiceInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -5588,7 +5624,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').wlcAIReady.enableWsCognitiveServicesInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -5676,7 +5719,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').wlcAIReady.enableWsMachineLearningInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -5764,7 +5814,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').wlcAIReady.enableWsOpenAIInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -5861,7 +5918,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsDataExplorerInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -5949,7 +6013,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsDataFactoryInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -6037,7 +6108,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsSynapseInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -6131,7 +6209,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsComputeInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -6219,7 +6304,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsVirtualDesktopInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -6313,7 +6405,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsContainerAppsInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -6401,7 +6500,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsContainerInstanceInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -6489,7 +6595,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsContainerRegistryInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -6577,7 +6690,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsKubernetesInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -6671,7 +6791,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsCosmosDbInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -6759,7 +6886,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsMySQLInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -6847,7 +6981,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsPostgreSQLInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -6935,7 +7076,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsSQLInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -7029,7 +7177,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsEventGridInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -7117,7 +7272,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsEventHubInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -7205,7 +7367,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsServiceBusInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -7299,7 +7468,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsAutomationInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -7394,7 +7570,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsNetworkInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -7488,7 +7671,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsKeyVaultSupInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -7582,7 +7772,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsStorageInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -7676,7 +7873,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsAPIMInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -7764,7 +7968,14 @@ "filterPlaceholder": "Filter items ...", "multiLine": true, "visible": "[equals(steps('workloadspecific').enableWsAppServicesInitiatives, 'Yes')]", - "defaultValue": [{"value": "contoso-platform"},{"value": "contoso-landingzones"}], + "defaultValue": [ + { + "value": "contoso-platform" + }, + { + "value": "contoso-landingzones" + } + ], "constraints": { "allowedValues": [ { @@ -9663,4 +9874,4 @@ "location": "[steps('basics').resourceScope.location.name]" } } -} +} \ No newline at end of file