Merge pull request #121 from Azure/2012.1.0

Update 2012.1.0
Azure · Dec 17, 2020 · 2d3c046 · 2d3c046
2 parents 79fea67 + e262e52
commit 2d3c046
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 63 deletions.
diff --git a/landingzones/caf_foundations/dynamic_secrets.tf b/landingzones/caf_foundations/dynamic_secrets.tf
@@ -1,11 +1,11 @@
 
 module dynamic_keyvault_secrets {
   source  = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
-  version = "0.4.20"
+  version = "~>4.21"
 
   for_each = try(var.dynamic_keyvault_secrets, {})
 
-  settings    = each.value
-  keyvault_id = module.foundations.keyvaults[each.key].id
-  objects     = module.foundations
+  settings = each.value
+  keyvault = module.foundations.keyvaults[each.key]
+  objects  = module.foundations
 }
diff --git a/landingzones/caf_foundations/landingzone.tf b/landingzones/caf_foundations/landingzone.tf
@@ -1,6 +1,6 @@
 module "foundations" {
   source  = "aztfmod/caf/azurerm"
-  version = "0.4.20"
+  version = "~>4.21"
 
   current_landingzone_key     = var.landingzone.key
   tenant_id                   = var.tenant_id

diff --git a/landingzones/caf_foundations/locals.remote_tfstates.tf b/landingzones/caf_foundations/locals.remote_tfstates.tf
@@ -39,12 +39,12 @@ locals {
   remote = {
     diagnostics = {
       # Get the diagnostics settings of services to create
-      diagnostic_event_hub_namespaces     = var.diagnostic_event_hub_namespaces
-      diagnostic_log_analytics            = var.diagnostic_log_analytics
-      diagnostic_storage_accounts         = var.diagnostic_storage_accounts
-      
+      diagnostic_event_hub_namespaces = var.diagnostic_event_hub_namespaces
+      diagnostic_log_analytics        = var.diagnostic_log_analytics
+      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(data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.diagnostics.diagnostics_definition, 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, {}),
@@ -60,11 +60,11 @@ locals {
         )
       }
       # 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     = 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
     }
-    
+
     managed_identities = {
       for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.managed_identities[key], {}))
     }

diff --git a/landingzones/caf_launchpad/add-ons/azure_devops/solution.tf b/landingzones/caf_launchpad/add-ons/azure_devops/solution.tf
@@ -1,6 +1,6 @@
 module "caf" {
   source  = "aztfmod/caf/azurerm"
-  version = "0.4.20"
+  version = "~>4.21"
 
   current_landingzone_key               = var.landingzone.key
   tenant_id                             = var.tenant_id

diff --git a/landingzones/caf_launchpad/add-ons/azure_devops_agent/dynamic_secrets.tf b/landingzones/caf_launchpad/add-ons/azure_devops_agent/dynamic_secrets.tf
@@ -1,9 +1,11 @@
 
 module dynamic_keyvault_secrets {
-  source   = "./dynamic_keyvault_secrets"
+  source  = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
+  version = "~>4.21"
+
   for_each = try(var.dynamic_keyvault_secrets, {})
 
-  settings    = each.value
-  keyvault_id = module.caf.keyvaults[each.key].id
-  objects     = module.caf
+  settings = each.value
+  keyvault = module.caf.keyvaults[each.key]
+  objects  = module.caf
 }
diff --git a/landingzones/caf_launchpad/add-ons/azure_devops_agent/solution.tf b/landingzones/caf_launchpad/add-ons/azure_devops_agent/solution.tf
@@ -1,6 +1,6 @@
 module "caf" {
   source  = "aztfmod/caf/azurerm"
-  version = "0.4.20"
+  version = "~>4.21"
 
   current_landingzone_key     = var.landingzone.key
   tenant_id                   = var.tenant_id

diff --git a/landingzones/caf_launchpad/dynamic_secrets.tf b/landingzones/caf_launchpad/dynamic_secrets.tf
@@ -1,11 +1,11 @@
 
 module dynamic_keyvault_secrets {
   source  = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
-  version = "0.4.20"
-  
+  version = "~>4.21"
+
   for_each = try(var.dynamic_keyvault_secrets, {})
 
-  settings    = each.value
-  keyvault_id = module.launchpad.keyvaults[each.key].id
-  objects     = module.launchpad
+  settings = each.value
+  keyvault = module.launchpad.keyvaults[each.key]
+  objects  = module.launchpad
 }
diff --git a/landingzones/caf_launchpad/landingzone.tf b/landingzones/caf_launchpad/landingzone.tf
@@ -1,22 +1,22 @@
 module "launchpad" {
   source  = "aztfmod/caf/azurerm"
-  version = "0.4.20"
+  version = "~>4.21"
 
-  current_landingzone_key               = var.landingzone.key
-  tenant_id                             = var.tenant_id
-  tags                                  = local.tags
-  global_settings                       = local.global_settings
-  enable                                = var.enable
-  logged_user_objectId                  = var.logged_user_objectId
-  logged_aad_app_objectId               = var.logged_aad_app_objectId
-  user_type                             = var.user_type
-  log_analytics                         = var.log_analytics
+  current_landingzone_key = var.landingzone.key
+  tenant_id               = var.tenant_id
+  tags                    = local.tags
+  global_settings         = local.global_settings
+  enable                  = var.enable
+  logged_user_objectId    = var.logged_user_objectId
+  logged_aad_app_objectId = var.logged_aad_app_objectId
+  user_type               = var.user_type
+  log_analytics           = var.log_analytics
   diagnostics = {
-    diagnostics_definition              = var.diagnostics_definition
-    diagnostics_destinations            = var.diagnostics_destinations
-    diagnostic_event_hub_namespaces     = var.diagnostic_event_hub_namespaces
-    diagnostic_log_analytics            = var.diagnostic_log_analytics
-    diagnostic_storage_accounts         = var.diagnostic_storage_accounts
+    diagnostics_definition          = var.diagnostics_definition
+    diagnostics_destinations        = var.diagnostics_destinations
+    diagnostic_event_hub_namespaces = var.diagnostic_event_hub_namespaces
+    diagnostic_log_analytics        = var.diagnostic_log_analytics
+    diagnostic_storage_accounts     = var.diagnostic_storage_accounts
   }
   event_hub_namespaces                  = var.event_hub_namespaces
   resource_groups                       = var.resource_groups
@@ -35,14 +35,14 @@ module "launchpad" {
     azurerm_routes                    = var.azurerm_routes
     route_tables                      = var.route_tables
   }
-  storage_accounts            = var.storage_accounts
+  storage_accounts = var.storage_accounts
   # diagnostic_storage_accounts = var.diagnostic_storage_accounts
-  azuread_apps                = var.azuread_apps
-  azuread_api_permissions     = var.azuread_api_permissions
-  azuread_groups              = var.azuread_groups
-  azuread_roles               = var.azuread_roles
-  azuread_users               = var.azuread_users
-  managed_identities          = var.managed_identities
-  custom_role_definitions     = var.custom_role_definitions
-  role_mapping                = var.role_mapping
+  azuread_apps            = var.azuread_apps
+  azuread_api_permissions = var.azuread_api_permissions
+  azuread_groups          = var.azuread_groups
+  azuread_roles           = var.azuread_roles
+  azuread_users           = var.azuread_users
+  managed_identities      = var.managed_identities
+  custom_role_definitions = var.custom_role_definitions
+  role_mapping            = var.role_mapping
 }
diff --git a/landingzones/caf_networking/landingzone.tf b/landingzones/caf_networking/landingzone.tf
@@ -1,6 +1,6 @@
 module "networking" {
   source  = "aztfmod/caf/azurerm"
-  version = "0.4.20"
+  version = "~>4.21"
 
   current_landingzone_key  = var.landingzone.key
   tags                     = local.tags

diff --git a/landingzones/caf_shared_services/landingzone.tf b/landingzones/caf_shared_services/landingzone.tf
@@ -1,16 +1,16 @@
 module "landingzones_shared_services" {
   source  = "aztfmod/caf/azurerm"
-  version = "0.4.20"
+  version = "~>4.21"
 
-  current_landingzone_key     = var.landingzone.key
-  tenant_id                   = var.tenant_id
-  tags                        = local.tags
-  diagnostics                 = local.diagnostics
-  global_settings             = local.global_settings
-  tfstates                    = local.tfstates
-  logged_user_objectId        = var.logged_user_objectId
-  logged_aad_app_objectId     = var.logged_aad_app_objectId
-  resource_groups             = var.resource_groups
+  current_landingzone_key = var.landingzone.key
+  tenant_id               = var.tenant_id
+  tags                    = local.tags
+  diagnostics             = local.diagnostics
+  global_settings         = local.global_settings
+  tfstates                = local.tfstates
+  logged_user_objectId    = var.logged_user_objectId
+  logged_aad_app_objectId = var.logged_aad_app_objectId
+  resource_groups         = var.resource_groups
 
   shared_services = {
     recovery_vaults = var.recovery_vaults

diff --git a/landingzones/caf_shared_services/vm_extensions.tf b/landingzones/caf_shared_services/vm_extensions.tf
@@ -5,7 +5,7 @@
 
 module "vm_extension_monitoring_agent" {
   source  = "aztfmod/caf/azurerm//modules/compute/virtual_machine_extensions"
-  version = "0.4.20"
+  version = "~>4.21"
 
   for_each = {
     for key, value in try(var.virtual_machines, {}) : key => value
@@ -22,8 +22,8 @@ module "vm_extension_monitoring_agent" {
 }
 
 module "vm_extension_diagnostics" {
-  source     = "aztfmod/caf/azurerm//modules/compute/virtual_machine_extensions"
-  version    = "0.4.20"
+  source  = "aztfmod/caf/azurerm//modules/compute/virtual_machine_extensions"
+  version = "~>4.21"
 
   for_each = {
     for key, value in try(var.virtual_machines, {}) : key => value