Merge pull request #13 from Azure/main

Updates from upstream
ARPA-H · Apr 12, 2024 · c281a06 · c281a06
2 parents 9499998 + 2650021
commit c281a06
Show file tree

Hide file tree

Showing 6 changed files with 353 additions and 8 deletions.
diff --git 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/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json
@@ -901,12 +901,24 @@
                                     "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",
-                                    "label": "Zone redundant storage",
-                                    "defaultValue": false,
-                                    "toolTip": "Select to replicate storage across availability zones or only use local redundancy."
+                                    "type": "Microsoft.Common.DropDown",
+                                    "label": "Storage account type",
+                                    "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,
+                                        "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\"}]'))]"
+                                    }
                                 }
                             ]
                         },

diff --git 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",

diff --git a/workload/workshop/AAD-Hybrid-Lab/README.md b/workload/workshop/AAD-Hybrid-Lab/README.md
@@ -1,10 +1,11 @@
-# Azure Active Directory Hybrid Lab
-## Creates an AD VM with Azure AD Connect installed
+# Microsoft Entra ID Hybrid Lab
+## Creates an AD VM with Entra ID Connect installed
 ## Quick Start
 
-<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FPeterR-msft%2FM365AVDWS%2Fmaster%2FAAD-Hybrid-Lab%2Fdeploy.json" target="_blank"><img src="https://azuredeploy.net/deploybutton.png"/></a>
+[![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
+
 * Deploys the following infrastructure:
  * Virtual Network
   * 1 subnet