diff --git a/ibm_catalog.json b/ibm_catalog.json index 6a82a9c..569858a 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -319,6 +319,13 @@ "default_value": false, "description": "Set to `true` to force create a standard api key. By default the generated apikey will be a service api key. It is recommended to use a Git Token when using the service api key. In the case where the user has been invited to an account and that user not the account owner, during toolchain creation the default compliance repositories will be created in that user's account and the service api will not have access to those repositories. In this case a Git Token for the repositories is required. See `repo_git_token_secret_name` for more details. The alternative is to set `force_create_standard_api_key` to `true` to create a standard api key.", "required": false + }, + { + "key": "ibmcloud_api", + "type": "string", + "default_value": "", + "description": "The environment URL. When left unset this will default to `https://cloud.ibm.com`", + "required": false }, { "key": "create_git_token", @@ -842,6 +849,13 @@ "default_value": false, "description": "Set to `true` to force create a standard api key. By default the generated apikey will be a service api key. It is recommended to use a Git Token when using the service api key. In the case where the user has been invited to an account and that user not the account owner, during toolchain creation the default compliance repositories will be created in that user's account and the service api will not have access to those repositories. In this case a Git Token for the repositories is required. See `repo_git_token_secret_name` for more details. The alternative is to set `force_create_standard_api_key` to `true` to create a standard api key.", "required": false + }, + { + "key": "ibmcloud_api", + "type": "string", + "default_value": "", + "description": "The environment URL. When left unset this will default to `https://cloud.ibm.com`", + "required": false }, { "key": "create_git_token", diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index 519c700..6e80b34 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -59,6 +59,13 @@ "hidden": false, "default": "" }, + { + "name": "ibmcloud_api", + "required": false, + "type": "string", + "hidden": false, + "default": "" + }, { "name": "registry_namespace", "required": false, @@ -651,7 +658,7 @@ }, { "name": "7 - DevSecOps Toolchains", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.dbe53da3-d4cf-41ce-9f60-553aab0a2014-global", + "version_locator": "f7843d88-1ae1-43fa-a9ba-3fc32496f024.54f2a09a-9533-4beb-9246-cbdfc1d4fa50", "inputs": [ { "name": "ibmcloud_api_key", @@ -701,6 +708,10 @@ "name": "cos_instance_crn", "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, + { + "name" : "ibmcloud_api", + "value" : "ref:../../inputs/ibmcloud_api" + }, { "name" : "registry_namespace", "value" : "ref:../../inputs/registry_namespace" diff --git a/stack_definition.json b/stack_definition.json index 25dffa5..68be79a 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -59,6 +59,13 @@ "hidden": false, "default": "" }, + { + "name": "ibmcloud_api", + "required": false, + "type": "string", + "hidden": false, + "default": "" + }, { "name": "registry_namespace", "required": false, @@ -612,7 +619,7 @@ }, { "name": "7 - DevSecOps Toolchains", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.1b108206-4284-4b9d-b6b7-1a613bebe627-global", + "version_locator": "f7843d88-1ae1-43fa-a9ba-3fc32496f024.6c9e9e10-ba32-41b1-bbf4-4caeb659106f", "inputs": [ { "name": "ibmcloud_api_key", @@ -662,6 +669,10 @@ "name": "cos_instance_crn", "value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id" }, + { + "name" : "ibmcloud_api", + "value" : "ref:../../inputs/ibmcloud_api" + }, { "name": "registry_namespace", "value": "ref:../../inputs/registry_namespace" diff --git a/tests/pr_test.go b/tests/pr_test.go index af024d1..e22bd8b 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -44,12 +44,18 @@ func TestProjectsFullTest(t *testing.T) { "existing_secrets_manager_instance_crn": permanentResources["secretsManagerCRN"], }, "8 - DevSecOps Toolchains": { - "autostart": "false", - "create_cos_api_key": "false", - "create_secret_group": "false", - "create_signing_certificate": "false", - "create_signing_key": "false", - "create_ibmcloud_api_key": "false", + "autostart": "false", + "create_cos_api_key": "false", + "create_secret_group": "false", + "create_signing_certificate": "false", + "create_signing_key": "false", + "create_ibmcloud_api_key": "false", + "app_repo_existing_url": "https://us-south.git.cloud.ibm.com/padraic.edwards/hello-compliance-app-app-repo", + "evidence_repo_existing_url": "https://us-south.git.cloud.ibm.com/padraic.edwards/hello-compliance-app-app-repo", + "issues_repo_existing_url": "https://us-south.git.cloud.ibm.com/padraic.edwards/hello-compliance-app-app-repo", + "inventory_repo_existing_url": "https://us-south.git.cloud.ibm.com/padraic.edwards/hello-compliance-app-app-repo", + "cd_deployment_repo_existing_url": "https://us-south.git.cloud.ibm.com/padraic.edwards/hello-compliance-app-app-repo", + "change_management_existing_url": "https://us-south.git.cloud.ibm.com/padraic.edwards/hello-compliance-app-app-repo", }, }