fix issues and timeouts

Azure · Dec 20, 2024 · 5fd2e97 · 5fd2e97
1 parent 377495a
commit 5fd2e97
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/templates/platform_landing_zone/examples/full-multi-region-nva/hub-and-spoke-vnet.tfvars b/templates/platform_landing_zone/examples/full-multi-region-nva/hub-and-spoke-vnet.tfvars
@@ -333,7 +333,7 @@ hub_and_spoke_vnet_virtual_networks = {
       auto_registration_zone_name    = "$${primary_auto_registration_zone_name}.azure.local"
       subnet_address_prefix          = "$${primary_private_dns_resolver_subnet_address_prefix}"
       private_dns_resolver = {
-        name = "$${primary_dns_resolver_name}"
+        name = "$${primary_private_dns_resolver_name}"
       }
     }
     bastion = {

diff --git a/templates/platform_landing_zone/examples/full-multi-region-nva/virtual-wan.tfvars b/templates/platform_landing_zone/examples/full-multi-region-nva/virtual-wan.tfvars
@@ -305,7 +305,7 @@ virtual_wan_virtual_hubs = {
       auto_registration_zone_name    = "$${primary_auto_registration_zone_name}"
       subnet_address_prefix          = "$${primary_private_dns_resolver_subnet_address_prefix}"
       private_dns_resolver = {
-        name = "$${primary_dns_resolver_name}"
+        name = "$${primary_private_dns_resolver_name}"
       }
     }
     bastion = {

diff --git a/templates/platform_landing_zone/examples/full-multi-region/virtual-wan.tfvars b/templates/platform_landing_zone/examples/full-multi-region/virtual-wan.tfvars
@@ -311,7 +311,7 @@ virtual_wan_virtual_hubs = {
       auto_registration_zone_name    = "$${primary_auto_registration_zone_name}"
       subnet_address_prefix          = "$${primary_private_dns_resolver_subnet_address_prefix}"
       private_dns_resolver = {
-        name = "$${primary_dns_resolver_name}"
+        name = "$${primary_private_dns_resolver_name}"
       }
     }
     bastion = {

diff --git a/templates/platform_landing_zone/examples/full-single-region/virtual-wan.tfvars b/templates/platform_landing_zone/examples/full-single-region/virtual-wan.tfvars
@@ -285,7 +285,7 @@ virtual_wan_virtual_hubs = {
       auto_registration_zone_name    = "$${primary_auto_registration_zone_name}"
       subnet_address_prefix          = "$${primary_private_dns_resolver_subnet_address_prefix}"
       private_dns_resolver = {
-        name = "$${primary_dns_resolver_name}"
+        name = "$${primary_private_dns_resolver_name}"
       }
     }
     bastion = {

diff --git a/templates/platform_landing_zone/modules/management_groups/locals.tf b/templates/platform_landing_zone/modules/management_groups/locals.tf
@@ -14,11 +14,31 @@ locals {
     } }
   } }
   default_retries = {
+    policy_assignments = {
+      error_message_regex = ["AuthorizationFailed", "The policy definition specified in policy assignment '.+' is out of scope"]
+    }
     policy_definitions = {
       error_message_regex = ["AuthorizationFailed"]
     }
     policy_set_definitions = {
       error_message_regex = ["AuthorizationFailed"]
     }
+    policy_role_assignments = {
+      error_message_regex = ["AuthorizationFailed", "ResourceNotFound"]
+    }
+  }
+  default_timeouts = {
+    policy_assignments = {
+      create = "10m"
+    }
+    policy_definitions = {
+      create = "10m"
+    }
+    policy_set_definitions = {
+      create = "10m"
+    }
+    policy_role_assignments = {
+      create = "10m"
+    }
   }
 }
diff --git a/templates/platform_landing_zone/modules/management_groups/main.tf b/templates/platform_landing_zone/modules/management_groups/main.tf
@@ -12,6 +12,6 @@ module "management_groups" {
   partner_id                          = try(var.management_group_settings.partner_id, null)
   retries                             = try(var.management_group_settings.retries, local.default_retries)
   subscription_placement              = try(var.management_group_settings.subscription_placement, {})
-  timeouts                            = try(var.management_group_settings.timeouts, {})
+  timeouts                            = try(var.management_group_settings.timeouts, local.default_timeouts)
   dependencies                        = var.dependencies
 }