From 2cd3f5655070e26875881c5bd7ac91e41ca0970f Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Wed, 14 Jun 2023 09:57:24 +0000 Subject: [PATCH] Keep that for 5.7.0 --- caf_launchpad/main.tf | 52 +++++++++++++++++++++---------------------- caf_solution/main.tf | 52 +++++++++++++++++++++---------------------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/caf_launchpad/main.tf b/caf_launchpad/main.tf index 487b0b47d..88309e433 100644 --- a/caf_launchpad/main.tf +++ b/caf_launchpad/main.tf @@ -32,43 +32,43 @@ provider "azurerm" { partner_id = "ca4078f8-9bc4-471b-ab5b-3af6b86a42c8" features { api_management { - purge_soft_delete_on_destroy = try(var.provider_azurerm_features_api_management.purge_soft_delete_on_destroy, null) - recover_soft_deleted_api_managements = try(var.provider_azurerm_features_api_management.recover_soft_deleted_api_managements, null) - } - application_insights { - disable_generated_rule = try(var.provider_azurerm_features_application_insights.disable_generated_rule, null) + purge_soft_delete_on_destroy = try(var.provider_azurerm_features_api_management.purge_soft_delete_on_destroy, null) + # recover_soft_deleted_api_managements = var.provider_azurerm_features_api_management.recover_soft_deleted_api_managements } + # application_insights { + # disable_generated_rule = var.provider_azurerm_features_application_insights.disable_generated_rule + # } cognitive_account { - purge_soft_delete_on_destroy = try(var.provider_azurerm_features_cognitive_account.purge_soft_delete_on_destroy, null) + purge_soft_delete_on_destroy = var.provider_azurerm_features_cognitive_account.purge_soft_delete_on_destroy } key_vault { - purge_soft_delete_on_destroy = try(var.provider_azurerm_features_keyvault.purge_soft_delete_on_destroy, null) - purge_soft_deleted_certificates_on_destroy = try(var.provider_azurerm_features_keyvault.purge_soft_deleted_certificates_on_destroy, null) - purge_soft_deleted_keys_on_destroy = try(var.provider_azurerm_features_keyvault.purge_soft_deleted_keys_on_destroy, null) - purge_soft_deleted_secrets_on_destroy = try(var.provider_azurerm_features_keyvault.purge_soft_deleted_secrets_on_destroy, null) - recover_soft_deleted_certificates = try(var.provider_azurerm_features_keyvault.recover_soft_deleted_certificates, null) - recover_soft_deleted_key_vaults = try(var.provider_azurerm_features_keyvault.recover_soft_deleted_key_vaults, null) - recover_soft_deleted_keys = try(var.provider_azurerm_features_keyvault.recover_soft_deleted_keys, null) - recover_soft_deleted_secrets = try(var.provider_azurerm_features_keyvault.recover_soft_deleted_secrets, null) - } - log_analytics_workspace { - permanently_delete_on_destroy = try(var.provider_azurerm_features_log_analytics_workspace.permanently_delete_on_destroy, null) - } + purge_soft_delete_on_destroy = var.provider_azurerm_features_keyvault.purge_soft_delete_on_destroy + # purge_soft_deleted_certificates_on_destroy = var.provider_azurerm_features_keyvault.purge_soft_deleted_certificates_on_destroy + # 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 = var.provider_azurerm_features_keyvault.recover_soft_deleted_key_vaults + # 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 + } + # log_analytics_workspace { + # permanently_delete_on_destroy = var.provider_azurerm_features_log_analytics_workspace.permanently_delete_on_destroy + # } resource_group { - prevent_deletion_if_contains_resources = try(var.provider_azurerm_features_resource_group.prevent_deletion_if_contains_resources, null) + prevent_deletion_if_contains_resources = var.provider_azurerm_features_resource_group.prevent_deletion_if_contains_resources } template_deployment { - delete_nested_items_during_deletion = try(var.provider_azurerm_features_template_deployment.delete_nested_items_during_deletion, null) + delete_nested_items_during_deletion = var.provider_azurerm_features_template_deployment.delete_nested_items_during_deletion } virtual_machine { - delete_os_disk_on_deletion = try(var.provider_azurerm_features_virtual_machine.delete_os_disk_on_deletion, null) - graceful_shutdown = try(var.provider_azurerm_features_virtual_machine.graceful_shutdown, null) - skip_shutdown_and_force_delete = try(var.provider_azurerm_features_virtual_machine.skip_shutdown_and_force_delete, null) + delete_os_disk_on_deletion = var.provider_azurerm_features_virtual_machine.delete_os_disk_on_deletion + graceful_shutdown = var.provider_azurerm_features_virtual_machine.graceful_shutdown + skip_shutdown_and_force_delete = var.provider_azurerm_features_virtual_machine.skip_shutdown_and_force_delete } virtual_machine_scale_set { - force_delete = try(var.provider_azurerm_features_virtual_machine_scale_set.force_delete, null) - roll_instances_when_required = try(var.provider_azurerm_features_virtual_machine_scale_set.roll_instances_when_required, null) - scale_to_zero_before_deletion = try(var.provider_azurerm_features_virtual_machine_scale_set.scale_to_zero_before_deletion, null) + force_delete = var.provider_azurerm_features_virtual_machine_scale_set.force_delete + roll_instances_when_required = var.provider_azurerm_features_virtual_machine_scale_set.roll_instances_when_required + scale_to_zero_before_deletion = var.provider_azurerm_features_virtual_machine_scale_set.scale_to_zero_before_deletion } } } diff --git a/caf_solution/main.tf b/caf_solution/main.tf index 0a4d1cf28..f751d228d 100644 --- a/caf_solution/main.tf +++ b/caf_solution/main.tf @@ -35,43 +35,43 @@ provider "azurerm" { # partner identifier for CAF Terraform landing zones. features { api_management { - purge_soft_delete_on_destroy = try(var.provider_azurerm_features_api_management.purge_soft_delete_on_destroy, null) - recover_soft_deleted_api_managements = try(var.provider_azurerm_features_api_management.recover_soft_deleted_api_managements, null) - } - application_insights { - disable_generated_rule = try(var.provider_azurerm_features_application_insights.disable_generated_rule, null) + purge_soft_delete_on_destroy = try(var.provider_azurerm_features_api_management.purge_soft_delete_on_destroy, null) + # recover_soft_deleted_api_managements = var.provider_azurerm_features_api_management.recover_soft_deleted_api_managements } + # application_insights { + # disable_generated_rule = var.provider_azurerm_features_application_insights.disable_generated_rule + # } cognitive_account { - purge_soft_delete_on_destroy = try(var.provider_azurerm_features_cognitive_account.purge_soft_delete_on_destroy, null) + purge_soft_delete_on_destroy = var.provider_azurerm_features_cognitive_account.purge_soft_delete_on_destroy } key_vault { - purge_soft_delete_on_destroy = try(var.provider_azurerm_features_keyvault.purge_soft_delete_on_destroy, false) - purge_soft_deleted_certificates_on_destroy = try(var.provider_azurerm_features_keyvault.purge_soft_deleted_certificates_on_destroy, null) - purge_soft_deleted_keys_on_destroy = try(var.provider_azurerm_features_keyvault.purge_soft_deleted_keys_on_destroy, null) - purge_soft_deleted_secrets_on_destroy = try(var.provider_azurerm_features_keyvault.purge_soft_deleted_secrets_on_destroy, null) - recover_soft_deleted_certificates = try(var.provider_azurerm_features_keyvault.recover_soft_deleted_certificate, null) - recover_soft_deleted_key_vaults = try(var.provider_azurerm_features_keyvault.recover_soft_deleted_key_vaults, true) - recover_soft_deleted_keys = try(var.provider_azurerm_features_keyvault.recover_soft_deleted_keys, null) - recover_soft_deleted_secrets = try(var.provider_azurerm_features_keyvault.recover_soft_deleted_secrets, null) - } - log_analytics_workspace { - permanently_delete_on_destroy = try(var.provider_azurerm_features_log_analytics_workspace.permanently_delete_on_destroy, null) - } + purge_soft_delete_on_destroy = try(var.provider_azurerm_features_keyvault.purge_soft_delete_on_destroy, false) + # purge_soft_deleted_certificates_on_destroy = var.provider_azurerm_features_keyvault.purge_soft_deleted_certificates_on_destroy + # 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_keys = var.provider_azurerm_features_keyvault.recover_soft_deleted_keys + # recover_soft_deleted_secrets = var.provider_azurerm_features_keyvault.recover_soft_deleted_secrets + } + # log_analytics_workspace { + # permanently_delete_on_destroy = var.provider_azurerm_features_log_analytics_workspace.permanently_delete_on_destroy + # } resource_group { - prevent_deletion_if_contains_resources = try(var.provider_azurerm_features_resource_group.prevent_deletion_if_contains_resources, null) + prevent_deletion_if_contains_resources = var.provider_azurerm_features_resource_group.prevent_deletion_if_contains_resources } template_deployment { - delete_nested_items_during_deletion = try(var.provider_azurerm_features_template_deployment.delete_nested_items_during_deletion, null) + delete_nested_items_during_deletion = var.provider_azurerm_features_template_deployment.delete_nested_items_during_deletion } virtual_machine { - delete_os_disk_on_deletion = try(var.provider_azurerm_features_virtual_machine.delete_os_disk_on_deletion, null) - graceful_shutdown = try(var.provider_azurerm_features_virtual_machine.graceful_shutdown, null) - skip_shutdown_and_force_delete = try(var.provider_azurerm_features_virtual_machine.skip_shutdown_and_force_delete, null) + delete_os_disk_on_deletion = var.provider_azurerm_features_virtual_machine.delete_os_disk_on_deletion + graceful_shutdown = var.provider_azurerm_features_virtual_machine.graceful_shutdown + skip_shutdown_and_force_delete = var.provider_azurerm_features_virtual_machine.skip_shutdown_and_force_delete } virtual_machine_scale_set { - force_delete = try(var.provider_azurerm_features_virtual_machine_scale_set.force_delete, null) - roll_instances_when_required = try(var.provider_azurerm_features_virtual_machine_scale_set.roll_instances_when_required, null) - scale_to_zero_before_deletion = try(var.provider_azurerm_features_virtual_machine_scale_set.scale_to_zero_before_deletion, null) + force_delete = var.provider_azurerm_features_virtual_machine_scale_set.force_delete + roll_instances_when_required = var.provider_azurerm_features_virtual_machine_scale_set.roll_instances_when_required + scale_to_zero_before_deletion = var.provider_azurerm_features_virtual_machine_scale_set.scale_to_zero_before_deletion } } }