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 } diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index 33e392a..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,21 +473,17 @@ "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": "resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" - }, - { - "name": "use_existing_resource_group", - "value": true + "name": "existing_resource_group_name", + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { - "name": "cos_instance_name", + "name": "instance_name", "value": "evidence" }, { @@ -482,7 +492,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": [ @@ -500,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", @@ -514,31 +524,35 @@ "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", - "value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint" + "name": "enable_collecting_failed_events", + "value": true }, { - "name": "skip_cos_kms_auth_policy", + "name": "kms_encryption_enabled", "value": true }, + { + "name": "kms_endpoint_url", + "value": "ref:../../members/1b - Key Management/outputs/kms_private_endpoint" + }, + { + "name": "prefix", + "value": "ref:../../inputs/prefix" + }, { "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", "value": "private" }, { - "name": "resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" - }, - { - "name": "use_existing_resource_group", - "value": true + "name": "existing_resource_group_name", + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { "name": "region", @@ -546,13 +560,13 @@ } ], "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": [ { - "name": "resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + "name": "existing_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", @@ -584,7 +598,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", @@ -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", @@ -628,7 +642,7 @@ }, { "name": "enable_cos", - "value" : "true" + "value" : true }, { "name" : "cos_bucket_name", diff --git a/stack_definition.json b/stack_definition.json index 84a95a4..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,21 +434,17 @@ "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": "resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" - }, - { - "name": "use_existing_resource_group", - "value": true + "name": "existing_resource_group_name", + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { - "name": "cos_instance_name", + "name": "instance_name", "value": "evidence" }, { @@ -443,9 +453,9 @@ } ], "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": [ { "name": "bucket_name", @@ -461,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", @@ -475,31 +485,35 @@ "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": "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" + "value": "ref:../../members/1b - Key Management/outputs/kms_private_endpoint" }, { - "name": "skip_cos_kms_auth_policy", - "value": true + "name": "prefix", + "value": "ref:../../inputs/prefix" }, { "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", "value": "private" }, { - "name": "resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" - }, - { - "name": "use_existing_resource_group", - "value": true + "name": "existing_resource_group_name", + "value": "ref:../../members/1b - Key Management/outputs/resource_group_name" }, { "name": "region", @@ -507,13 +521,13 @@ } ], "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": [ { - "name": "resource_group_name", - "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + "name": "existing_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", @@ -545,7 +559,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", @@ -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", @@ -589,7 +603,7 @@ }, { "name": "enable_cos", - "value" : "true" + "value" : true }, { "name": "cos_bucket_name", @@ -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", diff --git a/tests/pr_test.go b/tests/pr_test.go index b720e66..0ac9e6a 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -40,15 +40,16 @@ 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"], }, - "7 - DevSecOps Toolchains": { - "autostart": "false", - "create_cos_api_key": "false", - "create_secret_group": "false", - "create_signing_key": "false", - "create_ibmcloud_api_key": "false", + "6 - DevSecOps Toolchains": { + "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",