From 0fe82e77c7756182792515838ab57fea594a9f65 Mon Sep 17 00:00:00 2001 From: "Manikandan Krishnan (Brillio LLC)" Date: Wed, 27 Mar 2024 14:24:06 +0530 Subject: [PATCH 01/48] Committing path for AVD repo and edited Entra ID changes --- workload/workshop/AAD-Hybrid-Lab/README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/workload/workshop/AAD-Hybrid-Lab/README.md b/workload/workshop/AAD-Hybrid-Lab/README.md index 9d535c390..d1d95923c 100644 --- a/workload/workshop/AAD-Hybrid-Lab/README.md +++ b/workload/workshop/AAD-Hybrid-Lab/README.md @@ -1,8 +1,12 @@ # Azure Active Directory Hybrid Lab -## Creates an AD VM with Azure AD Connect installed +## Creates an AD VM with Entra ID Connect installed ## Quick Start - + + + + +## ## ## Details * Deploys the following infrastructure: From 5c48087a8d4c1664863b867897b7e30a3eb85cea Mon Sep 17 00:00:00 2001 From: "Manikandan Krishnan (Brillio LLC)" Date: Wed, 27 Mar 2024 14:30:57 +0530 Subject: [PATCH 02/48] Changes on Entra ID --- workload/workshop/AAD-Hybrid-Lab/README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/workload/workshop/AAD-Hybrid-Lab/README.md b/workload/workshop/AAD-Hybrid-Lab/README.md index d1d95923c..539807b90 100644 --- a/workload/workshop/AAD-Hybrid-Lab/README.md +++ b/workload/workshop/AAD-Hybrid-Lab/README.md @@ -1,13 +1,10 @@ -# Azure Active Directory Hybrid Lab +# Microsoft Entra ID Hybrid Lab ## Creates an AD VM with Entra ID Connect installed ## Quick Start - -## ## - ## Details * Deploys the following infrastructure: * Virtual Network From 18fff7ef3477aa66a1a4c04dc45c6162c5006032 Mon Sep 17 00:00:00 2001 From: manikrish23 <58948577+manikrish23@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:12:17 +0530 Subject: [PATCH 03/48] Create InstallVSCode.ps1 --- workload/workshop/InstallVSCode.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 workload/workshop/InstallVSCode.ps1 diff --git a/workload/workshop/InstallVSCode.ps1 b/workload/workshop/InstallVSCode.ps1 new file mode 100644 index 000000000..18c0a2ef7 --- /dev/null +++ b/workload/workshop/InstallVSCode.ps1 @@ -0,0 +1,6 @@ +# Download VSCode Sources +Invoke-WebRequest -Uri 'https://aka.ms/vscode-win32-x64-system-stable' -OutFile 'c:\windows\temp\VSCode_x64.exe' +# Wait 10s +Start-Sleep -Seconds 10 +# Install VSCode silently +Start-Process -FilePath 'c:\windows\temp\VSCode_x64.exe' -Args '/verysilent /suppressmsgboxes /mergetasks=!runcode' -Wait -PassThru From 38c9771c70241fd4873102b78b93782ea141f0ef Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 19:25:38 +0900 Subject: [PATCH 04/48] Add storageApi --- workload/portal-ui/portal-ui-baseline.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index f51c1fad2..1ae7713b6 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -901,12 +901,29 @@ "placeholder": "Example: OU=storage,OU=avd,DC=contoso,DC=com", "constraints": {} }, + { + "name": "storageApi", + "type": "Microsoft.Solutions.ArmApiControl", + "request": { + "method": "GET", + "path": "[concat(steps('basics').resourceScope.subscription.id,'/providers/Microsoft.Storage/resourceTypes?api-version=2021-04-01')]" + } + }, { "name": "storageGeneralSettingsZoneRedundancy", "type": "Microsoft.Common.CheckBox", + "visible": true, "label": "Zone redundant storage", "defaultValue": false, "toolTip": "Select to replicate storage across availability zones or only use local redundancy." + }, + { + "name": "test", + "type": "Microsoft.Common.DropDown", + "constraints": { + "required": true, + "allowedValues": "[map(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(item.location, steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion.location))]" + } } ] }, From 3fe27a51a125ae2906916f2adf828ec371b7013d Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 19:35:10 +0900 Subject: [PATCH 05/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 1ae7713b6..6fed25e3c 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -922,7 +922,7 @@ "type": "Microsoft.Common.DropDown", "constraints": { "required": true, - "allowedValues": "[map(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(item.location, steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion.location))]" + "allowedValues": "[map(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(item.location, steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))]" } } ] From e488c66c2ee792c4e06c8f5d02422ba8026b44c3 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 19:38:12 +0900 Subject: [PATCH 06/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 6fed25e3c..a1a36a4c3 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -922,7 +922,7 @@ "type": "Microsoft.Common.DropDown", "constraints": { "required": true, - "allowedValues": "[map(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(item.location, steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))]" + "allowedValues": "[map(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(item.location, steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion.location.displayName))]" } } ] From 869a3f263f28022ca5b05fbfee8c5cbafc877402 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 19:41:45 +0900 Subject: [PATCH 07/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index a1a36a4c3..e35cdfcfa 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -922,7 +922,7 @@ "type": "Microsoft.Common.DropDown", "constraints": { "required": true, - "allowedValues": "[map(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(item.location, steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion.location.displayName))]" + "allowedValues": "[filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(item.location, steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))]" } } ] From 4ccbc2f19e845c574b57df8bae759704e61d199e Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 19:43:45 +0900 Subject: [PATCH 08/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index e35cdfcfa..01dbcf3ae 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -922,7 +922,7 @@ "type": "Microsoft.Common.DropDown", "constraints": { "required": true, - "allowedValues": "[filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(item.location, steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))]" + "allowedValues": "[filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3))]" } } ] From 727f792fcc3af33d0c8cd8a1a4bec1e5c13aa66b Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 19:46:54 +0900 Subject: [PATCH 09/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 01dbcf3ae..04a32e033 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -919,6 +919,8 @@ }, { "name": "test", + "label": "test", + "filter": true, "type": "Microsoft.Common.DropDown", "constraints": { "required": true, From af009487ccb39f4a6022807bc1685e63f4229cce Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 19:54:08 +0900 Subject: [PATCH 10/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 04a32e033..6f5f2a7c2 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -924,7 +924,7 @@ "type": "Microsoft.Common.DropDown", "constraints": { "required": true, - "allowedValues": "[filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3))]" + "allowedValues": "[filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))]" } } ] From 69d2a05bc73221913a8afb6e1e5c19e30a633e85 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 20:00:34 +0900 Subject: [PATCH 11/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 6f5f2a7c2..fb4123935 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -912,7 +912,7 @@ { "name": "storageGeneralSettingsZoneRedundancy", "type": "Microsoft.Common.CheckBox", - "visible": true, + "visible": "[not(equals(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))), '[]')]", "label": "Zone redundant storage", "defaultValue": false, "toolTip": "Select to replicate storage across availability zones or only use local redundancy." From a6b72d49a23a4bd32d93490f7343b17b9e2cb38d Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 20:09:20 +0900 Subject: [PATCH 12/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index fb4123935..1a421e881 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -912,7 +912,7 @@ { "name": "storageGeneralSettingsZoneRedundancy", "type": "Microsoft.Common.CheckBox", - "visible": "[not(equals(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))), '[]')]", + "visible": "[not(equals(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))), [])]", "label": "Zone redundant storage", "defaultValue": false, "toolTip": "Select to replicate storage across availability zones or only use local redundancy." From c42d8aef1598c458345977bde40dee62f90e9e7b Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 20:12:37 +0900 Subject: [PATCH 13/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 1a421e881..cbb626daa 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -912,7 +912,7 @@ { "name": "storageGeneralSettingsZoneRedundancy", "type": "Microsoft.Common.CheckBox", - "visible": "[not(equals(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))), [])]", + "visible": "[not(equals(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))), '')]", "label": "Zone redundant storage", "defaultValue": false, "toolTip": "Select to replicate storage across availability zones or only use local redundancy." From 30d99992ffeb1e35c21222713e41f4822e1266e3 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 20:33:49 +0900 Subject: [PATCH 14/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index cbb626daa..0ba75a796 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -912,7 +912,7 @@ { "name": "storageGeneralSettingsZoneRedundancy", "type": "Microsoft.Common.CheckBox", - "visible": "[not(equals(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))), '')]", + "visible": "[not(equals(length(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), 0)]", "label": "Zone redundant storage", "defaultValue": false, "toolTip": "Select to replicate storage across availability zones or only use local redundancy." From a83a6c4a078a4c574f86957191fa8debb428dfbe Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 20:37:32 +0900 Subject: [PATCH 15/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 0ba75a796..f01604553 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -912,7 +912,7 @@ { "name": "storageGeneralSettingsZoneRedundancy", "type": "Microsoft.Common.CheckBox", - "visible": "[not(equals(length(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), 0)]", + "visible": "[not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))))]", "label": "Zone redundant storage", "defaultValue": false, "toolTip": "Select to replicate storage across availability zones or only use local redundancy." From 120b5fb020707f418c1eda9acb1014576addce8b Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 20:44:47 +0900 Subject: [PATCH 16/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index f01604553..6f5f2a7c2 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -912,7 +912,7 @@ { "name": "storageGeneralSettingsZoneRedundancy", "type": "Microsoft.Common.CheckBox", - "visible": "[not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))))]", + "visible": true, "label": "Zone redundant storage", "defaultValue": false, "toolTip": "Select to replicate storage across availability zones or only use local redundancy." From 08e25654baa3ad6e9493cb668bbc8a6552ce6649 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 20:45:37 +0900 Subject: [PATCH 17/48] fix --- workload/portal-ui/portal-ui-baseline.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 6f5f2a7c2..5191731c8 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -912,20 +912,10 @@ { "name": "storageGeneralSettingsZoneRedundancy", "type": "Microsoft.Common.CheckBox", - "visible": true, + "visible": "[not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))))]", "label": "Zone redundant storage", "defaultValue": false, "toolTip": "Select to replicate storage across availability zones or only use local redundancy." - }, - { - "name": "test", - "label": "test", - "filter": true, - "type": "Microsoft.Common.DropDown", - "constraints": { - "required": true, - "allowedValues": "[filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))]" - } } ] }, From 2fb597d5872da6c851e15b57a25c360d86b8c3c8 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 21:24:50 +0900 Subject: [PATCH 18/48] fix --- workload/portal-ui/portal-ui-baseline.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 5191731c8..b8124ca1f 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -914,8 +914,19 @@ "type": "Microsoft.Common.CheckBox", "visible": "[not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))))]", "label": "Zone redundant storage", - "defaultValue": false, + "defaultValue": true, "toolTip": "Select to replicate storage across availability zones or only use local redundancy." + }, + { + "name": "storageAccountType", + "type": "Microsoft.Common.DropDown", + "label": "Storage account type", + "defaultValue": "Zone-Redundant Storage", + "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", + "constraints": { + "required": true, + "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), [{\"label\":\"Local redundant storage\",\"value\":\"false\"},{\"label\":\"Zone-redundant storage\",\"value\":\"true\"}], [{\"label\":\"Local redundant storage\",\"value\":\"false\"}])]" + } } ] }, From 38b9085b511fa115d251dc8051c724877a92663a Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 21:30:35 +0900 Subject: [PATCH 19/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index b8124ca1f..c4a88c20d 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -925,7 +925,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), [{\"label\":\"Local redundant storage\",\"value\":\"false\"},{\"label\":\"Zone-redundant storage\",\"value\":\"true\"}], [{\"label\":\"Local redundant storage\",\"value\":\"false\"}])]" + "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), [{\"label\":\"Locally redundant storage\",\"value\":\"false\"},{\"label\":\"Zone-redundant storage\",\"value\":\"true\"}], [{\"label\":\"Locally redundant storage\",\"value\":\"false\"}])]" } } ] From 141349d50c56b9ad9af2b8abf0d0964acecc2324 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 21:33:51 +0900 Subject: [PATCH 20/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index c4a88c20d..ce5805e32 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -925,7 +925,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), [{\"label\":\"Locally redundant storage\",\"value\":\"false\"},{\"label\":\"Zone-redundant storage\",\"value\":\"true\"}], [{\"label\":\"Locally redundant storage\",\"value\":\"false\"}])]" + "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), parse([{\"label\":\"Locally redundant storage\",\"value\":\"false\"},{\"label\":\"Zone-redundant storage\",\"value\":\"true\"}]), parse([{\"label\":\"Locally redundant storage\",\"value\":\"false\"}]))]" } } ] From 2dd0de6320bb0ff3074015c0b7f068d5314b4bd6 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 21:39:29 +0900 Subject: [PATCH 21/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index ce5805e32..6fe67b157 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -925,7 +925,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), parse([{\"label\":\"Locally redundant storage\",\"value\":\"false\"},{\"label\":\"Zone-redundant storage\",\"value\":\"true\"}]), parse([{\"label\":\"Locally redundant storage\",\"value\":\"false\"}]))]" + "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), [parse('{\"label\":\"Locally redundant storage\",\"value\":\"false\"},{\"label\":\"Zone-redundant storage\",\"value\":\"true\"}')], [parse('{\"label\":\"Locally redundant storage\",\"value\":\"false\"}')])]" } } ] From 1c7d406de3cc44560dc0a9a7d778e28f904017ff Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:18:32 +0900 Subject: [PATCH 22/48] fix --- workload/portal-ui/portal-ui-baseline.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 6fe67b157..43efa01e4 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -927,6 +927,17 @@ "required": true, "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), [parse('{\"label\":\"Locally redundant storage\",\"value\":\"false\"},{\"label\":\"Zone-redundant storage\",\"value\":\"true\"}')], [parse('{\"label\":\"Locally redundant storage\",\"value\":\"false\"}')])]" } + }, + { + "name": "storageAccountType2", + "type": "Microsoft.Common.DropDown", + "label": "Storage account type2", + "defaultValue": "Zone-Redundant Storage", + "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", + "constraints": { + "required": true, + "allowedValues": "[if(equals(42, mul(6, 7)), [parse('{\"label\":\"Locally redundant storage\",\"value\":\"false\"},{\"label\":\"Zone-redundant storage\",\"value\":\"true\"}')], [parse('{\"label\":\"Locally redundant storage\",\"value\":\"false\"}')])]" + } } ] }, From 449196e2c680fec75f39b07fcba10afaa5dbf613 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:22:05 +0900 Subject: [PATCH 23/48] fix --- workload/portal-ui/portal-ui-baseline.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 43efa01e4..8d7c935bf 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -925,7 +925,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), [parse('{\"label\":\"Locally redundant storage\",\"value\":\"false\"},{\"label\":\"Zone-redundant storage\",\"value\":\"true\"}')], [parse('{\"label\":\"Locally redundant storage\",\"value\":\"false\"}')])]" + "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), [parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant Storage\",\"value\":\"true\"}')], [parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}')])]" } }, { @@ -936,7 +936,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(equals(42, mul(6, 7)), [parse('{\"label\":\"Locally redundant storage\",\"value\":\"false\"},{\"label\":\"Zone-redundant storage\",\"value\":\"true\"}')], [parse('{\"label\":\"Locally redundant storage\",\"value\":\"false\"}')])]" + "allowedValues": "[if(equals(42, mul(6, 7)), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant storage\",\"value\":\"true\"}'), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}'))]" } } ] From a5d5c881ca83244d3ac35f96a886d2bafb208b73 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:25:16 +0900 Subject: [PATCH 24/48] fix --- workload/portal-ui/portal-ui-baseline.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 8d7c935bf..31da8db36 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -925,7 +925,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), [parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant Storage\",\"value\":\"true\"}')], [parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}')])]" + "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant Storage\",\"value\":\"true\"}'), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}'))]" } }, { @@ -936,7 +936,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(equals(42, mul(6, 7)), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant storage\",\"value\":\"true\"}'), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}'))]" + "allowedValues": "[if(equals(42, mul(6, 7)), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]" } } ] From d81b185e06cb213db6c8be35dff13a36f8c58b99 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:27:41 +0900 Subject: [PATCH 25/48] fix --- workload/portal-ui/portal-ui-baseline.json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 31da8db36..ce4d3844b 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -938,6 +938,28 @@ "required": true, "allowedValues": "[if(equals(42, mul(6, 7)), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]" } + }, + { + "name": "storageAccountType3", + "type": "Microsoft.Common.DropDown", + "label": "Storage account type3", + "defaultValue": "Zone-Redundant Storage", + "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", + "constraints": { + "required": true, + "allowedValues": "[parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')]" + } + }, + { + "name": "storageAccountType4", + "type": "Microsoft.Common.DropDown", + "label": "Storage account type4", + "defaultValue": "Zone-Redundant Storage", + "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", + "constraints": { + "required": true, + "allowedValues": [{"label":"Zone-Redundant Storage","value":"false"}] + } } ] }, From ecc21acafe6a336479b7cb2bf746ce3edebcc9e4 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:32:44 +0900 Subject: [PATCH 26/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index ce4d3844b..862aafb03 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -947,7 +947,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')]" + "allowedValues": ["[parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')]"] } }, { From a88fe960171a66eab57297591cf4f8e353befdf1 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:33:55 +0900 Subject: [PATCH 27/48] fix --- workload/portal-ui/portal-ui-baseline.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 862aafb03..57b91c1fc 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -925,7 +925,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant Storage\",\"value\":\"true\"}'), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}'))]" + "allowedValues": ["[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant Storage\",\"value\":\"true\"}'), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}'))]"] } }, { @@ -936,7 +936,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(equals(42, mul(6, 7)), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]" + "allowedValues": ["[if(equals(42, mul(6, 7)), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]"] } }, { From 6b863aa297498b774ae449ee3e0e0fcb9a2c6ac8 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:35:13 +0900 Subject: [PATCH 28/48] fix --- workload/portal-ui/portal-ui-baseline.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 57b91c1fc..63423b2c1 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -925,7 +925,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": ["[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant Storage\",\"value\":\"true\"}'), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}'))]"] + "allowedValues": ["[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), [parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant Storage\",\"value\":\"true\"}')], [parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}')])]"] } }, { @@ -936,7 +936,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": ["[if(equals(42, mul(6, 7)), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]"] + "allowedValues": ["[if(equals(42, mul(6, 7)), [parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]]"] } }, { From 6bfd67ce282d6e9af7daf28106a85ee8e0df3e33 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:36:15 +0900 Subject: [PATCH 29/48] fix --- workload/portal-ui/portal-ui-baseline.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 63423b2c1..618635aba 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -949,17 +949,6 @@ "required": true, "allowedValues": ["[parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')]"] } - }, - { - "name": "storageAccountType4", - "type": "Microsoft.Common.DropDown", - "label": "Storage account type4", - "defaultValue": "Zone-Redundant Storage", - "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", - "constraints": { - "required": true, - "allowedValues": [{"label":"Zone-Redundant Storage","value":"false"}] - } } ] }, From 10f1be37b55a8818c7fc015850a5ac909dc0ad4c Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:39:29 +0900 Subject: [PATCH 30/48] fix --- workload/portal-ui/portal-ui-baseline.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 618635aba..7cebac945 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -925,7 +925,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": ["[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), [parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant Storage\",\"value\":\"true\"}')], [parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}')])]"] + "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant Storage\",\"value\":\"true\"}'), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}'))]" } }, { @@ -949,6 +949,17 @@ "required": true, "allowedValues": ["[parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')]"] } + }, + { + "name": "storageAccountType4", + "type": "Microsoft.Common.DropDown", + "label": "Storage account type4", + "defaultValue": "Zone-Redundant Storage", + "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", + "constraints": { + "required": true, + "allowedValues": [{"label":"Zone-Redundant Storage","value":"false"}] + } } ] }, From ebb52c6595c1f5c9f46682a19a25f13bc2c152d3 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:45:32 +0900 Subject: [PATCH 31/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 7cebac945..a0750c3c7 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -936,7 +936,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": ["[if(equals(42, mul(6, 7)), [parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]]"] + "allowedValues": ["[if(equals(42, mul(6, 7)), [parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')])]"] } }, { From 84e428c6d07b8f3ab867f1e51f405aa0f2a3be1b Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:47:52 +0900 Subject: [PATCH 32/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index a0750c3c7..862aafb03 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -936,7 +936,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": ["[if(equals(42, mul(6, 7)), [parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')])]"] + "allowedValues": "[if(equals(42, mul(6, 7)), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]" } }, { From 5deed453580476c42c00cc6aa9d6b4de8c2c0509 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:49:24 +0900 Subject: [PATCH 33/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 862aafb03..3cc5eed2c 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -936,7 +936,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(equals(42, mul(6, 7)), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]" + "allowedValues": ["[if(equals(42, mul(6, 7)), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]"] } }, { From d11f5292d05380b8679430c062e1e628b9846f37 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:52:39 +0900 Subject: [PATCH 34/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 3cc5eed2c..b29db0510 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -936,7 +936,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": ["[if(equals(42, mul(6, 7)), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]"] + "allowedValues": ["[if(equals(42, mul(6, 7)), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]"] } }, { From 28bf206c3631cdec191ad84a200940980a0a433a Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:55:44 +0900 Subject: [PATCH 35/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index b29db0510..a7701224c 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -936,7 +936,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": ["[if(equals(42, mul(6, 7)), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'), parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}'))]"] + "allowedValues": "[if(equals(42, mul(6, 7)), [parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')], [parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')])]" } }, { From aba2c60004658046b5229c9caef5cdeecc6b82c4 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 22:57:27 +0900 Subject: [PATCH 36/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index a7701224c..424877bc6 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -936,7 +936,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(equals(42, mul(6, 7)), [parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')], [parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')])]" + "allowedValues": ["[if(equals(42, mul(6, 7)), [parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')], [parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')])]"] } }, { From 9aa77845afd762ae83115d1da357407030193bba Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 23:10:21 +0900 Subject: [PATCH 37/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 424877bc6..b9bb9257b 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -936,7 +936,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": ["[if(equals(42, mul(6, 7)), [parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')], [parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')])]"] + "allowedValues": "[if(equals(true, true), parse('[{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}]'), parse('[{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}]'))]" } }, { From de4f4789d01b1c45791c600b429fe3125a0a18d3 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 23:11:27 +0900 Subject: [PATCH 38/48] fix --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index b9bb9257b..63e1cd63f 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -925,7 +925,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant Storage\",\"value\":\"true\"}'), parse('{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}'))]" + "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), parse('[{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant Storage\",\"value\":\"true\"}]'), parse('[{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}]'))]" } }, { From c3c61bc0708a2caf124297a0e5b52725016bfc40 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 23:15:30 +0900 Subject: [PATCH 39/48] fix --- workload/portal-ui/portal-ui-baseline.json | 24 +--------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index 63e1cd63f..b47ee8a9c 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -936,29 +936,7 @@ "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true, - "allowedValues": "[if(equals(true, true), parse('[{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}]'), parse('[{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}]'))]" - } - }, - { - "name": "storageAccountType3", - "type": "Microsoft.Common.DropDown", - "label": "Storage account type3", - "defaultValue": "Zone-Redundant Storage", - "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", - "constraints": { - "required": true, - "allowedValues": ["[parse('{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}')]"] - } - }, - { - "name": "storageAccountType4", - "type": "Microsoft.Common.DropDown", - "label": "Storage account type4", - "defaultValue": "Zone-Redundant Storage", - "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", - "constraints": { - "required": true, - "allowedValues": [{"label":"Zone-Redundant Storage","value":"false"}] + "allowedValues": "[if(equals(true, true), parse('[{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}]'), parse('[{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}]'))]" } } ] From a4b1ea68b756b2c23aab3909cf4e006573f92495 Mon Sep 17 00:00:00 2001 From: Yasuhiro Handa Date: Thu, 4 Apr 2024 23:17:31 +0900 Subject: [PATCH 40/48] fix --- workload/portal-ui/portal-ui-baseline.json | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index b47ee8a9c..f3d833f8f 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -911,14 +911,6 @@ }, { "name": "storageGeneralSettingsZoneRedundancy", - "type": "Microsoft.Common.CheckBox", - "visible": "[not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion))))]", - "label": "Zone redundant storage", - "defaultValue": true, - "toolTip": "Select to replicate storage across availability zones or only use local redundancy." - }, - { - "name": "storageAccountType", "type": "Microsoft.Common.DropDown", "label": "Storage account type", "defaultValue": "Zone-Redundant Storage", @@ -927,17 +919,6 @@ "required": true, "allowedValues": "[if(not(empty(filter(filter(first(map(filter(steps('storage').storageGeneralSettings.storageApi.value, (resourceTypes) => equals(resourceTypes.resourceType, 'storageAccounts')), (item) => item.zoneMappings)), (item) => equals(length(item.zones), 3)), (item) => equals(toLower(replace(item.location, ' ', '')), steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion)))), parse('[{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"},{\"label\":\"Zone-Redundant Storage\",\"value\":\"true\"}]'), parse('[{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}]'))]" } - }, - { - "name": "storageAccountType2", - "type": "Microsoft.Common.DropDown", - "label": "Storage account type2", - "defaultValue": "Zone-Redundant Storage", - "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", - "constraints": { - "required": true, - "allowedValues": "[if(equals(true, true), parse('[{\"label\":\"Locally Redundant Storage\",\"value\":\"false\"}]'), parse('[{\"label\":\"Zone-Redundant Storage\",\"value\":\"false\"}]'))]" - } } ] }, From 655dc5e59f2f5665aef02b7f7fe89495a2e77f48 Mon Sep 17 00:00:00 2001 From: Dany Contreras <78437433+danycontre@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:41:47 -0500 Subject: [PATCH 41/48] updates --- workload/workshop/AAD-Hybrid-Lab/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workload/workshop/AAD-Hybrid-Lab/README.md b/workload/workshop/AAD-Hybrid-Lab/README.md index 539807b90..7ace8bb8b 100644 --- a/workload/workshop/AAD-Hybrid-Lab/README.md +++ b/workload/workshop/AAD-Hybrid-Lab/README.md @@ -5,7 +5,10 @@ +[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure/avdaccelerator/blob/main/workload/workshop/AAD-Hybrid-Lab/deploy.json) + ## Details + * Deploys the following infrastructure: * Virtual Network * 1 subnet From be84a9d1473c9f2ea9ddb8898a8fc60d83652eb3 Mon Sep 17 00:00:00 2001 From: Dany Contreras <78437433+danycontre@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:49:59 -0500 Subject: [PATCH 42/48] updates --- workload/workshop/AAD-Hybrid-Lab/README.md | 2 +- .../workshop/AAD-Hybrid-Lab/portal-ui.json | 316 ++++++++++++++++++ 2 files changed, 317 insertions(+), 1 deletion(-) create mode 100644 workload/workshop/AAD-Hybrid-Lab/portal-ui.json diff --git a/workload/workshop/AAD-Hybrid-Lab/README.md b/workload/workshop/AAD-Hybrid-Lab/README.md index 7ace8bb8b..fef249c20 100644 --- a/workload/workshop/AAD-Hybrid-Lab/README.md +++ b/workload/workshop/AAD-Hybrid-Lab/README.md @@ -5,7 +5,7 @@ -[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure/avdaccelerator/blob/main/workload/workshop/AAD-Hybrid-Lab/deploy.json) +[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%workshop%2FAAD-Hybrid-Lab%2Fdeploy.json) ## Details diff --git a/workload/workshop/AAD-Hybrid-Lab/portal-ui.json b/workload/workshop/AAD-Hybrid-Lab/portal-ui.json new file mode 100644 index 000000000..5a2458900 --- /dev/null +++ b/workload/workshop/AAD-Hybrid-Lab/portal-ui.json @@ -0,0 +1,316 @@ +{ + "$schema": "", + "view": { + "kind": "Form", + "properties": { + "title": "Test Form View", + "steps": [ + { + "name": "basics", + "label": "Basics", + "elements": [ + { + "name": "resourceScope", + "type": "Microsoft.Common.ResourceScope", + "location": { + "resourceTypes": [ + "microsoft.resources/resourcegroups" + ] + } + }, + { + "name": "assetLocation", + "type": "Microsoft.Common.TextBox", + "label": "Asset Location", + "subLabel": "", + "defaultValue": "https://raw.githubusercontent.com/PeterR-msft/M365AVDWS/master/AAD-Hybrid-Lab/", + "toolTip": "This is the location in which all the linked templates are stored.", + "constraints": { + "required": false, + "regex": "", + "validationMessage": "", + "validations": [] + }, + "infoMessages": [], + "visible": true + }, + { + "name": "adminUsername", + "type": "Microsoft.Common.TextBox", + "label": "Admin Username", + "subLabel": "", + "defaultValue": "ADAdmin", + "toolTip": "Username to set for the local User. Cannot be \"Administrator\", \"root\" and possibly other such common account names. ", + "constraints": { + "required": false, + "regex": "", + "validationMessage": "", + "validations": [] + }, + "infoMessages": [], + "visible": true + }, + { + "name": "deploymentNumber", + "type": "Microsoft.Common.DropDown", + "label": "Deployment Number", + "subLabel": "", + "defaultValue": "1", + "toolTip": "When deploying the stack N times simultaneously, define the instance - this will be appended to some resource names to avoid collisions.", + "constraints": { + "required": false, + "allowedValues": [ + { + "label": "0", + "value": "0" + }, + { + "label": "1", + "value": "1" + }, + { + "label": "2", + "value": "2" + }, + { + "label": "3", + "value": "3" + }, + { + "label": "4", + "value": "4" + }, + { + "label": "5", + "value": "5" + }, + { + "label": "6", + "value": "6" + }, + { + "label": "7", + "value": "7" + }, + { + "label": "8", + "value": "8" + }, + { + "label": "9", + "value": "9" + } + ], + "validations": [] + }, + "infoMessages": [], + "visible": true + }, + { + "name": "adminPassword", + "type": "Microsoft.Common.PasswordBox", + "label": { + "password": "Admin Password", + "confirmPassword": "Confirm password" + }, + "defaultValue": "", + "toolTip": "Password for the local administrator account. Cannot be \"P@ssw0rd\" and possibly other such common passwords. Must be 8 characters long and three of the following complexity requirements: uppercase, lowercase, number, special character", + "constraints": { + "required": true, + "regex": "", + "validationMessage": "", + "validations": [] + }, + "options": { + "hideConfirmation": true + }, + "visible": true + }, + { + "name": "adDomainName", + "type": "Microsoft.Common.TextBox", + "label": "Ad Domain Name", + "subLabel": "", + "defaultValue": "", + "toolTip": "IMPORTANT: Two-part internal AD name - short/NB name will be first part ('contoso'). The short name will be reused and should be unique when deploying this template in your selected region. If a name is reused, DNS name collisions may occur.", + "constraints": { + "required": true, + "regex": "", + "validationMessage": "", + "validations": [] + }, + "infoMessages": [], + "visible": true + }, + { + "name": "usersArray", + "type": "Microsoft.Common.TextBox", + "label": "Users Array", + "subLabel": "", + "defaultValue": "[[{\"FName\":\"Bob\",\"LName\":\"Jones\",\"SAM\":\"bjones\"},{\"FName\":\"Bill\",\"LName\":\"Smith\",\"SAM\":\"bsmith\"},{\"FName\":\"Mary\",\"LName\":\"Phillips\",\"SAM\":\"mphillips\"},{\"FName\":\"Sue\",\"LName\":\"Jackson\",\"SAM\":\"sjackson\"},{\"FName\":\"Jack\",\"LName\":\"Petersen\",\"SAM\":\"jpetersen\"},{\"FName\":\"Julia\",\"LName\":\"Williams\",\"SAM\":\"jwilliams\"}]", + "toolTip": "JSON object array of users that will be loaded into AD once the domain is established.", + "constraints": { + "required": false, + "regex": "", + "validationMessage": "", + "validations": [] + }, + "infoMessages": [], + "visible": true + }, + { + "name": "customupnsuffix", + "type": "Microsoft.Common.TextBox", + "label": "Customupnsuffix", + "subLabel": "", + "defaultValue": "", + "toolTip": "This needs to be specified in order to have a uniform logon experience within WVD", + "constraints": { + "required": true, + "regex": "", + "validationMessage": "", + "validations": [] + }, + "infoMessages": [], + "visible": true + }, + { + "name": "defaultUserPassword", + "type": "Microsoft.Common.PasswordBox", + "label": { + "password": "Default User Password", + "confirmPassword": "Confirm password" + }, + "defaultValue": "", + "toolTip": "Enter the password that will be applied to each user account to be created in AD.", + "constraints": { + "required": true, + "regex": "", + "validationMessage": "", + "validations": [] + }, + "options": { + "hideConfirmation": true + }, + "visible": true + }, + { + "name": "vmSize", + "type": "Microsoft.Common.DropDown", + "label": "Vm Size", + "subLabel": "", + "defaultValue": "Standard_D2s_v4", + "toolTip": "Select a VM SKU (please ensure the SKU is available in your selected region).", + "constraints": { + "required": false, + "allowedValues": [ + { + "label": "Standard_DS2_v2", + "value": "Standard_DS2_v2" + }, + { + "label": "Standard_D2_v3", + "value": "Standard_D2_v3" + }, + { + "label": "Standard_D2_v4", + "value": "Standard_D2_v4" + }, + { + "label": "Standard_D2s_v3", + "value": "Standard_D2s_v3" + }, + { + "label": "Standard_D2s_v4", + "value": "Standard_D2s_v4" + }, + { + "label": "Standard_D4_v4", + "value": "Standard_D4_v4" + }, + { + "label": "Standard_D4s_v4", + "value": "Standard_D4s_v4" + } + ], + "validations": [] + }, + "infoMessages": [], + "visible": true + }, + { + "name": "virtualNetworkAddressRange", + "type": "Microsoft.Common.TextBox", + "label": "Virtual Network Address Range", + "subLabel": "", + "defaultValue": "10.0.0.0/16", + "toolTip": "The address range of the new virtual network in CIDR format", + "constraints": { + "required": false, + "regex": "", + "validationMessage": "", + "validations": [] + }, + "infoMessages": [], + "visible": true + }, + { + "name": "adSubnetAddressRange", + "type": "Microsoft.Common.TextBox", + "label": "Ad Subnet Address Range", + "subLabel": "", + "defaultValue": "10.0.1.0/24", + "toolTip": "The address range of the desired subnet for Active Directory.", + "constraints": { + "required": false, + "regex": "", + "validationMessage": "", + "validations": [] + }, + "infoMessages": [], + "visible": true + }, + { + "name": "adIP", + "type": "Microsoft.Common.TextBox", + "label": "Ad IP", + "subLabel": "", + "defaultValue": "10.0.1.4", + "toolTip": "The IP Addresses assigned to the domain controllers (a, b). Remember the first IP in a subnet is .4 e.g. 10.0.0.0/16 reserves 10.0.0.0-3. Specify one IP per server - must match numberofVMInstances or deployment will fail.", + "constraints": { + "required": false, + "regex": "", + "validationMessage": "", + "validations": [] + }, + "infoMessages": [], + "visible": true + } + ] + } + ], + "deployment": { + "kind": "ResourceGroup", + "location": "[steps('basics').resourceScope.location.name]", + "resourceGroupId": "[steps('basics').resourceScope.resourceGroup.id]", + "parameters": { + "assetLocation": "[steps('basics').assetLocation]", + "adminUsername": "[steps('basics').adminUsername]", + "deploymentNumber": "[steps('basics').deploymentNumber]", + "adminPassword": "[steps('basics').adminPassword]", + "adDomainName": "[steps('basics').adDomainName]", + "usersArray": "[steps('basics').usersArray]", + "customupnsuffix": "[steps('basics').customupnsuffix]", + "defaultUserPassword": "[steps('basics').defaultUserPassword]", + "vmSize": "[steps('basics').vmSize]", + "virtualNetworkAddressRange": "[steps('basics').virtualNetworkAddressRange]", + "adSubnetAddressRange": "[steps('basics').adSubnetAddressRange]", + "adIP": "[steps('basics').adIP]" + }, + "template": { + "file": "" + } + } + } + } +} \ No newline at end of file From de01876baf774384d2b61be190a3ab58e45e6331 Mon Sep 17 00:00:00 2001 From: Dany Contreras <78437433+danycontre@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:52:09 -0500 Subject: [PATCH 43/48] updates --- workload/workshop/AAD-Hybrid-Lab/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/workshop/AAD-Hybrid-Lab/README.md b/workload/workshop/AAD-Hybrid-Lab/README.md index fef249c20..dcbaa3153 100644 --- a/workload/workshop/AAD-Hybrid-Lab/README.md +++ b/workload/workshop/AAD-Hybrid-Lab/README.md @@ -5,7 +5,7 @@ -[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%workshop%2FAAD-Hybrid-Lab%2Fdeploy.json) +[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2workshop%2FAAD-Hybrid-Lab%2Fdeploy.json) ## Details From 0e3db61a34faffa01fc8b72465ac847ce9e3d0cd Mon Sep 17 00:00:00 2001 From: Dany Contreras <78437433+danycontre@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:53:24 -0500 Subject: [PATCH 44/48] updates --- workload/workshop/AAD-Hybrid-Lab/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workload/workshop/AAD-Hybrid-Lab/README.md b/workload/workshop/AAD-Hybrid-Lab/README.md index dcbaa3153..f6d250eb6 100644 --- a/workload/workshop/AAD-Hybrid-Lab/README.md +++ b/workload/workshop/AAD-Hybrid-Lab/README.md @@ -7,6 +7,9 @@ [![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2workshop%2FAAD-Hybrid-Lab%2Fdeploy.json) + +[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Farm%2Fdeploy-baseline.json) + ## Details * Deploys the following infrastructure: From 6708fc53d320a8c8f3cf6b9c0bc96b83df36a9f0 Mon Sep 17 00:00:00 2001 From: Dany Contreras <78437433+danycontre@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:56:34 -0500 Subject: [PATCH 45/48] updates --- workload/workshop/AAD-Hybrid-Lab/README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/workload/workshop/AAD-Hybrid-Lab/README.md b/workload/workshop/AAD-Hybrid-Lab/README.md index f6d250eb6..16e93e4f4 100644 --- a/workload/workshop/AAD-Hybrid-Lab/README.md +++ b/workload/workshop/AAD-Hybrid-Lab/README.md @@ -2,13 +2,7 @@ ## Creates an AD VM with Entra ID Connect installed ## Quick Start - - - -[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2workshop%2FAAD-Hybrid-Lab%2Fdeploy.json) - - -[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Farm%2Fdeploy-baseline.json) +[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkshop%2FAAD-Hybrid-Lab%2Fdeploy.json) ## Details From 71b5dbd0936c7d5915ceea4dbf21d461d20ddc5d Mon Sep 17 00:00:00 2001 From: Dany Contreras <78437433+danycontre@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:58:38 -0500 Subject: [PATCH 46/48] updates --- workload/workshop/AAD-Hybrid-Lab/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/workshop/AAD-Hybrid-Lab/README.md b/workload/workshop/AAD-Hybrid-Lab/README.md index 16e93e4f4..859095b80 100644 --- a/workload/workshop/AAD-Hybrid-Lab/README.md +++ b/workload/workshop/AAD-Hybrid-Lab/README.md @@ -2,7 +2,7 @@ ## Creates an AD VM with Entra ID Connect installed ## Quick Start -[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkshop%2FAAD-Hybrid-Lab%2Fdeploy.json) +[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Fworkshop%2FAAD-Hybrid-Lab%2Fdeploy.json) ## Details From 5f0371dfb624f4f9028c1f69f0aa7e20e7cd541e Mon Sep 17 00:00:00 2001 From: Dany Contreras <78437433+danycontre@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:56:02 -0500 Subject: [PATCH 47/48] updates --- workload/arm/deploy-baseline.json | 7 ++++++- workload/variables/locations.json | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/workload/arm/deploy-baseline.json b/workload/arm/deploy-baseline.json index c927c1fb1..03f7bd740 100644 --- a/workload/arm/deploy-baseline.json +++ b/workload/arm/deploy-baseline.json @@ -5,7 +5,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "5350888940481572423" + "templateHash": "11069848222764082779" }, "name": "AVD Accelerator - Baseline Deployment", "description": "AVD Accelerator - Deployment Baseline" @@ -1096,6 +1096,11 @@ "timeDifference": "+1:00", "timeZone": "Central Europe Standard Time" }, + "italynorth": { + "acronym": "itn", + "timeDifference": "+1:00", + "timeZone": "Central Europe Standard Time" + }, "southafricanorth": { "acronym": "zan", "timeDifference": "+2:00", diff --git a/workload/variables/locations.json b/workload/variables/locations.json index d195c7503..77c3701c0 100644 --- a/workload/variables/locations.json +++ b/workload/variables/locations.json @@ -159,6 +159,11 @@ "timeDifference": "+1:00", "timeZone": "Central Europe Standard Time" }, + "italynorth": { + "acronym": "itn", + "timeDifference": "+1:00", + "timeZone": "Central Europe Standard Time" + }, "southafricanorth": { "acronym": "zan", "timeDifference": "+2:00", From 2650021d6669e92a1dab6b74fa96537e8fe0ed01 Mon Sep 17 00:00:00 2001 From: Dany Contreras <78437433+danycontre@users.noreply.github.com> Date: Fri, 12 Apr 2024 10:03:12 -0500 Subject: [PATCH 48/48] updates --- workload/portal-ui/portal-ui-baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json index f3d833f8f..9c2dcb330 100644 --- a/workload/portal-ui/portal-ui-baseline.json +++ b/workload/portal-ui/portal-ui-baseline.json @@ -913,7 +913,7 @@ "name": "storageGeneralSettingsZoneRedundancy", "type": "Microsoft.Common.DropDown", "label": "Storage account type", - "defaultValue": "Zone-Redundant Storage", + "defaultValue": "[if(equals(steps('sessionHosts').sessionHostsRegionSection.sessionHostsAvailabilitySettings, true), 'Zone-Redundant Storage', 'Locally Redundant Storage')]", "toolTip": "Select to replicate storage across availability zones or only use local redundancy.", "constraints": { "required": true,