diff --git a/ibm_catalog.json b/ibm_catalog.json index 4eb36b3..57088fb 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -214,7 +214,7 @@ "default_value": "us-south", "description": "The region in which the Security and Compliance Center instance is provisioned.", "display_name": "Region", - "required": false, + "required": true, "custom_config": { "type": "region", "grouping": "deployment", @@ -236,7 +236,7 @@ "default_value": "us-south", "description": "The region in which the Events Notification instance is created.", "display_name": "Region", - "required": false, + "required": true, "custom_config": { "type": "region", "grouping": "deployment", @@ -257,9 +257,30 @@ "type": "boolean", "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 + "required": false }, { + "key": "app_repo_branch", + "type": "string", + "default_value": "main", + "description": "This is the repository branch used by the default sample application. Alternatively if `app_repo_existing_url` is provided, then the branch must reflect the default branch for that repository. Typically these branches are `main` or `master`.", + "required": false + }, + { + "key": "app_repo_existing_url", + "type": "string", + "default_value": "__NOTSET__", + "description": "Bring your own existing application repository by providing the URL. This will create an integration for your application repository instead of cloning the default sample. Repositories existing in a different org will require the use of Git token. See `app_repo_git_token_secret_name` under optional variables. ", + "required": true + }, + { + "key": "app_repo_git_token_secret_name", + "type": "string", + "default_value": "", + "description": "Name of the Git token secret in the secret provider used for accessing the sample (or bring your own) application repository.", + "required": false + }, + { "key": "project_names", "required": false, "type": "array", @@ -503,7 +524,7 @@ "default_value": "us-south", "description": "The region in which the Security and Compliance Center instance is provisioned.", "display_name": "Region", - "required": false, + "required": true, "custom_config": { "type": "region", "grouping": "deployment", @@ -525,7 +546,7 @@ "default_value": "us-south", "description": "The region in which the Events Notification instance is created.", "display_name": "Region", - "required": false, + "required": true, "custom_config": { "type": "region", "grouping": "deployment", @@ -544,10 +565,31 @@ { "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 - } + "required": false + }, + { + "key": "app_repo_branch", + "type": "string", + "default_value": "main", + "description": "This is the repository branch used by the default sample application. Alternatively if `app_repo_existing_url` is provided, then the branch must reflect the default branch for that repository. Typically these branches are `main` or `master`.", + "required": false + }, + { + "key": "app_repo_existing_url", + "type": "string", + "default_value": "__NOTSET__", + "description": "Bring your own existing application repository by providing the URL. This will create an integration for your application repository instead of cloning the default sample. Repositories existing in a different org will require the use of Git token. See `app_repo_git_token_secret_name` under optional variables. ", + "required": true + }, + { + "key": "app_repo_git_token_secret_name", + "type": "string", + "default_value": "", + "description": "Name of the Git token secret in the secret provider used for accessing the sample (or bring your own) application repository.", + "required": false + } ], "outputs": [ { diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index afe47c5..9aa70c7 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -1,13 +1,5 @@ { "inputs": [ - { - "name": "resource_group_name", - "required": true, - "type": "string", - "hidden": false, - "default": "__NULL__", - "custom_config": {} - }, { "name": "region", "required": true, @@ -32,11 +24,11 @@ "custom_config": {} }, { - "name": "bucket_name", - "required": true, + "name": "app_repo_existing_url", "type": "string", "hidden": false, - "default": "" + "default": "__NOTSET__", + "required": true }, { "name": "cluster_name", @@ -46,80 +38,95 @@ "default": "mycluster" }, { - "name": "prefix", + "name": "ci_cluster_resource_group", "required": false, "type": "string", "hidden": false, - "default": "devsecops" + "default": "ref:../../inputs/resource_group_name", + "custom_config": {} }, { - "name": "use_existing_resource_group", + "name": "ci_cluster_name", "required": false, "type": "string", "hidden": false, - "default": "" + "default": "ref:../../inputs/cluster_name", + "custom_config": {} }, { - "name": "registry_namespace", + "name": "ci_cluster_namespace", "required": false, "type": "string", "hidden": false, - "default": "devsecops" + "default": "dev", + "custom_config": {} }, { - "name": "create_cd_instance", + "name": "ci_cluster_region", "required": false, - "type": "boolean", + "type": "string", "hidden": false, - "default": true, + "default": "us-south", "custom_config": {} }, { - "name": "ci_cluster_name", - "required": true, + "name": "cd_cluster_name", + "required": false, "type": "string", "hidden": false, - "default": "", + "default": "ref:../../inputs/cluster_name", "custom_config": {} }, { - "name": "ci_cluster_namespace", - "required": true, + "name": "cd_cluster_namespace", + "required": false, "type": "string", "hidden": false, - "default": "dev", + "default": "prod", "custom_config": {} }, { - "name": "ci_cluster_region", - "required": true, + "name": "bucket_name", + "required": false, "type": "string", "hidden": false, - "default": "us-south", - "custom_config": {} + "default": "devsecops" }, { - "name": "ci_cluster_resource_group", - "required": true, + "name": "resource_group_name", + "required": false, "type": "string", "hidden": false, - "default": "", + "default": "devsecops-rg", "custom_config": {} }, { - "name": "cd_cluster_name", - "required": true, + "name": "prefix", + "required": false, "type": "string", "hidden": false, - "default": "", - "custom_config": {} + "default": "devsecops" }, { - "name": "cd_cluster_namespace", - "required": true, + "name": "use_existing_resource_group", + "required": false, "type": "string", "hidden": false, - "default": "prod", + "default": "" + }, + { + "name": "registry_namespace", + "required": false, + "type": "string", + "hidden": false, + "default": "devsecops" + }, + { + "name": "create_cd_instance", + "required": false, + "type": "boolean", + "hidden": false, + "default": true, "custom_config": {} }, { @@ -177,6 +184,20 @@ "hidden": false, "default": "security-compliance-center-standard-plan", "custom_config": {} + }, + { + "name": "app_repo_branch", + "type": "string", + "hidden": false, + "default": "main", + "required": false + }, + { + "name": "app_repo_git_token_secret_name", + "type": "string", + "hidden": false, + "default": "", + "required": false } ], "members": [ @@ -378,7 +399,7 @@ }, { "name": "7 - DevSecOps Toolchains", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.ed0ad70a-b46a-4142-a609-2e48f82d168e-global", + "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.e4198315-5847-4735-8fdf-75591c1e6587-global", "inputs": [ { "name": "ibmcloud_api_key", diff --git a/stack_definition.json b/stack_definition.json index 9e0413f..9f62205 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -1,13 +1,5 @@ { "inputs": [ - { - "name": "resource_group_name", - "required": true, - "type": "string", - "hidden": false, - "default": "__NULL__", - "custom_config": {} - }, { "name": "region", "required": true, @@ -31,12 +23,27 @@ "default": "us-south", "custom_config": {} }, + { + "name": "app_repo_existing_url", + "type": "string", + "hidden": false, + "default": "__NOTSET__", + "required": true + }, + { + "name": "resource_group_name", + "required": false, + "type": "string", + "hidden": false, + "default": "devsecops-rg", + "custom_config": {} + }, { "name": "bucket_name", - "required": true, + "required": false, "type": "string", "hidden": false, - "default": "" + "default": "devsecops" }, { "name": "prefix", @@ -123,21 +130,27 @@ "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\"]" - } + }, + { + "name": "app_repo_branch", + "type": "string", + "hidden": false, + "default": "main", + "required": false + }, + { + "name": "app_repo_git_token_secret_name", + "type": "string", + "hidden": false, + "default": "", + "required": false + } ], "members": [ { @@ -360,7 +373,7 @@ }, { "name": "8 - DevSecOps Toolchains", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.40ed9a72-fc1e-4462-a943-17d276a02fee-global", + "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.e4198315-5847-4735-8fdf-75591c1e6587-global", "inputs": [ { "name": "ibmcloud_api_key",