Merge pull request #474 from Azure/module.version.5.6.10

Update module to version = "5.6.10"
Azure · Jun 14, 2023 · 79d036f · 79d036f
2 parents ea52207 + 2cd3f56
commit 79d036f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/caf_launchpad/dynamic_secrets.tf b/caf_launchpad/dynamic_secrets.tf
@@ -1,7 +1,7 @@
 
 module "dynamic_keyvault_secrets" {
   source  = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
-  version = "5.6.9"
+  version = "5.6.10"
 
   for_each = try(var.dynamic_keyvault_secrets, {})
 

diff --git a/caf_launchpad/landingzone.tf b/caf_launchpad/landingzone.tf
@@ -1,6 +1,6 @@
 module "launchpad" {
   source  = "aztfmod/caf/azurerm"
-  version = "5.6.9"
+  version = "5.6.10"
 
   providers = {
     azurerm.vhub = azurerm.vhub

diff --git a/caf_launchpad/scenario/200/configuration.tfvars b/caf_launchpad/scenario/200/configuration.tfvars
@@ -92,3 +92,6 @@ resource_groups = {
   }
 }
 
+provider_azurerm_features_resource_group = {
+  prevent_deletion_if_contains_resources = false
+}
diff --git a/caf_solution/add-ons/aks_applications_v2/app/module.tf b/caf_solution/add-ons/aks_applications_v2/app/module.tf
@@ -10,7 +10,7 @@ resource "kubernetes_namespace" "namespaces" {
 
 resource "kubernetes_manifest" "cluster_manifest" {
   for_each = var.manifests
-    manifest = try(yamldecode(each.value.contents), yamldecode(file("$(path.cwd)/each.value.file")), yamldecode(file("$(path.module)/each.value.file")), yamldecode(file(each.value.file)) )
+  manifest = try(yamldecode(each.value.contents), yamldecode(file("$(path.cwd)/each.value.file")), yamldecode(file("$(path.module)/each.value.file")), yamldecode(file(each.value.file)))
 }
 
 # https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release
@@ -26,7 +26,7 @@ resource "helm_release" "charts" {
   timeout          = try(each.value.timeout, 900)
   skip_crds        = try(each.value.skip_crds, false)
   create_namespace = try(each.value.create_namespace, false)
-  values           = try([ yamlencode(each.value.contents) ], [file("$(path.cwd)/each.value.file")], [file("$(path.module)/each.value.file")], [file(each.value.file)], [])
+  values           = try([yamlencode(each.value.contents)], [file("$(path.cwd)/each.value.file")], [file("$(path.module)/each.value.file")], [file(each.value.file)], [])
   version          = try(each.value.version, null)
   atomic           = try(each.value.atomic, false)
   lint             = try(each.value.lint, false)

diff --git a/caf_solution/dynamic_secrets.tf b/caf_solution/dynamic_secrets.tf
@@ -1,6 +1,6 @@
 module "dynamic_keyvault_secrets" {
   source  = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
-  version = "5.6.9"
+  version = "5.6.10"
 
   for_each = {
     for keyvault_key, secrets in try(var.dynamic_keyvault_secrets, {}) : keyvault_key => {

diff --git a/caf_solution/landingzone.tf b/caf_solution/landingzone.tf
@@ -1,6 +1,6 @@
 module "solution" {
   source  = "aztfmod/caf/azurerm"
-  version = "5.6.9"
+  version = "5.6.10"
 
   providers = {
     azurerm.vhub = azurerm.vhub

diff --git a/caf_solution/main.tf b/caf_solution/main.tf
@@ -50,7 +50,7 @@ provider "azurerm" {
       # purge_soft_deleted_keys_on_destroy         = var.provider_azurerm_features_keyvault.purge_soft_deleted_keys_on_destroy
       # purge_soft_deleted_secrets_on_destroy      = var.provider_azurerm_features_keyvault.purge_soft_deleted_secrets_on_destroy
       # recover_soft_deleted_certificates          = var.provider_azurerm_features_keyvault.recover_soft_deleted_certificates
-      recover_soft_deleted_key_vaults            = try(var.provider_azurerm_features_keyvault.recover_soft_deleted_key_vaults, true)
+      recover_soft_deleted_key_vaults = try(var.provider_azurerm_features_keyvault.recover_soft_deleted_key_vaults, true)
       # recover_soft_deleted_keys                  = var.provider_azurerm_features_keyvault.recover_soft_deleted_keys
       # recover_soft_deleted_secrets               = var.provider_azurerm_features_keyvault.recover_soft_deleted_secrets
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,3 +92,6 @@ resource_groups = { @@
       }
     }
+    provider_azurerm_features_resource_group = {
+      prevent_deletion_if_contains_resources = false
+    }