From 1be2986e4094312f5ea199af8e612b7704cedcaa Mon Sep 17 00:00:00 2001 From: shemau Date: Tue, 22 Oct 2024 16:11:09 +0100 Subject: [PATCH 1/2] fix(deps): bump KMS with code change --- examples/complete/main.tf | 2 +- solutions/standard/main.tf | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index f18894b4..1d673f0d 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -16,7 +16,7 @@ module "resource_group" { module "key_protect_all_inclusive" { source = "terraform-ibm-modules/kms-all-inclusive/ibm" - version = "4.15.13" + version = "4.16.4" resource_group_id = module.resource_group.resource_group_id # Note: Database instance and Key Protect must be created in the same region when using BYOK # See https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect&interface=ui#key-byok diff --git a/solutions/standard/main.tf b/solutions/standard/main.tf index 73858844..5350b95d 100644 --- a/solutions/standard/main.tf +++ b/solutions/standard/main.tf @@ -61,7 +61,7 @@ module "kms" { } count = var.existing_kms_key_crn != null ? 0 : 1 # no need to create any KMS resources if passing an existing key source = "terraform-ibm-modules/kms-all-inclusive/ibm" - version = "4.15.13" + version = "4.16.4" create_key_protect_instance = false region = local.existing_kms_instance_region existing_kms_instance_crn = var.existing_kms_instance_crn @@ -69,9 +69,8 @@ module "kms" { key_endpoint_type = var.kms_endpoint_type keys = [ { - key_ring_name = local.key_ring_name - existing_key_ring = false - force_delete_key_ring = true + key_ring_name = local.key_ring_name + existing_key_ring = false keys = [ { key_name = local.key_name From fb92b2d51d7f708091ac1bf6a2ce266de9ef6025 Mon Sep 17 00:00:00 2001 From: shemau Date: Thu, 7 Nov 2024 11:39:11 +0000 Subject: [PATCH 2/2] SKIP UPGRADE TEST