Skip to content

Commit c1d980e

Browse files
authored
fix: fix bug with CRN parse logic (#120)
1 parent 37a0d5d commit c1d980e

File tree

2 files changed

+28
-2
lines changed

2 files changed

+28
-2
lines changed

solutions/fully-configurable/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ module "kms_instance_crn_parser" {
143143
}
144144

145145
module "existing_kms_key_crn_parser" {
146-
count = var.kms_encryption_enabled_buckets ? 1 : 0
146+
count = var.existing_cos_kms_key_crn != null ? 1 : 0
147147
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
148148
version = "1.2.0"
149-
crn = local.cos_kms_key_crn
149+
crn = var.existing_cos_kms_key_crn
150150
}
151151

152152
module "kms" {

tests/pr_test.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,3 +293,29 @@ func TestActivityTrackerDefaultConfiguration(t *testing.T) {
293293
err := options.RunAddonTest()
294294
require.NoError(t, err)
295295
}
296+
297+
func TestDisabledCosRoutePlanOnly(t *testing.T) {
298+
t.Parallel()
299+
300+
options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{
301+
Testing: t,
302+
Prefix: "at-dis-cos",
303+
ResourceGroup: resourceGroup,
304+
QuietMode: true, // Suppress logs except on failure
305+
SkipInfrastructureDeployment: true,
306+
})
307+
308+
options.AddonConfig = cloudinfo.NewAddonConfigTerraform(
309+
options.Prefix,
310+
"deploy-arch-ibm-activity-tracker",
311+
"fully-configurable",
312+
map[string]interface{}{
313+
"region": validRegions[rand.Intn(len(validRegions))],
314+
"existing_resource_group": resourceGroup,
315+
"enable_activity_tracker_event_routing_to_cos_bucket": false,
316+
},
317+
)
318+
319+
err := options.RunAddonTest()
320+
require.NoError(t, err)
321+
}

0 commit comments

Comments
 (0)