diff --git a/ibm_catalog.json b/ibm_catalog.json index 9464b42..4eb36b3 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -255,9 +255,16 @@ { "key": "use_existing_resource_group", "type": "boolean", - "default_value": true, + "default_value": false, "description": "Setting to `true` will treat the `resource_group_name` as an existing resource group. Setting `false` will provision a new resource group based on the value in `resource_group_name`.", "required": true + }, + { + "key": "project_names", + "required": false, + "type": "array", + "default_value": "[\"CI_Project\", \"CD_Project\"]", + "description": "The names of the projects to add the IBM Cloud Code Engine." } ], "outputs": [ diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index 22f5530..f27990c 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -199,14 +199,14 @@ "value": "ref:../../inputs/prefix" } ], - "name": "1a - Key Management", + "name": "1 - Key Management", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.650ff7c9-5a41-4d32-a0db-6720ff56a016-global" }, { "inputs": [ { "name": "resource_group_name", - "value": "ref:../../members/1a - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { "name": "existing_resource_group", @@ -221,7 +221,7 @@ "value": "ref:../../inputs/prefix" } ], - "name": "1b- Cloud Object Storage", + "name": "2 - Cloud Object Storage", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.75709d42-41a3-41ca-8f45-807652f0d1f7-global" }, { @@ -236,29 +236,29 @@ }, { "name": "existing_cos_instance_id", - "value": "ref:../../members/1b- Cloud Object Storage/outputs/cos_instance_id" + "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" }, { "name": "skip_iam_authorization_policy", "value": false } ], - "name": "2 - Cloud Object Bucket", + "name": "3 - Cloud Object Storage", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1218c52a-4c9c-433a-817d-ae2f0cdc8be4-global" }, { "inputs": [ { "name": "existing_cos_instance_crn", - "value": "ref:../../members/2 - Cloud Object Bucket/outputs/cos_instance_id" + "value": "ref:../../members/3 - Cloud Object Storage/outputs/cos_instance_id" }, { "name": "kms_endpoint_url", - "value": "ref:../../members/1a - Key Management/outputs/kms_private_endpoint" + "value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint" }, { "name": "skip_cos_kms_auth_policy", @@ -266,7 +266,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" }, { "name": "kms_endpoint_type", @@ -274,7 +274,7 @@ }, { "name": "resource_group_name", - "value": "ref:../../members/1a - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { "name": "use_existing_resource_group", @@ -285,14 +285,14 @@ "value": "ref:../../inputs/en_region" } ], - "name": "3 - Event Notifications", + "name": "4 - Event Notifications", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3910e11e-c90b-48b0-b271-ec5d5049ad84-global" }, { "inputs": [ { "name": "resource_group_name", - "value": "ref:../../members/1a - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { "name": "use_existing_resource_group", @@ -308,25 +308,25 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" }, { "name": "existing_event_notification_instance_crn", - "value": "ref:../../members/3 - Event Notifications/outputs/crn" + "value": "ref:../../members/4 - Event Notifications/outputs/crn" }, { "name": "service_plan", "value": "ref:../../inputs/sm_service_plan" } ], - "name": "4 - Secrets Manager", + "name": "5 - Secrets Manager", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e806bb05-dfb9-40a8-99bf-1b9272cf8d82-global" }, { "inputs": [ { "name": "resource_group_name", - "value": "ref:../../members/1a - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { "name": "use_existing_resource_group", @@ -346,11 +346,11 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" }, { "name": "existing_en_crn", - "value": "ref:../../members/3 - Event Notifications/outputs/crn" + "value": "ref:../../members/4 - Event Notifications/outputs/crn" }, { "name": "kms_endpoint_type", @@ -366,18 +366,18 @@ }, { "name": "existing_cos_instance_crn", - "value": "ref:../../members/1b- Cloud Object Storage/outputs/cos_instance_id" + "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, { "name" : "provision_scc_workload_protection", "value" : false } ], - "name": "5 - Security and Compliance Center", + "name": "6 - Security and Compliance Center", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1ac9df0e-d3d5-4ed8-abfc-043578670dbb-global" }, { - "name": "6 - DevSecOps Toolchains", + "name": "7 - DevSecOps Toolchains", "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.9c2038e5-76ce-4b7f-8862-3e451f8392ef-global", "inputs": [ { @@ -390,7 +390,7 @@ }, { "name": "toolchain_resource_group", - "value": "ref:../../members/5 - Security and Compliance Center/outputs/resource_group_name" + "value": "ref:../../members/6 - Security and Compliance Center/outputs/resource_group_name" }, { "name": "sm_secret_group", @@ -398,15 +398,15 @@ }, { "name": "sm_resource_group", - "value": "ref:../../members/4 - Secrets Manager/outputs/resource_group_name" + "value": "ref:../../members/5 - Secrets Manager/outputs/resource_group_name" }, { "name": "sm_name", - "value": "ref:../../members/4 - Secrets Manager/outputs/secrets_manager_name" + "value": "ref:../../members/5 - Secrets Manager/outputs/secrets_manager_name" }, { "name": "sm_location", - "value": "ref:../../members/4 - Secrets Manager/outputs/secrets_manager_region" + "value": "ref:../../members/5 - Secrets Manager/outputs/secrets_manager_region" }, { "name": "repositories_prefix", @@ -414,15 +414,15 @@ }, { "name": "event_notifications_crn", - "value": "ref:../../members/3 - Event Notifications/outputs/crn" + "value": "ref:../../members/4 - Event Notifications/outputs/crn" }, { "name" : "cos_bucket_name", - "value" : "ref:../../members/2 - Cloud Object Bucket/outputs/bucket_name" + "value" : "ref:../../members/3 - Cloud Object Storage/outputs/bucket_name" }, { "name" : "cos_endpoint", - "value" : "ref:../../members/2 - Cloud Object Bucket/outputs/s3_endpoint_direct" + "value" : "ref:../../members/3 - Cloud Object Storage/outputs/s3_endpoint_direct" }, { "name" : "registry_namespace", @@ -519,15 +519,15 @@ "outputs": [ { "name": "compliance-ci-toolchain", - "value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_ci_toolchain_url" + "value": "ref:./members/7 - DevSecOps Toolchains/outputs/compliance_ci_toolchain_url" }, { "name": "compliance-cd-toolchain", - "value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_cd_toolchain_url" + "value": "ref:./members/7 - DevSecOps Toolchains/outputs/compliance_cd_toolchain_url" }, { "name": "compliance-cc-toolchain", - "value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_cc_toolchain_url" + "value": "ref:./members/7 - DevSecOps Toolchains/outputs/compliance_cc_toolchain_url" } ] } diff --git a/stack_definition.json b/stack_definition.json index 8a3246d..f67c2a4 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -122,6 +122,21 @@ "hidden": false, "default": "security-compliance-center-standard-plan", "custom_config": {} + }, + { + "name": "scc_region", + "required": false, + "type": "string", + "hidden": false, + "default": "us-south", + "custom_config": {} + }, + { + "name": "project_names", + "required": false, + "type": "array", + "hidden": false, + "default": "[\"CI_Project\",\"CD_Project\"]" } ], "members": [ @@ -144,14 +159,14 @@ "value": "ref:../../inputs/prefix" } ], - "name": "1a - Key Management", + "name": "1 - Key Management", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.650ff7c9-5a41-4d32-a0db-6720ff56a016-global" }, { "inputs": [ { "name": "resource_group_name", - "value": "ref:../../members/1a - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { "name": "existing_resource_group", @@ -166,7 +181,7 @@ "value": "ref:../../inputs/prefix" } ], - "name": "1b- Cloud Object Storage", + "name": "2 - Cloud Object Storage", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.75709d42-41a3-41ca-8f45-807652f0d1f7-global" }, { @@ -181,29 +196,29 @@ }, { "name": "existing_cos_instance_id", - "value": "ref:../../members/1b- Cloud Object Storage/outputs/cos_instance_id" + "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" }, { "name": "skip_iam_authorization_policy", "value": false } ], - "name": "2 - Cloud Object Bucket", + "name": "3 - Cloud Object Bucket", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1218c52a-4c9c-433a-817d-ae2f0cdc8be4-global" }, { "inputs": [ { "name": "existing_cos_instance_crn", - "value": "ref:../../members/2 - Cloud Object Bucket/outputs/cos_instance_id" + "value": "ref:../../members/3 - Cloud Object Bucket/outputs/cos_instance_id" }, { "name": "kms_endpoint_url", - "value": "ref:../../members/1a - Key Management/outputs/kms_private_endpoint" + "value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint" }, { "name": "skip_cos_kms_auth_policy", @@ -211,7 +226,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" }, { "name": "kms_endpoint_type", @@ -219,7 +234,7 @@ }, { "name": "resource_group_name", - "value": "ref:../../members/1a - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { "name": "use_existing_resource_group", @@ -230,14 +245,14 @@ "value": "ref:../../inputs/en_region" } ], - "name": "3 - Event Notifications", + "name": "4 - Event Notifications", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3910e11e-c90b-48b0-b271-ec5d5049ad84-global" }, { "inputs": [ { "name": "resource_group_name", - "value": "ref:../../members/1a - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { "name": "use_existing_resource_group", @@ -253,25 +268,25 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" }, { "name": "existing_event_notification_instance_crn", - "value": "ref:../../members/3 - Event Notifications/outputs/crn" + "value": "ref:../../members/4 - Event Notifications/outputs/crn" }, { "name": "service_plan", "value": "ref:../../inputs/sm_service_plan" } ], - "name": "4 - Secrets Manager", + "name": "5 - Secrets Manager", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e806bb05-dfb9-40a8-99bf-1b9272cf8d82-global" }, { "inputs": [ { "name": "resource_group_name", - "value": "ref:../../members/1a - Key Management/outputs/resource_group_name" + "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { "name": "use_existing_resource_group", @@ -291,11 +306,11 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn" }, { "name": "existing_en_crn", - "value": "ref:../../members/3 - Event Notifications/outputs/crn" + "value": "ref:../../members/4 - Event Notifications/outputs/crn" }, { "name": "kms_endpoint_type", @@ -318,11 +333,33 @@ "value" : false } ], - "name": "5 - Security and Compliance Center", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1ac9df0e-d3d5-4ed8-abfc-043578670dbb-global" + "name": "6 - Security and Compliance Center", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fe5f970b-e113-4b34-ab40-a368b6149687-global" }, { - "name": "6 - DevSecOps Toolchains", + "inputs": [ + { + "name": "resource_group_name", + "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" + }, + { + "name": "existing_resource_group", + "value": true + }, + { + "name": "prefix", + "value": "ref:../../inputs/prefix" + }, + { + "name": "project_names", + "value": "ref:../../inputs/project_names" + } + ], + "name": "7 - Code Engine Project", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.524cca67-fad4-4842-a52a-3c54677a6b3e-global" + }, + { + "name": "8 - DevSecOps Toolchains", "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.3a73ae21-ca89-4120-836a-3d4da7df7ce0-global", "inputs": [ { @@ -335,7 +372,7 @@ }, { "name": "toolchain_resource_group", - "value": "ref:../../members/5 - Security and Compliance Center/outputs/resource_group_name" + "value": "ref:../../members/1 - Key Management/outputs/resource_group_name" }, { "name": "sm_secret_group", @@ -343,15 +380,15 @@ }, { "name": "sm_resource_group", - "value": "ref:../../members/4 - Secrets Manager/outputs/resource_group_name" + "value": "ref:../../members/5 - Secrets Manager/outputs/resource_group_name" }, { "name": "sm_name", - "value": "ref:../../members/4 - Secrets Manager/outputs/secrets_manager_name" + "value": "ref:../../members/5 - Secrets Manager/outputs/secrets_manager_name" }, { "name": "sm_location", - "value": "ref:../../members/4 - Secrets Manager/outputs/secrets_manager_region" + "value": "ref:../../members/5 - Secrets Manager/outputs/secrets_manager_region" }, { "name": "repositories_prefix", @@ -359,15 +396,15 @@ }, { "name": "event_notifications_crn", - "value": "ref:../../members/3 - Event Notifications/outputs/crn" + "value": "ref:../../members/4 - Event Notifications/outputs/crn" }, { "name" : "cos_bucket_name", - "value" : "ref:../../members/2 - Cloud Object Bucket/outputs/bucket_name" + "value" : "ref:../../members/3 - Cloud Object Bucket/outputs/bucket_name" }, { "name" : "cos_endpoint", - "value" : "ref:../../members/2 - Cloud Object Bucket/outputs/s3_endpoint_direct" + "value" : "ref:../../members/3 - Cloud Object Bucket/outputs/s3_endpoint_direct" }, { "name" : "registry_namespace", @@ -421,6 +458,14 @@ "name" : "cos_api_key_secret_name", "value" : "ref:../../inputs/cos_api_key_secret_name" }, + { + "name" : "ci_code_engine_project", + "value" : "ref:../../members/7 - Code Engine Project/outputs/project_2_name" + }, + { + "name" : "cd_code_engine_project", + "value" : "ref:../../members/7 - Code Engine Project/outputs/project_1_name" + }, { "name" : "cc_opt_in_cra_auto_remediation", "value" : true @@ -435,15 +480,15 @@ "outputs": [ { "name": "compliance-ci-toolchain", - "value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_ci_toolchain_url" + "value": "ref:./members/7 - DevSecOps Toolchains/outputs/compliance_ci_toolchain_url" }, { "name": "compliance-cd-toolchain", - "value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_cd_toolchain_url" + "value": "ref:./members/7 - DevSecOps Toolchains/outputs/compliance_cd_toolchain_url" }, { "name": "compliance-cc-toolchain", - "value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_cc_toolchain_url" + "value": "ref:./members/7 - DevSecOps Toolchains/outputs/compliance_cc_toolchain_url" } ] }