From 0a0a3de92de0f8f2ac5d19ae37987519cdc4646b Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Sun, 19 Oct 2025 15:14:46 +0100 Subject: [PATCH 1/3] test --- solutions/fully-configurable/main.tf | 4 +++- tests/pr_test.go | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index d6f5bb0..3609b44 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -143,10 +143,12 @@ module "kms_instance_crn_parser" { } module "existing_kms_key_crn_parser" { - count = var.kms_encryption_enabled_buckets ? 1 : 0 + # count = var.existing_kms_instance_crn != null ? 1 : 0 + count = var.existing_cos_kms_key_crn != null ? 1 : 0 source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser" version = "1.2.0" crn = local.cos_kms_key_crn + # crn = var.existing_cos_kms_key_crn } module "kms" { diff --git a/tests/pr_test.go b/tests/pr_test.go index ca2daff..a5df244 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -293,3 +293,29 @@ func TestActivityTrackerDefaultConfiguration(t *testing.T) { err := options.RunAddonTest() require.NoError(t, err) } + +func TestDisabledCosRoutePlanOnly(t *testing.T) { + t.Parallel() + + options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{ + Testing: t, + Prefix: "at-dis-cos", + ResourceGroup: resourceGroup, + QuietMode: true, // Suppress logs except on failure + SkipInfrastructureDeployment: true, + }) + + options.AddonConfig = cloudinfo.NewAddonConfigTerraform( + options.Prefix, + "deploy-arch-ibm-activity-tracker", + "fully-configurable", + map[string]interface{}{ + "region": validRegions[rand.Intn(len(validRegions))], + "existing_resource_group": resourceGroup, + "enable_activity_tracker_event_routing_to_cos_bucket": false, + }, + ) + + err := options.RunAddonTest() + require.NoError(t, err) +} From e7c34f850502e10ea6fb1fc4960d47ce4503fc0c Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Sun, 19 Oct 2025 15:21:25 +0100 Subject: [PATCH 2/3] fix: fix bug with CRN parse logic --- solutions/fully-configurable/main.tf | 6 ++---- tests/pr_test.go | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index 3609b44..94a7117 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -143,12 +143,10 @@ module "kms_instance_crn_parser" { } module "existing_kms_key_crn_parser" { - # count = var.existing_kms_instance_crn != null ? 1 : 0 - count = var.existing_cos_kms_key_crn != null ? 1 : 0 + count = var.existing_kms_instance_crn != null ? 1 : 0 source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser" version = "1.2.0" - crn = local.cos_kms_key_crn - # crn = var.existing_cos_kms_key_crn + crn = var.existing_cos_kms_key_crn } module "kms" { diff --git a/tests/pr_test.go b/tests/pr_test.go index a5df244..05c5121 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -298,10 +298,10 @@ func TestDisabledCosRoutePlanOnly(t *testing.T) { t.Parallel() options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{ - Testing: t, - Prefix: "at-dis-cos", - ResourceGroup: resourceGroup, - QuietMode: true, // Suppress logs except on failure + Testing: t, + Prefix: "at-dis-cos", + ResourceGroup: resourceGroup, + QuietMode: true, // Suppress logs except on failure SkipInfrastructureDeployment: true, }) From 11c3a4d529d11afbf5b00c0dd3a7732e97e63568 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Sun, 19 Oct 2025 15:24:35 +0100 Subject: [PATCH 3/3] correct fix --- solutions/fully-configurable/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index 94a7117..24d07c3 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -143,7 +143,7 @@ module "kms_instance_crn_parser" { } module "existing_kms_key_crn_parser" { - count = var.existing_kms_instance_crn != null ? 1 : 0 + count = var.existing_cos_kms_key_crn != null ? 1 : 0 source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser" version = "1.2.0" crn = var.existing_cos_kms_key_crn