Merge branch 'master' into 2106-UpdateExtensions

caf_solution/add-ons/helm-charts/local.remote_tfstates.tf

@@ -31,8 +31,15 @@ locals {
     "landingzone" = var.landingzone.key
   }
 
-  global_settings = data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].global_settings
-  diagnostics     = data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].diagnostics
+  global_settings = merge(
+    try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].global_settings, null),
+    try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.global_settings, null)
+  )
+
+  diagnostics = merge(
+    try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].diagnostics, null),
+    try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics, null)
+  )
 
   remote = {
     tags            = merge(local.global_settings.tags, local.landingzone_tag, { "level" = var.landingzone.level }, { "environment" = local.global_settings.environment }, { "rover_version" = var.rover_version }, var.tags)

caf_solution/local.networking.tf

@@ -37,6 +37,7 @@ locals {
       virtual_network_gateway_connections                     = var.virtual_network_gateway_connections
       virtual_network_gateways                                = var.virtual_network_gateways
       virtual_wans                                            = var.virtual_wans
+      virtual_hubs                                            = var.virtual_hubs
       vnet_peerings                                           = var.vnet_peerings
       vnets                                                   = var.vnets
     }

caf_solution/local.remote.tf

@@ -4,7 +4,7 @@ locals {
       for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].azuread_apps, {}))
     }
     azuread_groups = merge(
-      tomap({"launchpad" = try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.launchpad_identities["launchpad"].azuread_groups, {})}),
+      tomap({ "launchpad" = try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.launchpad_identities["launchpad"].azuread_groups, {}) }),
       {
         for key, value in try(var.landingzone.tfstates, {}) : key => merge(
           try(data.terraform_remote_state.remote[key].outputs.objects[key].azuread_groups, {})
@@ -90,13 +90,13 @@ locals {
       for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].machine_learning_workspaces, {}))
     }
     managed_identities = merge(
-      tomap({"launchpad" = try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.launchpad_identities["launchpad"].managed_identities, {})}),
+      tomap({ "launchpad" = try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.launchpad_identities["launchpad"].managed_identities, {}) }),
       {
         for key, value in try(var.landingzone.tfstates, {}) : key => merge(
           try(data.terraform_remote_state.remote[key].outputs.objects[key].managed_identities, {})
         )
       }
-    )    
+    )
     mssql_databases = {
       for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].mssql_databases, {}))
     }
@@ -151,6 +151,9 @@ locals {
     virtual_hub_route_tables = {
       for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].virtual_hub_route_table, {}))
     }
+    virtual_hubs = {
+      for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].virtual_hubs, {}))
+    }
     virtual_wans = {
       for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].virtual_wans, {}))
     }

caf_solution/locals.remote_tfstates.tf

@@ -31,12 +31,12 @@ locals {
     "landingzone" = var.landingzone.key
   }
 
-  tags            = merge(try(local.global_settings.tags, {}), local.landingzone_tag, { "level" = var.landingzone.level }, try({ "environment" = local.global_settings.environment }, {}), { "rover_version" = var.rover_version }, var.tags)
+  tags = merge(try(local.global_settings.tags, {}), local.landingzone_tag, { "level" = var.landingzone.level }, try({ "environment" = local.global_settings.environment }, {}), { "rover_version" = var.rover_version }, var.tags)
   global_settings = merge(
-    data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].global_settings, 
-    data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.global_settings, 
+    try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].global_settings, null),
+    try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.global_settings, null),
     var.global_settings
-    )
+  )
 
 
   diagnostics = {
@@ -46,25 +46,42 @@ locals {
     diagnostic_storage_accounts     = var.diagnostic_storage_accounts
 
     # Combine the diagnostics definitions
-    diagnostics_definition = merge(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics.diagnostics_definition, var.diagnostics_definition)
+    diagnostics_definition = merge(
+      try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics.diagnostics_definition, null),
+      try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].diagnostics.diagnostics_definition, null),
+      var.diagnostics_definition
+    )
     diagnostics_destinations = {
       event_hub_namespaces = merge(
         try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics.diagnostics_destinations.event_hub_namespaces, {}),
+        try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].diagnostics.diagnostics_destinations.event_hub_namespaces, null),
         try(var.diagnostics_destinations.event_hub_namespaces, {})
       )
       log_analytics = merge(
         try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics.diagnostics_destinations.log_analytics, {}),
+        try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].diagnostics.diagnostics_destinations.log_analytics, null),
         try(var.diagnostics_destinations.log_analytics, {})
       )
       storage = merge(
         try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics.diagnostics_destinations.storage, {}),
+        try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].diagnostics.diagnostics_destinations.storage, null),
         try(var.diagnostics_destinations.storage, {})
       )
     }
     # Get the remote existing diagnostics objects
-    storage_accounts     = data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics.storage_accounts
-    log_analytics        = data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics.log_analytics
-    event_hub_namespaces = data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics.event_hub_namespaces
+    storage_accounts = coalesce(
+      try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics.storage_accounts, null),
+      try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].diagnostics.storage_accounts, null)
+    )
+
+    log_analytics = coalesce(
+      try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics.log_analytics, null),
+      try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].diagnostics.log_analytics, null)
+    )
+    event_hub_namespaces = coalesce(
+      try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics.event_hub_namespaces, null),
+      try(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.objects[var.landingzone.global_settings_key].diagnostics.event_hub_namespaces, null)
+    )
   }
 
 }

caf_solution/output.tf

@@ -11,12 +11,12 @@ output "objects" {
 }
 
 output "global_settings" {
-  value = local.global_settings
+  value     = local.global_settings
   sensitive = true
 }
 
 output "diagnostics" {
-  value = module.solution.diagnostics
+  value     = module.solution.diagnostics
   sensitive = true
 }
 

caf_solution/variables.networking.tf

@@ -96,6 +96,9 @@ variable "virtual_network_gateways" {
 variable "virtual_wans" {
   default = {}
 }
+variable "virtual_hubs" {
+  default = {}
+}
 variable "vnets" {
   default = {}
 }

caf_solution/vm_extensions.tf

@@ -15,8 +15,8 @@ module "vm_extension_monitoring_agent" {
     if try(value.virtual_machine_extensions.microsoft_enterprise_cloud_monitoring, null) != null
   }
 
-  client_config      = module.solution.client_config                 
-  virtual_machine_id = module.solution.virtual_machines[each.key].id 
+  client_config      = module.solution.client_config
+  virtual_machine_id = module.solution.virtual_machines[each.key].id
   extension          = each.value.virtual_machine_extensions.microsoft_enterprise_cloud_monitoring
   extension_name     = "microsoft_enterprise_cloud_monitoring"
   settings = {
@@ -37,8 +37,8 @@ module "vm_extension_diagnostics" {
     if try(value.virtual_machine_extensions.microsoft_azure_diagnostics, null) != null
   }
 
-  client_config      = module.solution.client_config                 
-  virtual_machine_id = module.solution.virtual_machines[each.key].id 
+  client_config      = module.solution.client_config
+  virtual_machine_id = module.solution.virtual_machines[each.key].id
   extension          = each.value.virtual_machine_extensions.microsoft_azure_diagnostics
   extension_name     = "microsoft_azure_diagnostics"
   settings = {