From 9cd1f17be4ef62a5822a1fd52926d3512337bffe Mon Sep 17 00:00:00 2001 From: huayuenh Date: Fri, 6 Jun 2025 17:18:50 +0100 Subject: [PATCH 1/3] chore: remove scc --- ibm_catalog.json | 78 ------------------------------------------- stack_definition.json | 76 ++--------------------------------------- 2 files changed, 3 insertions(+), 151 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 569858a..351a03f 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -217,45 +217,6 @@ } ] }, - { - "key": "scc_service_plan", - "type": "string", - "default_value": "security-compliance-center-standard-plan", - "description": "The pricing plan to use for the IBM Cloud Security and Compliance Center.", - "required": false, - "options": [ - { - "displayname": "standard", - "value": "security-compliance-center-standard-plan" - }, - { - "displayname": "trial", - "value": "security-compliance-center-trial-plan" - } - ] - }, - { - "key": "scc_region", - "type": "string", - "default_value": "us-south", - "description": "The region in which the Security and Compliance Center instance is provisioned.", - "display_name": "Region", - "required": true, - "custom_config": { - "type": "region", - "grouping": "deployment", - "original_grouping": "deployment", - "config_constraints": { - "filterString": "id:ca-tor,eu-es,eu-de,eu-fr2,us-south", - "showKinds": [ - "region", - "zone", - "dc", - "location" - ] - } - } - }, { "key": "en_region", "type": "string", @@ -747,45 +708,6 @@ } ] }, - { - "key": "scc_service_plan", - "type": "string", - "default_value": "security-compliance-center-standard-plan", - "description": "The pricing plan to use for the IBM Cloud Security and Compliance Center.", - "required": false, - "options": [ - { - "displayname": "standard", - "value": "security-compliance-center-standard-plan" - }, - { - "displayname": "trial", - "value": "security-compliance-center-trial-plan" - } - ] - }, - { - "key": "scc_region", - "type": "string", - "default_value": "us-south", - "description": "The region in which the Security and Compliance Center instance is provisioned.", - "display_name": "Region", - "required": true, - "custom_config": { - "type": "region", - "grouping": "deployment", - "original_grouping": "deployment", - "config_constraints": { - "filterString": "id:ca-tor,eu-es,eu-de,eu-fr2,us-south", - "showKinds": [ - "region", - "zone", - "dc", - "location" - ] - } - } - }, { "key": "en_region", "type": "string", diff --git a/stack_definition.json b/stack_definition.json index 6de74bc..fefd5d3 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -15,14 +15,6 @@ "default": "us-south", "custom_config": {} }, - { - "name": "scc_region", - "required": true, - "type": "string", - "hidden": false, - "default": "us-south", - "custom_config": {} - }, { "name": "app_repo_existing_url", "type": "string", @@ -128,14 +120,6 @@ "hidden": false, "default": "signing-certificate", "custom_config": {} - }, - { - "name": "scc_service_plan", - "required": false, - "type": "string", - "hidden": false, - "default": "security-compliance-center-standard-plan", - "custom_config": {} }, { "name": "app_repo_branch", @@ -437,7 +421,7 @@ } ], "name": "1 - Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.00f91756-7287-4786-9ab0-fd12d30d8919-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global" }, { "inputs": [ @@ -446,7 +430,7 @@ "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { - "name": "existing_resource_group", + "name": "use_existing_resource_group", "value": true }, { @@ -459,7 +443,7 @@ } ], "name": "2 - Cloud Object Storage", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.855893e4-62db-4f00-a867-0795231053fe-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global" }, { "inputs": [ @@ -563,60 +547,6 @@ "name": "5 - Secrets Manager", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global" }, - { - "inputs": [ - { - "name": "resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" - }, - { - "name": "use_existing_resource_group", - "value": true - }, - { - "name": "scc_region", - "value": "ref:../../inputs/scc_region" - }, - { - "name": "cos_region", - "value": "ref:../../inputs/region" - }, - { - "name": "prefix", - "value": "ref:../../inputs/prefix" - }, - { - "name": "existing_kms_instance_crn", - "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" - }, - { - "name": "existing_en_crn", - "value": "ref:../../members/4 - Event Notifications/outputs/crn" - }, - { - "name": "kms_endpoint_type", - "value": "private" - }, - { - "name": "skip_cos_kms_auth_policy", - "value": true - }, - { - "name": "scc_service_plan", - "value": "ref:../../inputs/scc_service_plan" - }, - { - "name": "existing_cos_instance_crn", - "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" - }, - { - "name": "provision_scc_workload_protection", - "value": false - } - ], - "name": "6 - Security and Compliance Center", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e4e8fc9-8953-4456-a51c-6ed6a3ca1bd7-global" - }, { "name": "7 - DevSecOps Toolchains", "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.3bf38800-70e9-40db-aeca-016c9911364f-global", From 4060f7909313489c3f7b6411e6d95658f1c64b85 Mon Sep 17 00:00:00 2001 From: huayuenh Date: Fri, 6 Jun 2025 19:24:18 +0100 Subject: [PATCH 2/3] chore: remove scc --- kubernetes/stack_definition.json | 78 ++------------------------------ tests/pr_test.go | 6 +-- 2 files changed, 7 insertions(+), 77 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index 22c9055..213f5cc 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -15,14 +15,6 @@ "default": "us-south", "custom_config": {} }, - { - "name": "scc_region", - "required": true, - "type": "string", - "hidden": false, - "default": "us-south", - "custom_config": {} - }, { "name": "app_repo_existing_url", "type": "string", @@ -129,14 +121,6 @@ "default": "signing-certificate", "custom_config": {} }, - { - "name": "scc_service_plan", - "required": false, - "type": "string", - "hidden": false, - "default": "security-compliance-center-standard-plan", - "custom_config": {} - }, { "name": "app_repo_branch", "type": "string", @@ -476,7 +460,7 @@ } ], "name": "1 - Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.00f91756-7287-4786-9ab0-fd12d30d8919-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global" }, { "inputs": [ @@ -485,7 +469,7 @@ "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { - "name": "existing_resource_group", + "name": "use_existing_resource_group", "value": true }, { @@ -498,7 +482,7 @@ } ], "name": "2 - Cloud Object Storage", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.855893e4-62db-4f00-a867-0795231053fe-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global" }, { "inputs": [ @@ -603,61 +587,7 @@ "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global" }, { - "inputs": [ - { - "name": "resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" - }, - { - "name": "use_existing_resource_group", - "value": true - }, - { - "name": "scc_region", - "value": "ref:../../inputs/scc_region" - }, - { - "name": "cos_region", - "value": "ref:../../inputs/region" - }, - { - "name": "prefix", - "value": "ref:../../inputs/prefix" - }, - { - "name": "existing_kms_instance_crn", - "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" - }, - { - "name": "existing_en_crn", - "value": "ref:../../members/4 - Event Notifications/outputs/crn" - }, - { - "name": "kms_endpoint_type", - "value": "private" - }, - { - "name": "skip_cos_kms_auth_policy", - "value": true - }, - { - "name": "scc_service_plan", - "value": "ref:../../inputs/scc_service_plan" - }, - { - "name": "existing_cos_instance_crn", - "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" - }, - { - "name" : "provision_scc_workload_protection", - "value" : false - } - ], - "name": "6 - Security and Compliance Center", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e4e8fc9-8953-4456-a51c-6ed6a3ca1bd7-global" - }, - { - "name": "7 - DevSecOps Toolchains", + "name": "6 - DevSecOps Toolchains", "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.40c697e5-a339-4bf2-90ed-c598f103c16b-global", "inputs": [ { diff --git a/tests/pr_test.go b/tests/pr_test.go index ea76a4c..96a359e 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", @@ -54,9 +54,9 @@ func TestProjectsFullTest(t *testing.T) { options.StackInputs = map[string]interface{}{ "prefix": options.Prefix, - "resource_group_name": options.Prefix, + "resource_group_name": "stack-pr-rg", "sm_service_plan": "trial", - "scc_service_plan": "security-compliance-center-standard-plan", + "use_existing_resource_group": "true", "region": "us-south", "existing_secrets_manager_crn": permanentResources["secretsManagerCRN"], "ibmcloud_api_key": options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], // always required by the stack From 054d70562e95a5cd3d1ff84a335c7f13ffd083de Mon Sep 17 00:00:00 2001 From: huayuenh Date: Fri, 6 Jun 2025 20:52:38 +0100 Subject: [PATCH 3/3] chore: remove scc --- kubernetes/stack_definition.json | 2 +- tests/pr_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index 213f5cc..9366d88 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -587,7 +587,7 @@ "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global" }, { - "name": "6 - DevSecOps Toolchains", + "name": "7 - DevSecOps Toolchains", "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.40c697e5-a339-4bf2-90ed-c598f103c16b-global", "inputs": [ { diff --git a/tests/pr_test.go b/tests/pr_test.go index 96a359e..263734b 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"], }, - "6 - DevSecOps Toolchains": { + "7 - DevSecOps Toolchains": { "autostart": "false", "create_cos_api_key": "false", "create_secret_group": "false",