From b83081d81ecede694fa1bba17c26115f887d1367 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Fri, 10 Oct 2025 15:00:03 +0100 Subject: [PATCH 01/15] chore: update member version --- kubernetes/stack_definition.json | 10 +++++----- stack_definition.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index 33e392a..dc14a0c 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -460,7 +460,7 @@ } ], "name": "1 - Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3820c511-3ea2-43b9-8945-5eb7772001b6-global" }, { "inputs": [ @@ -482,7 +482,7 @@ } ], "name": "2 - Cloud Object Storage", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.30851389-2ab5-4be5-8674-7ef756cb372d-global" }, { "inputs": [ @@ -508,7 +508,7 @@ } ], "name": "3 - Cloud Object Bucket", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.993946ad-43d0-4774-929c-22954b20af95-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1a34d3eb-f57d-4246-a147-75699f395ca4-global" }, { "inputs": [ @@ -546,7 +546,7 @@ } ], "name": "4 - Event Notifications", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88d7308d-c2c8-4977-92cf-f85d99e27d00-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fa8ebdf4-db44-4e25-9846-9278b516cd73-global" }, { "inputs": [ @@ -584,7 +584,7 @@ } ], "name": "5 - Secrets Manager", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3d0da0a9-0327-44fc-8796-edf8e0017e25-global" }, { "name": "6 - DevSecOps Toolchains", diff --git a/stack_definition.json b/stack_definition.json index 84a95a4..086cf5c 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -421,7 +421,7 @@ } ], "name": "1 - Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3820c511-3ea2-43b9-8945-5eb7772001b6-global" }, { "inputs": [ @@ -443,7 +443,7 @@ } ], "name": "2 - Cloud Object Storage", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.30851389-2ab5-4be5-8674-7ef756cb372d-global" }, { "inputs": [ @@ -469,7 +469,7 @@ } ], "name": "3 - Cloud Object Bucket", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.993946ad-43d0-4774-929c-22954b20af95-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1a34d3eb-f57d-4246-a147-75699f395ca4-global" }, { "inputs": [ @@ -507,7 +507,7 @@ } ], "name": "4 - Event Notifications", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88d7308d-c2c8-4977-92cf-f85d99e27d00-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fa8ebdf4-db44-4e25-9846-9278b516cd73-global" }, { "inputs": [ @@ -545,7 +545,7 @@ } ], "name": "5 - Secrets Manager", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3d0da0a9-0327-44fc-8796-edf8e0017e25-global" }, { "name": "6 - DevSecOps Toolchains", From 636abd9395c952bd0fc1c84703de99ddb7ed2832 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Fri, 10 Oct 2025 16:10:57 +0100 Subject: [PATCH 02/15] chore: update members --- kubernetes/stack_definition.json | 12 ++++++++++-- stack_definition.json | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index dc14a0c..3c5b194 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -495,8 +495,12 @@ "value" : true }, { - "name": "existing_cos_instance_id", - "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" + "name": "prefix", + "value": "ref:../../inputs/prefix" + }, + { + "name": "existing_cos_instance_crn", + "value": "ref:../../members/2 - Cloud Object Storaget/outputs/cos_instance_id" }, { "name": "existing_kms_instance_crn", @@ -520,6 +524,10 @@ "name": "kms_endpoint_url", "value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint" }, + { + "name": "prefix", + "value": "ref:../../inputs/prefix" + }, { "name": "skip_cos_kms_auth_policy", "value": true diff --git a/stack_definition.json b/stack_definition.json index 086cf5c..889dd6e 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -456,8 +456,12 @@ "value": true }, { - "name": "existing_cos_instance_id", - "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" + "name": "prefix", + "value": "ref:../../inputs/prefix" + }, + { + "name": "existing_cos_instance_crn", + "value": "ref:../../members/2 - Cloud Object Storaget/outputs/cos_instance_id" }, { "name": "existing_kms_instance_crn", @@ -481,6 +485,10 @@ "name": "kms_endpoint_url", "value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint" }, + { + "name": "prefix", + "value": "ref:../../inputs/prefix" + }, { "name": "skip_cos_kms_auth_policy", "value": true From e32722e13f5c42ca34aac439cf6792475cc3def5 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Fri, 10 Oct 2025 17:35:08 +0100 Subject: [PATCH 03/15] chore: update members --- kubernetes/stack_definition.json | 6 +++++- stack_definition.json | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index 3c5b194..ecba0fa 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -500,12 +500,16 @@ }, { "name": "existing_cos_instance_crn", - "value": "ref:../../members/2 - Cloud Object Storaget/outputs/cos_instance_id" + "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, { "name": "existing_kms_instance_crn", "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" }, + { + "name": "kms_encryption_enabled", + "value": true + }, { "name": "skip_iam_authorization_policy", "value": false diff --git a/stack_definition.json b/stack_definition.json index 889dd6e..ee40f40 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -461,12 +461,16 @@ }, { "name": "existing_cos_instance_crn", - "value": "ref:../../members/2 - Cloud Object Storaget/outputs/cos_instance_id" + "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, { "name": "existing_kms_instance_crn", "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" }, + { + "name": "kms_encryption_enabled", + "value": true + }, { "name": "skip_iam_authorization_policy", "value": false From 1ce53856d6e1bd7f8cbd5dfaa724f1fce4d4a7c1 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Fri, 10 Oct 2025 18:30:38 +0100 Subject: [PATCH 04/15] chore: update member details --- kubernetes/stack_definition.json | 2 +- stack_definition.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index ecba0fa..3226deb 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -522,7 +522,7 @@ "inputs": [ { "name": "existing_cos_instance_crn", - "value": "ref:../../members/3 - Cloud Object Bucket/outputs/cos_instance_id" + "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, { "name": "kms_endpoint_url", diff --git a/stack_definition.json b/stack_definition.json index ee40f40..796118b 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -483,7 +483,7 @@ "inputs": [ { "name": "existing_cos_instance_crn", - "value": "ref:../../members/3 - Cloud Object Bucket/outputs/cos_instance_id" + "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, { "name": "kms_endpoint_url", From 96227a22f31f58b2ae250e299b55055f5fd45421 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Fri, 10 Oct 2025 19:09:14 +0100 Subject: [PATCH 05/15] chore: update member --- kubernetes/stack_definition.json | 22 +++++++++------------- stack_definition.json | 22 +++++++++------------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index 3226deb..bb9087f 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -506,10 +506,6 @@ "name": "existing_kms_instance_crn", "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" }, - { - "name": "kms_encryption_enabled", - "value": true - }, { "name": "skip_iam_authorization_policy", "value": false @@ -524,6 +520,14 @@ "name": "existing_cos_instance_crn", "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, + { + "name": "enable_collecting_failed_events", + "value": true + }, + { + "name": "kms_encryption_enabled", + "value": true + }, { "name": "kms_endpoint_url", "value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint" @@ -532,10 +536,6 @@ "name": "prefix", "value": "ref:../../inputs/prefix" }, - { - "name": "skip_cos_kms_auth_policy", - "value": true - }, { "name": "existing_kms_instance_crn", "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" @@ -545,13 +545,9 @@ "value": "private" }, { - "name": "resource_group_name", + "name": "existing_resource_group_name", "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, - { - "name": "use_existing_resource_group", - "value": true - }, { "name": "region", "value": "ref:../../inputs/en_region" diff --git a/stack_definition.json b/stack_definition.json index 796118b..50c3244 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -467,10 +467,6 @@ "name": "existing_kms_instance_crn", "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" }, - { - "name": "kms_encryption_enabled", - "value": true - }, { "name": "skip_iam_authorization_policy", "value": false @@ -485,6 +481,14 @@ "name": "existing_cos_instance_crn", "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, + { + "name": "enable_collecting_failed_events", + "value": true + }, + { + "name": "kms_encryption_enabled", + "value": true + }, { "name": "kms_endpoint_url", "value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint" @@ -493,10 +497,6 @@ "name": "prefix", "value": "ref:../../inputs/prefix" }, - { - "name": "skip_cos_kms_auth_policy", - "value": true - }, { "name": "existing_kms_instance_crn", "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" @@ -506,13 +506,9 @@ "value": "private" }, { - "name": "resource_group_name", + "name": "existing_resource_group_name", "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, - { - "name": "use_existing_resource_group", - "value": true - }, { "name": "region", "value": "ref:../../inputs/en_region" From e77c07df158fb47bf6459d0e8ee6881a36726cf6 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Fri, 10 Oct 2025 19:54:35 +0100 Subject: [PATCH 06/15] chore: update member setting --- kubernetes/stack_definition.json | 4 ++++ stack_definition.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index bb9087f..f06d208 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -494,6 +494,10 @@ "name" : "add_bucket_name_suffix", "value" : true }, + { + "name" : "kms_encryption_enabled", + "value" : true + }, { "name": "prefix", "value": "ref:../../inputs/prefix" diff --git a/stack_definition.json b/stack_definition.json index 50c3244..5b3f2c0 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -455,6 +455,10 @@ "name": "add_bucket_name_suffix", "value": true }, + { + "name" : "kms_encryption_enabled", + "value" : true + }, { "name": "prefix", "value": "ref:../../inputs/prefix" From c8371a22d7f8c22ac8ff3397603a95be4dc9e816 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Sat, 11 Oct 2025 00:31:25 +0100 Subject: [PATCH 07/15] chore: update member details --- kubernetes/stack_definition.json | 14 +++----------- stack_definition.json | 16 ++++------------ 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index f06d208..f67817a 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -473,7 +473,7 @@ "value": true }, { - "name": "cos_instance_name", + "name": "instance_name", "value": "evidence" }, { @@ -495,15 +495,7 @@ "value" : true }, { - "name" : "kms_encryption_enabled", - "value" : true - }, - { - "name": "prefix", - "value": "ref:../../inputs/prefix" - }, - { - "name": "existing_cos_instance_crn", + "name": "existing_cos_instance_id", "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, { @@ -516,7 +508,7 @@ } ], "name": "3 - Cloud Object Bucket", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1a34d3eb-f57d-4246-a147-75699f395ca4-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.993946ad-43d0-4774-929c-22954b20af95-global" }, { "inputs": [ diff --git a/stack_definition.json b/stack_definition.json index 5b3f2c0..6014bbd 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -434,7 +434,7 @@ "value": true }, { - "name": "cos_instance_name", + "name": "instance_name", "value": "evidence" }, { @@ -445,7 +445,7 @@ "name": "2 - Cloud Object Storage", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.30851389-2ab5-4be5-8674-7ef756cb372d-global" }, - { + { "inputs": [ { "name": "bucket_name", @@ -456,15 +456,7 @@ "value": true }, { - "name" : "kms_encryption_enabled", - "value" : true - }, - { - "name": "prefix", - "value": "ref:../../inputs/prefix" - }, - { - "name": "existing_cos_instance_crn", + "name": "existing_cos_instance_id", "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, { @@ -477,7 +469,7 @@ } ], "name": "3 - Cloud Object Bucket", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1a34d3eb-f57d-4246-a147-75699f395ca4-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.993946ad-43d0-4774-929c-22954b20af95-global" }, { "inputs": [ From 828bd22f16da82034a41d187df8cd580aa7d03a5 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Sat, 11 Oct 2025 22:15:46 +0100 Subject: [PATCH 08/15] chore: update members --- kubernetes/stack_definition.json | 4 ++-- stack_definition.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index f67817a..6cec6b1 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -460,7 +460,7 @@ } ], "name": "1 - Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3820c511-3ea2-43b9-8945-5eb7772001b6-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global" }, { "inputs": [ @@ -555,7 +555,7 @@ { "inputs": [ { - "name": "resource_group_name", + "name": "existing_resource_group_name", "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { diff --git a/stack_definition.json b/stack_definition.json index 6014bbd..27229e7 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -421,7 +421,7 @@ } ], "name": "1 - Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3820c511-3ea2-43b9-8945-5eb7772001b6-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global" }, { "inputs": [ @@ -516,7 +516,7 @@ { "inputs": [ { - "name": "resource_group_name", + "name": "existing_resource_group_name", "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { From c47b5188830d7b7572c3b4109861033985f24f2f Mon Sep 17 00:00:00 2001 From: huayuenh Date: Sat, 11 Oct 2025 23:03:15 +0100 Subject: [PATCH 09/15] chore: member update --- kubernetes/stack_definition.json | 6 +----- stack_definition.json | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index 6cec6b1..706efc0 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -465,13 +465,9 @@ { "inputs": [ { - "name": "resource_group_name", + "name": "existing_resource_group_name", "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, - { - "name": "use_existing_resource_group", - "value": true - }, { "name": "instance_name", "value": "evidence" diff --git a/stack_definition.json b/stack_definition.json index 27229e7..709acf1 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -426,13 +426,9 @@ { "inputs": [ { - "name": "resource_group_name", + "name": "existing_resource_group_name", "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, - { - "name": "use_existing_resource_group", - "value": true - }, { "name": "instance_name", "value": "evidence" From ddb560737f943a824acb407046b8aa36e74f67da Mon Sep 17 00:00:00 2001 From: huayuenh Date: Sat, 11 Oct 2025 23:29:46 +0100 Subject: [PATCH 10/15] chore: update defaults --- ibm_catalog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index f7bd036..56b7089 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -482,7 +482,7 @@ { "key": "use_legacy_ref", "type": "boolean", - "default_value": true, + "default_value": false, "description": "Set to `true` to use the legacy secret reference format for Secrets Manager secrets.", "required": false } @@ -973,7 +973,7 @@ { "key": "use_legacy_ref", "type": "boolean", - "default_value": true, + "default_value": false, "description": "Set to `true` to use the legacy secret reference format for Secrets Manager secrets.", "required": false } From e28c44fa68f4c9f89ba3d9e50695d01582dd03ae Mon Sep 17 00:00:00 2001 From: huayuenh Date: Mon, 13 Oct 2025 12:56:37 +0100 Subject: [PATCH 11/15] chore: update test --- tests/pr_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pr_test.go b/tests/pr_test.go index b720e66..85994a0 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -43,7 +43,7 @@ func TestProjectsFullTest(t *testing.T) { "resource_group_name": "default", "existing_secrets_manager_instance_crn": permanentResources["secretsManagerCRN"], }, - "7 - DevSecOps Toolchains": { + "6 - DevSecOps Toolchains": { "autostart": "false", "create_cos_api_key": "false", "create_secret_group": "false", From 61025679645879bca32d88362ccdd46df941ac41 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Mon, 13 Oct 2025 14:39:28 +0100 Subject: [PATCH 12/15] chore: update default --- tests/pr_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/pr_test.go b/tests/pr_test.go index 85994a0..4ee384f 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -56,6 +56,7 @@ func TestProjectsFullTest(t *testing.T) { "prefix": options.Prefix, "resource_group_name": "stack-pr-rg", "sm_service_plan": "trial", + "sm_resource_group": "default", "use_existing_resource_group": "true", "create_cd_instance": false, "region": "us-south", From d3bbb8187f1337b4df394760a67a3e4264a0eaa7 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Mon, 13 Oct 2025 15:18:15 +0100 Subject: [PATCH 13/15] chore: update defaults --- tests/pr_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/pr_test.go b/tests/pr_test.go index 4ee384f..af20124 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -40,7 +40,7 @@ func TestProjectsFullTest(t *testing.T) { options.StackMemberInputs = map[string]map[string]interface{}{ "5 - Secrets Manager": { - "resource_group_name": "default", + "existing_resource_group_name": "default", "existing_secrets_manager_instance_crn": permanentResources["secretsManagerCRN"], }, "6 - DevSecOps Toolchains": { @@ -56,7 +56,6 @@ func TestProjectsFullTest(t *testing.T) { "prefix": options.Prefix, "resource_group_name": "stack-pr-rg", "sm_service_plan": "trial", - "sm_resource_group": "default", "use_existing_resource_group": "true", "create_cd_instance": false, "region": "us-south", From 7832778ecf7fc9866823ca5e3e80ae667bdffff6 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Mon, 13 Oct 2025 16:11:27 +0100 Subject: [PATCH 14/15] chore: update default --- kubernetes/stack_definition.json | 2 +- stack_definition.json | 2 +- tests/pr_test.go | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index 706efc0..8770eff 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -628,7 +628,7 @@ }, { "name": "enable_cos", - "value" : "true" + "value" : true }, { "name" : "cos_bucket_name", diff --git a/stack_definition.json b/stack_definition.json index 709acf1..15ea7e0 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -589,7 +589,7 @@ }, { "name": "enable_cos", - "value" : "true" + "value" : true }, { "name": "cos_bucket_name", diff --git a/tests/pr_test.go b/tests/pr_test.go index af20124..0ac9e6a 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -44,11 +44,12 @@ func TestProjectsFullTest(t *testing.T) { "existing_secrets_manager_instance_crn": permanentResources["secretsManagerCRN"], }, "6 - DevSecOps Toolchains": { - "autostart": "false", - "create_cos_api_key": "false", - "create_secret_group": "false", - "create_signing_key": "false", - "create_ibmcloud_api_key": "false", + "autostart": false, + "create_cos_api_key": false, + "create_secret_group": false, + "create_signing_key": false, + "create_ibmcloud_api_key": false, + "enable_cos": false, }, } @@ -59,7 +60,7 @@ func TestProjectsFullTest(t *testing.T) { "use_existing_resource_group": "true", "create_cd_instance": false, "region": "us-south", - "enable_cos": "false", + "enable_cos": false, "existing_secrets_manager_crn": permanentResources["secretsManagerCRN"], "ibmcloud_api_key": options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], // always required by the stack "app_repo_existing_url": "https://us-south.git.cloud.ibm.com/padraic.edwards/hello-compliance-app-app-repo", From 1f6b51a620459346d11bd4a1a296ff2a2b46d6c4 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Tue, 14 Oct 2025 11:21:54 +0100 Subject: [PATCH 15/15] BREAKING CHANGE: insertion of rg module Insertion of resource group module and renamed inputs for several modules --- kubernetes/stack_definition.json | 36 ++++++++++++++++++--------- stack_definition.json | 42 +++++++++++++++++++++----------- 2 files changed, 53 insertions(+), 25 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index 8770eff..736daf9 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -443,13 +443,27 @@ { "inputs": [ { - "name": "resource_group_name", + "name": "single_resource_group_name", "value": "ref:../../inputs/resource_group_name" }, { - "name": "use_existing_resource_group", + "name": "use_existing_single_resource_group", "value": "ref:../../inputs/use_existing_resource_group" }, + { + "name": "prefix", + "value": "ref:../../inputs/prefix" + } + ], + "name": "1a - Resource Group", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b9726f66-d664-45e4-92fb-b1f1a7054bc7-global" + }, + { + "inputs": [ + { + "name": "existing_resource_group_name", + "value": "ref:../../members/1a - Resource Group/outputs/resource_group_name" + }, { "name": "region", "value": "ref:../../inputs/region" @@ -459,14 +473,14 @@ "value": "ref:../../inputs/prefix" } ], - "name": "1 - Key Management", + "name": "1b - Key Management", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global" }, { "inputs": [ { "name": "existing_resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { "name": "instance_name", @@ -496,7 +510,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn" }, { "name": "skip_iam_authorization_policy", @@ -522,7 +536,7 @@ }, { "name": "kms_endpoint_url", - "value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint" + "value": "ref:../../members/1b - Key Management/outputs/kms_private_endpoint" }, { "name": "prefix", @@ -530,7 +544,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn" }, { "name": "kms_endpoint_type", @@ -538,7 +552,7 @@ }, { "name": "existing_resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { "name": "region", @@ -552,7 +566,7 @@ "inputs": [ { "name": "existing_resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { "name": "use_existing_resource_group", @@ -572,7 +586,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn" }, { "name": "existing_event_notification_instance_crn", @@ -600,7 +614,7 @@ }, { "name": "toolchain_resource_group", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { "name": "sm_secret_group", diff --git a/stack_definition.json b/stack_definition.json index 15ea7e0..56e53e0 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -404,13 +404,27 @@ { "inputs": [ { - "name": "resource_group_name", + "name": "single_resource_group_name", "value": "ref:../../inputs/resource_group_name" }, { - "name": "use_existing_resource_group", + "name": "use_existing_single_resource_group", "value": "ref:../../inputs/use_existing_resource_group" }, + { + "name": "prefix", + "value": "ref:../../inputs/prefix" + } + ], + "name": "1a - Resource Group", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b9726f66-d664-45e4-92fb-b1f1a7054bc7-global" + }, + { + "inputs": [ + { + "name": "existing_resource_group_name", + "value": "ref:../../members/1a - Resource Group/outputs/single_resource_group_name" + }, { "name": "region", "value": "ref:../../inputs/region" @@ -420,14 +434,14 @@ "value": "ref:../../inputs/prefix" } ], - "name": "1 - Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global" + "name": "1b - Key Management", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.40397a62-acd4-4224-ba88-7d4bfa998222-global" }, { "inputs": [ { "name": "existing_resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { "name": "instance_name", @@ -457,7 +471,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn" }, { "name": "skip_iam_authorization_policy", @@ -483,7 +497,7 @@ }, { "name": "kms_endpoint_url", - "value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint" + "value": "ref:../../members/1b - Key Management/outputs/kms_private_endpoint" }, { "name": "prefix", @@ -491,7 +505,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn" }, { "name": "kms_endpoint_type", @@ -499,7 +513,7 @@ }, { "name": "existing_resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { "name": "region", @@ -513,7 +527,7 @@ "inputs": [ { "name": "existing_resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { "name": "use_existing_resource_group", @@ -533,7 +547,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn" }, { "name": "existing_event_notification_instance_crn", @@ -561,7 +575,7 @@ }, { "name": "toolchain_resource_group", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { "name": "sm_secret_group", @@ -801,7 +815,7 @@ "inputs": [ { "name": "resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { "name": "existing_resource_group", @@ -823,7 +837,7 @@ "inputs": [ { "name": "resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { "name": "existing_resource_group",