Support regional availability zones

Azure · Jul 18, 2024 · ada4a03 · ada4a03
1 parent 0fdd044
commit ada4a03
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 21 deletions.
diff --git a/alz/.config/ALZ-Powershell.config.json b/alz/.config/ALZ-Powershell.config.json
@@ -31,14 +31,44 @@
             "maps_to": [ "starter" ],
             "bicep_alias": "ReleaseVersion"
         },
+        "availability_zones_bootstrap": {
+            "type": "list(string)",
+            "source": "powershell",
+            "maps_to": [ "bootstrap" ]
+        },
+        "availability_zones_starter": {
+            "type": "list(string)",
+            "source": "powershell",
+            "maps_to": [ "starter" ],
+            "bicep_alias": "AvailabilityZones"
+        },
+        "bootstrap_location": {
+            "type": "string",
+            "required": true,
+            "source": "input",
+            "maps_to": [ "bootstrap" ],
+            "validation": "azure_region",
+            "display_order": 1,
+            "description": "The region for the bootstrap resources."
+        },
+        "starter_location": {
+            "type": "string",
+            "required": true,
+            "source": "input",
+            "maps_to": [ "starter" ],
+            "validation": "azure_region",
+            "bicep_alias": "Location",
+            "display_order": 2,
+            "description": "The primary region for the Azure Landing Zones resources."
+        },
         "root_parent_management_group_id": {
             "type": "string",
             "default": "",
             "required": true,
             "source": "input",
             "maps_to": [ "bootstrap", "starter" ],
             "bicep_alias": "RootParentManagementGroupId",
-            "display_order": 2,
+            "display_order": 3,
             "description": "The identifier of the parent management group for your hierarchy, if left blank will use the tenant id (Tenant Root Group)."
         },
         "subscription_id_connectivity": {
@@ -48,7 +78,7 @@
             "maps_to": [ "bootstrap", "starter" ],
             "bicep_alias": "ConnectivitySubscriptionId",
             "validation": "azure_subscription_id",
-            "display_order": 3,
+            "display_order": 4,
             "description": "The identifier of the Connectivity Subscription."
         },
         "subscription_id_identity" : {
@@ -58,7 +88,7 @@
             "maps_to": [ "bootstrap", "starter" ],
             "bicep_alias": "IdentitySubscriptionId",
             "validation": "azure_subscription_id",
-            "display_order": 4,
+            "display_order": 5,
             "description": "The identifier of the Identity Subscription."
         },
         "subscription_id_management" : {
@@ -68,7 +98,7 @@
             "maps_to": [ "bootstrap", "starter" ],
             "bicep_alias": "ManagementSubscriptionId",
             "validation": "azure_subscription_id",
-            "display_order": 5,
+            "display_order": 6,
             "description": "The identifier of the Management Subscription."
         },
         "configuration_file_path" :{
@@ -79,7 +109,7 @@
             "maps_to": [ "bootstrap", "starter" ],
             "display_map_filter" : [ "starter" ],
             "validation": "configuration_file_path",
-            "display_order": 6,
+            "display_order": 7,
             "description": "The identifier of the Connectivity Subscription."
         }
     }

diff --git a/alz/azuredevops/variables.input.tf b/alz/azuredevops/variables.input.tf
@@ -15,11 +15,6 @@ variable "use_separate_repository_for_templates" {
   default     = true
 }
 
-variable "bootstrap_location" {
-  description = "Azure Deployment location for the bootstrap resources (e.g. storage account, identities, etc)|4|azure_location"
-  type        = string
-}
-
 variable "bootstrap_subscription_id" {
   description = "Azure Subscription ID for the bootstrap resources (e.g. storage account, identities, etc). Leave empty to use the az login subscription|6|azure_subscription_id"
   type        = string

diff --git a/alz/azuredevops/variables.interface.tf b/alz/azuredevops/variables.interface.tf
@@ -52,3 +52,8 @@ variable "on_demand_folder_artifact_name" {
   type        = string
   default     = ""
 }
+
+variable "bootstrap_location" {
+  description = "Azure Deployment location for the bootstrap resources (e.g. storage account, identities, etc)|4|azure_location"
+  type        = string
+}
diff --git a/alz/github/variables.input.tf b/alz/github/variables.input.tf
@@ -15,11 +15,6 @@ variable "use_separate_repository_for_templates" {
   default     = true
 }
 
-variable "bootstrap_location" {
-  description = "Azure Deployment location for the bootstrap resources (e.g. storage account, identities, etc)|4|azure_location"
-  type        = string
-}
-
 variable "bootstrap_subscription_id" {
   description = "Azure Subscription ID for the bootstrap resources (e.g. storage account, identities, etc). Leave empty to use the az login subscription|6|azure_subscription_id"
   type        = string

diff --git a/alz/github/variables.interface.tf b/alz/github/variables.interface.tf
@@ -52,3 +52,8 @@ variable "on_demand_folder_artifact_name" {
   type        = string
   default     = ""
 }
+
+variable "bootstrap_location" {
+  description = "Azure Deployment location for the bootstrap resources (e.g. storage account, identities, etc)|4|azure_location"
+  type        = string
+}
diff --git a/alz/local/variables.input.tf b/alz/local/variables.input.tf
@@ -10,12 +10,6 @@ variable "create_bootstrap_resources_in_azure" {
   default     = true
 }
 
-variable "bootstrap_location" {
-  description = "Azure Deployment location for the bootstrap resources (e.g. storage account, identities, etc)|4|azure_location"
-  type        = string
-  default     = ""
-}
-
 variable "bootstrap_subscription_id" {
   description = "Azure Subscription ID for the bootstrap resources (e.g. storage account, identities, etc). Leave empty to use the az login subscription|6|azure_subscription_id"
   type        = string

diff --git a/alz/local/variables.interface.tf b/alz/local/variables.interface.tf
@@ -40,3 +40,9 @@ variable "starter_module_name" {
   type        = string
   default     = ""
 }
+
+variable "bootstrap_location" {
+  description = "Azure Deployment location for the bootstrap resources (e.g. storage account, identities, etc)|4|azure_location"
+  type        = string
+  default     = ""
+}