From a2c88ce40e9743ed8a9ffed04b559607c1131b63 Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Tue, 14 Oct 2025 10:40:35 +0100 Subject: [PATCH 01/10] remove ac dep --- ibm_catalog.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 2ba2114..e1570cd 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -350,7 +350,7 @@ "name": "deploy-arch-ibm-cos", "description": "Enable this to create an IBM Cloud Object Storage(COS) instance. The buckets to store events will be created by the Activity Tracker Event Routing deployable architecture.", "id": "68921490-2778-4930-ac6d-bae7be6cd958-global", - "version": "v10.2.21", + "version": "v10.4.1", "flavors": [ "instance" ], @@ -377,7 +377,7 @@ "name": "deploy-arch-ibm-kms", "description": "Enable when you want to create your own managed keys to encrypt the buckets. Select only if existing KMS instance or Key is not provided. ", "id": "2cad4789-fa90-4886-9c9e-857081c273ee-global", - "version": "v5.1.27", + "version": "v5.3.6", "flavors": [ "fully-configurable" ], @@ -436,7 +436,7 @@ "name": "deploy-arch-ibm-cloud-monitoring", "description": "Configure IBM Cloud Monitoring to collect the platform metrics.", "id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global", - "version": "v1.7.2", + "version": "v1.8.7", "flavors": [ "fully-configurable" ], From fd28bab52de5c91e95700f57d89584e2fc07a665 Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Tue, 14 Oct 2025 15:37:16 +0100 Subject: [PATCH 02/10] add rg mapping --- ibm_catalog.json | 35 +++++++++++++++++++++++++++++++++++ tests/pr_test.go | 5 +++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index e1570cd..ad52a54 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -169,6 +169,21 @@ } ] }, + { + "key": "resource_group", + "display_name": "resource_group", + "custom_config": { + "type": "resource_group", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "identifier": "rg_name" + } + }, + "default_value": "Default", + "description": "The name of an existing resource group to provision the resources.", + "virtual": true + }, { "key": "enable_activity_tracker_event_routing_to_cloud_logs" }, @@ -362,6 +377,11 @@ "dependency_output": "cos_instance_crn", "version_input": "existing_cos_instance_crn" }, + { + "dependency_input": "resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true + }, { "dependency_input": "prefix", "version_input": "prefix", @@ -402,6 +422,11 @@ "dependency_input": "region", "version_input": "region", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "resource_group", + "reference_version": true } ] }, @@ -429,6 +454,11 @@ { "version_input": "enable_activity_tracker_event_routing_to_cloud_logs", "value": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "resource_group", + "reference_version": true } ] }, @@ -457,6 +487,11 @@ "dependency_input": "region", "version_input": "region", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "resource_group", + "reference_version": true } ] } diff --git a/tests/pr_test.go b/tests/pr_test.go index 3b0c264..9b5617a 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -273,8 +273,9 @@ func TestActivityTrackerDefaultConfiguration(t *testing.T) { "deploy-arch-ibm-activity-tracker", "fully-configurable", map[string]interface{}{ - "prefix": options.Prefix, - "region": validRegions[rand.Intn(len(validRegions))], + "prefix": options.Prefix, + "region": validRegions[rand.Intn(len(validRegions))], + "existing_resource_group": resourceGroup, }, ) From eace99cb3ea501bd2d91758f1155a04a25a3807b Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Fri, 17 Oct 2025 11:23:36 +0100 Subject: [PATCH 03/10] update versions --- ibm_catalog.json | 25 ++++++++++++++----------- tests/pr_test.go | 1 - 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index ad52a54..2cea4b3 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -108,7 +108,10 @@ }, { "key": "prefix", - "required": true, + "default_value": "dev", + "random_string": { + "length": 4 + }, "value_constraints": [ { "type": "regex", @@ -170,7 +173,7 @@ ] }, { - "key": "resource_group", + "key": "existing_resource_group", "display_name": "resource_group", "custom_config": { "type": "resource_group", @@ -365,7 +368,7 @@ "name": "deploy-arch-ibm-cos", "description": "Enable this to create an IBM Cloud Object Storage(COS) instance. The buckets to store events will be created by the Activity Tracker Event Routing deployable architecture.", "id": "68921490-2778-4930-ac6d-bae7be6cd958-global", - "version": "v10.4.1", + "version": "v10.5.0", "flavors": [ "instance" ], @@ -378,7 +381,7 @@ "version_input": "existing_cos_instance_crn" }, { - "dependency_input": "resource_group_name", + "dependency_input": "existing_resource_group_name", "version_input": "existing_resource_group_name", "reference_version": true }, @@ -397,7 +400,7 @@ "name": "deploy-arch-ibm-kms", "description": "Enable when you want to create your own managed keys to encrypt the buckets. Select only if existing KMS instance or Key is not provided. ", "id": "2cad4789-fa90-4886-9c9e-857081c273ee-global", - "version": "v5.3.6", + "version": "v5.4.0", "flavors": [ "fully-configurable" ], @@ -425,7 +428,7 @@ }, { "dependency_input": "existing_resource_group_name", - "version_input": "resource_group", + "version_input": "existing_resource_group_name", "reference_version": true } ] @@ -438,7 +441,7 @@ "fully-configurable" ], "id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global", - "version": "v1.6.28", + "version": "v1.7.0", "optional": true, "on_by_default": true, "input_mapping": [ @@ -457,7 +460,7 @@ }, { "dependency_input": "existing_resource_group_name", - "version_input": "resource_group", + "version_input": "existing_resource_group_name", "reference_version": true } ] @@ -466,7 +469,7 @@ "name": "deploy-arch-ibm-cloud-monitoring", "description": "Configure IBM Cloud Monitoring to collect the platform metrics.", "id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global", - "version": "v1.8.7", + "version": "v1.9.0", "flavors": [ "fully-configurable" ], @@ -490,7 +493,7 @@ }, { "dependency_input": "existing_resource_group_name", - "version_input": "resource_group", + "version_input": "existing_resource_group_name", "reference_version": true } ] @@ -612,4 +615,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/tests/pr_test.go b/tests/pr_test.go index 9b5617a..ca2daff 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -273,7 +273,6 @@ func TestActivityTrackerDefaultConfiguration(t *testing.T) { "deploy-arch-ibm-activity-tracker", "fully-configurable", map[string]interface{}{ - "prefix": options.Prefix, "region": validRegions[rand.Intn(len(validRegions))], "existing_resource_group": resourceGroup, }, From e5f13c0da7da9c7d8f65e5e57ed1ffb91bce28a4 Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Fri, 17 Oct 2025 12:53:31 +0100 Subject: [PATCH 04/10] update cloud logs version --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 2cea4b3..fc44a66 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -441,7 +441,7 @@ "fully-configurable" ], "id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global", - "version": "v1.7.0", + "version": "v1.9.0", "optional": true, "on_by_default": true, "input_mapping": [ From cff6fbde56e9d19fe09d779ca78ffafd44d5f920 Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Fri, 17 Oct 2025 13:03:02 +0100 Subject: [PATCH 05/10] Update ibm_catalog.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Conall Ó Cofaigh --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index fc44a66..63c7a5f 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -184,7 +184,7 @@ } }, "default_value": "Default", - "description": "The name of an existing resource group to provision the resources.", + "description": "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group.", "virtual": true }, { From 0ff80c1e94760c22f1e95c98c7a288209c989aea Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Fri, 17 Oct 2025 13:06:34 +0100 Subject: [PATCH 06/10] filx line end --- .secrets.baseline | 4 ++-- ibm_catalog.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 9e5cca5..3d7f3ca 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "go.sum|^.secrets.baseline$", "lines": null }, - "generated_at": "2025-04-17T11:02:06Z", + "generated_at": "2025-10-17T12:05:48Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -88,7 +88,7 @@ } ] }, - "version": "0.13.1+ibm.62.dss", + "version": "0.13.1+ibm.64.dss", "word_list": { "file": null, "hash": null diff --git a/ibm_catalog.json b/ibm_catalog.json index 63c7a5f..1af98f5 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -615,4 +615,4 @@ ] } ] -} \ No newline at end of file +} From 51d41b39721623f83ccd3e7a7a2ac5f560b0e701 Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Fri, 17 Oct 2025 13:07:12 +0100 Subject: [PATCH 07/10] fix typo --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index f1569c1..650d104 100644 --- a/variables.tf +++ b/variables.tf @@ -42,7 +42,7 @@ variable "eventstreams_targets" { validation { condition = alltrue([for es_target in var.eventstreams_targets : (es_target.service_to_service_enabled == true && es_target.api_key == null) || (es_target.service_to_service_enabled == false && es_target.api_key != null)]) - error_message = "The value of `api_key` should not be provided if 'service_to_service_enabled' is set to tru for event stream targets. If you want to use 'api_key', set 'service_to_service_enabled' to false." + error_message = "The value of `api_key` should not be provided if 'service_to_service_enabled' is set to thru for event stream targets. If you want to use 'api_key', set 'service_to_service_enabled' to false." } } From e54320ac76c3f17aecadf6a38b78a251265fe1d7 Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Fri, 17 Oct 2025 13:10:37 +0100 Subject: [PATCH 08/10] fix type for real ;) --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index 650d104..93b3b38 100644 --- a/variables.tf +++ b/variables.tf @@ -42,7 +42,7 @@ variable "eventstreams_targets" { validation { condition = alltrue([for es_target in var.eventstreams_targets : (es_target.service_to_service_enabled == true && es_target.api_key == null) || (es_target.service_to_service_enabled == false && es_target.api_key != null)]) - error_message = "The value of `api_key` should not be provided if 'service_to_service_enabled' is set to thru for event stream targets. If you want to use 'api_key', set 'service_to_service_enabled' to false." + error_message = "The value of `api_key` should not be provided if 'service_to_service_enabled' is set to true for event stream targets. If you want to use 'api_key', set 'service_to_service_enabled' to false." } } From 12d73d8f89c2c3740275ff88d9ed9d35f06a8733 Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Fri, 17 Oct 2025 13:17:11 +0100 Subject: [PATCH 09/10] update common dev --- common-dev-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-dev-assets b/common-dev-assets index 84e744a..3c754bf 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 84e744a27f774dac276e9381db01b6fe378c0af3 +Subproject commit 3c754bf732e99f95e77014077d2d7ed4b29c55b0 From 57e32e65c8a6f276d05ae818678e30b0d4cbd911 Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Fri, 17 Oct 2025 14:27:59 +0100 Subject: [PATCH 10/10] fix configuration name --- ibm_catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 1af98f5..19b3467 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -173,7 +173,7 @@ ] }, { - "key": "existing_resource_group", + "key": "existing_resource_group_name", "display_name": "resource_group", "custom_config": { "type": "resource_group",