From b1ff75fe4c3f3e185bbb38c29920518e9e69cd06 Mon Sep 17 00:00:00 2001
From: Brendan Kelly <133764206+brendankellyibm@users.noreply.github.com>
Date: Thu, 17 Oct 2024 11:27:04 +0100
Subject: [PATCH] fix: updated the version of Observability DA to pull in a fix
for Cloud Logs where instance provisioning can fail due to the COS
authorisation policy not being created in time.
- updated the version of
the Sample App DA to pull in fix for race condition with ingress and CI
pipeline.
- update the CI, CD, and CC pipeline property values to address
some gaps (#208)
---
solutions/basic/stack_definition.json | 12 ++++++++----
solutions/standard/stack_definition.json | 12 ++++++++++--
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json
index 1ab424f..8e1e500 100644
--- a/solutions/basic/stack_definition.json
+++ b/solutions/basic/stack_definition.json
@@ -236,7 +236,7 @@
},
{
"name": "Essential Security - Logging Monitoring Activity Tracker",
- "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.157744e4-5ef1-4e0f-9b8b-8b49b2ee8bb2-global",
+ "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.5036a34b-9925-4d06-932b-c22ce63d3fdf-global",
"inputs": [
{
"name": "ibmcloud_api_key",
@@ -627,13 +627,17 @@
"name": "ci_app_name",
"value": "rag-sample-app"
},
+ {
+ "name": "cc_pipeline_properties",
+ "value": "[{\"pipeline_id\":\"cc\",\"properties\":[{\"name\":\"app-name\",\"type\":\"text\",\"value\":\"rag-sample-app\"},{\"name\":\"cos-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-bucket-name\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cos-endpoint\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cra-bom-generate\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-deploy-analysis\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-vulnerability-scan\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"doi-environment\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"ibmcloud-api-key\"},{\"name\":\"doi-toolchain-id\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"environment-tag\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"event-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"opt-in-auto-close\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-cra-auto-remediation\",\"type\":\"text\",\"value\":\"true\"},{\"name\":\"opt-in-cra-auto-remediation-enabled-repos\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-cra-auto-remediation-force\",\"type\":\"text\",\"value\":\"true\"},{\"name\":\"opt-in-dynamic-api-scan\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-dynamic-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-dynamic-ui-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-gosec\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-sonar\",\"type\":\"text\",\"value\":\"true\"},{\"name\":\"peer-review-compliance\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"main\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"sonarqube-config\",\"type\":\"text\",\"value\":\"default\"}]}]"
+ },
{
"name": "cd_pipeline_properties",
- "value": "[{\"pipeline_id\":\"cd\",\"properties\":[{\"name\":\"app-concurrency\",\"type\":\"text\",\"value\":\"100\"},{\"name\":\"app-deployment-timeout\",\"type\":\"text\",\"value\":\"300\"},{\"name\":\"app-max-scale\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"app-min-scale\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"app-port\",\"type\":\"text\",\"value\":\"8080\"},{\"name\":\"app-visibility\",\"type\":\"text\",\"value\":\"public\"},{\"name\":\"change-request-id\",\"type\":\"text\",\"value\":\"notAvailable\"},{\"name\":\"code-engine-binding-resource-group\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-deployment-type\",\"type\":\"text\",\"value\":\"application\"},{\"name\":\"code-engine-project\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-resource-group\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-signing-certificate\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-bucket-name\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cos-endpoint\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cpu\",\"type\":\"text\",\"value\":\"0.25\"},{\"name\":\"doi-environment\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"doi-toolchain-id\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"emergency-label\",\"type\":\"text\",\"value\":\"EMERGENCY\"},{\"name\":\"env-from-configmaps\",\"type\":\"text\",\"value\":\"app.properties\"},{\"name\":\"env-from-secrets\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"ephemeral-storage\",\"type\":\"text\",\"value\":\"0.4G\"},{\"name\":\"event-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"force-redeploy\",\"type\":\"single_select\",\"value\":\"false\",\"enum\":\"[false,true]\"},{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"job-instances\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"job-maxexecutiontime\",\"type\":\"text\",\"value\":\"7200\"},{\"name\":\"job-retrylimit\",\"type\":\"text\",\"value\":\"3\"},{\"name\":\"memory\",\"type\":\"text\",\"value\":\"0.5G\"},{\"name\":\"merge-cra-sbom\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"peer-review-collection\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"peer-review-compliance\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"pre-prod-evidence-collection\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"remove-unspecified-references-to-configuration-resources\",\"type\":\"text\",\"value\":\"false\"},{\"name\":\"service-bindings\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"source-environment\",\"type\":\"text\",\"value\":\"master\"},{\"name\":\"target-environment\",\"type\":\"text\",\"value\":\"prod\"},{\"name\":\"target-environment-detail\",\"type\":\"text\",\"value\":\"Productiontargetenvironment\"},{\"name\":\"target-environment-purpose\",\"type\":\"text\",\"value\":\"production\"},{\"name\":\"version\",\"type\":\"text\",\"value\":\"v1\"}]}]"
+ "value": "[{\"pipeline_id\":\"cd\",\"properties\":[{\"name\":\"app-concurrency\",\"type\":\"text\",\"value\":\"100\"},{\"name\":\"app-deployment-timeout\",\"type\":\"text\",\"value\":\"300\"},{\"name\":\"app-max-scale\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"app-min-scale\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"app-port\",\"type\":\"text\",\"value\":\"8080\"},{\"name\":\"app-visibility\",\"type\":\"text\",\"value\":\"public\"},{\"name\":\"change-request-id\",\"type\":\"text\",\"value\":\"notAvailable\"},{\"name\":\"code-engine-binding-resource-group\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-deployment-type\",\"type\":\"text\",\"value\":\"application\"},{\"name\":\"code-engine-project\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-resource-group\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-signing-certificate\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-bucket-name\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cos-endpoint\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cpu\",\"type\":\"text\",\"value\":\"0.25\"},{\"name\":\"doi-environment\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"doi-toolchain-id\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"emergency-label\",\"type\":\"text\",\"value\":\"EMERGENCY\"},{\"name\":\"env-from-configmaps\",\"type\":\"text\",\"value\":\"app.properties\"},{\"name\":\"env-from-secrets\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"ephemeral-storage\",\"type\":\"text\",\"value\":\"0.4G\"},{\"name\":\"event-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"force-redeploy\",\"type\":\"single_select\",\"value\":\"false\",\"enum\":\"[false,true]\"},{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"job-instances\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"job-maxexecutiontime\",\"type\":\"text\",\"value\":\"7200\"},{\"name\":\"job-retrylimit\",\"type\":\"text\",\"value\":\"3\"},{\"name\":\"memory\",\"type\":\"text\",\"value\":\"0.5G\"},{\"name\":\"merge-cra-sbom\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"peer-review-collection\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"peer-review-compliance\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"main\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"pre-prod-evidence-collection\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"remove-unspecified-references-to-configuration-resources\",\"type\":\"text\",\"value\":\"false\"},{\"name\":\"service-bindings\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"source-environment\",\"type\":\"text\",\"value\":\"master\"},{\"name\":\"target-environment\",\"type\":\"text\",\"value\":\"prod\"},{\"name\":\"target-environment-detail\",\"type\":\"text\",\"value\":\"Productiontargetenvironment\"},{\"name\":\"target-environment-purpose\",\"type\":\"text\",\"value\":\"production\"},{\"name\":\"version\",\"type\":\"text\",\"value\":\"v1\"}]}]"
},
{
"name": "ci_pipeline_properties",
- "value": "[{\"pipeline_id\":\"ci\",\"properties\":[{\"name\":\"app-concurrency\",\"type\":\"text\",\"value\":\"100\"},{\"name\":\"app-deployment-timeout\",\"type\":\"text\",\"value\":\"300\"},{\"name\":\"app-max-scale\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"app-min-scale\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"app-port\",\"type\":\"text\",\"value\":\"8080\"},{\"name\":\"app-visibility\",\"type\":\"text\",\"value\":\"public\"},{\"name\":\"code-engine-binding-resource-group\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-build-size\",\"type\":\"text\",\"value\":\"large\"},{\"name\":\"code-engine-build-strategy\",\"type\":\"text\",\"value\":\"dockerfile\"},{\"name\":\"code-engine-build-timeout\",\"type\":\"text\",\"value\":\"1200\"},{\"name\":\"code-engine-build-use-native-docker\",\"type\":\"text\",\"value\":\"false\"},{\"name\":\"code-engine-deployment-type\",\"type\":\"text\",\"value\":\"application\"},{\"name\":\"code-engine-project\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-resource-group\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-wait-timeout\",\"type\":\"text\",\"value\":\"1300\"},{\"name\":\"context-dir\",\"type\":\"text\",\"value\":\".\"},{\"name\":\"cos-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-bucket-name\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cos-endpoint\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cpu\",\"type\":\"text\",\"value\":\"0.25\"},{\"name\":\"cra-bom-generate\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-deploy-analysis\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-generate-cyclonedx-format\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"cra-vulnerability-scan\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"custom_image_tag\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"dev-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-environment\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"doi-toolchain-id\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"env-from-configmaps\",\"type\":\"text\",\"value\":\"app.properties\"},{\"name\":\"env-from-secrets\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"ephemeral-storage\",\"type\":\"text\",\"value\":\"0.4G\"},{\"name\":\"event-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"image-name\",\"type\":\"text\",\"value\":\"code-engine-rag-app\"},{\"name\":\"job-instances\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"job-maxexecutiontime\",\"type\":\"text\",\"value\":\"7200\"},{\"name\":\"job-retrylimit\",\"type\":\"text\",\"value\":\"3\"},{\"name\":\"memory\",\"type\":\"text\",\"value\":\"0.5G\"},{\"name\":\"opt-in-dynamic-api-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-dynamic-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-dynamic-ui-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-gosec\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-sonar\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"peer-review-compliance\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"print-code-signing-certificate\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"registry-domain\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"registry-namespace\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"registry-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"remove-unspecified-references-to-configuration-resources\",\"type\":\"text\",\"value\":\"false\"},{\"name\":\"service-bindings\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"signing-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"sonarqube-config\",\"type\":\"text\",\"value\":\"default\"},{\"name\":\"source\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"version\",\"type\":\"text\",\"value\":\"v1\"}]},{\"pipeline_id\":\"pr\",\"properties\":[{\"name\":\"cra-bom-generate\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-deploy-analysis\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-vulnerability-scan\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"1\"}]}]"
+ "value": "[{\"pipeline_id\":\"ci\",\"properties\":[{\"name\":\"app-concurrency\",\"type\":\"text\",\"value\":\"100\"},{\"name\":\"app-deployment-timeout\",\"type\":\"text\",\"value\":\"300\"},{\"name\":\"app-max-scale\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"app-min-scale\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"app-port\",\"type\":\"text\",\"value\":\"8080\"},{\"name\":\"app-visibility\",\"type\":\"text\",\"value\":\"public\"},{\"name\":\"code-engine-binding-resource-group\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-build-size\",\"type\":\"text\",\"value\":\"large\"},{\"name\":\"code-engine-build-strategy\",\"type\":\"text\",\"value\":\"dockerfile\"},{\"name\":\"code-engine-build-timeout\",\"type\":\"text\",\"value\":\"1200\"},{\"name\":\"code-engine-build-use-native-docker\",\"type\":\"text\",\"value\":\"false\"},{\"name\":\"code-engine-deployment-type\",\"type\":\"text\",\"value\":\"application\"},{\"name\":\"code-engine-project\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-resource-group\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-engine-wait-timeout\",\"type\":\"text\",\"value\":\"1300\"},{\"name\":\"context-dir\",\"type\":\"text\",\"value\":\".\"},{\"name\":\"cos-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-bucket-name\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cos-endpoint\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cpu\",\"type\":\"text\",\"value\":\"0.25\"},{\"name\":\"cra-bom-generate\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-deploy-analysis\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-generate-cyclonedx-format\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"cra-vulnerability-scan\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"custom_image_tag\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"dev-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-environment\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"doi-toolchain-id\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"env-from-configmaps\",\"type\":\"text\",\"value\":\"app.properties\"},{\"name\":\"env-from-secrets\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"ephemeral-storage\",\"type\":\"text\",\"value\":\"0.4G\"},{\"name\":\"event-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"image-name\",\"type\":\"text\",\"value\":\"code-engine-rag-app\"},{\"name\":\"job-instances\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"job-maxexecutiontime\",\"type\":\"text\",\"value\":\"7200\"},{\"name\":\"job-retrylimit\",\"type\":\"text\",\"value\":\"3\"},{\"name\":\"memory\",\"type\":\"text\",\"value\":\"0.5G\"},{\"name\":\"opt-in-dynamic-api-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-dynamic-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-dynamic-ui-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-gosec\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-sonar\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"peer-review-compliance\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"main\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"print-code-signing-certificate\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"registry-domain\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"registry-namespace\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"registry-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"remove-unspecified-references-to-configuration-resources\",\"type\":\"text\",\"value\":\"false\"},{\"name\":\"service-bindings\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"signing-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"sonarqube-config\",\"type\":\"text\",\"value\":\"default\"},{\"name\":\"source\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"version\",\"type\":\"text\",\"value\":\"v1\"}]},{\"pipeline_id\":\"pr\",\"properties\":[{\"name\":\"cra-bom-generate\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-deploy-analysis\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-vulnerability-scan\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"main\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"1\"}]}]"
},
{
"name": "ci_signing_key_secret_name",
@@ -663,7 +667,7 @@
},
{
"name": "Workload - Sample RAG App Configuration",
- "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b5a04043-66e7-4a69-9aad-52653cfb7df5-global",
+ "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8fedf6b3-56a4-42e0-87a4-b767eadbe6c8-global",
"inputs": [
{
"name": "toolchain_region",
diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json
index 5c439a0..1ba98ab 100644
--- a/solutions/standard/stack_definition.json
+++ b/solutions/standard/stack_definition.json
@@ -236,7 +236,7 @@
},
{
"name": "Essential Security - Logging Monitoring Activity Tracker",
- "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.157744e4-5ef1-4e0f-9b8b-8b49b2ee8bb2-global",
+ "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.5036a34b-9925-4d06-932b-c22ce63d3fdf-global",
"inputs": [
{
"name": "ibmcloud_api_key",
@@ -701,6 +701,14 @@
"name": "add_container_name_suffix",
"value": true
},
+ {
+ "name": "cc_pipeline_properties",
+ "value": "[{\"pipeline_id\":\"cc\",\"properties\":[{\"name\":\"app-name\",\"type\":\"text\",\"value\":\"rag-sample-app\"},{\"name\":\"cos-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-bucket-name\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cos-endpoint\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cra-bom-generate\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-deploy-analysis\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-vulnerability-scan\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"doi-environment\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"ibmcloud-api-key\"},{\"name\":\"doi-toolchain-id\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"environment-tag\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"event-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"opt-in-auto-close\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-cra-auto-remediation\",\"type\":\"text\",\"value\":\"true\"},{\"name\":\"opt-in-cra-auto-remediation-enabled-repos\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-cra-auto-remediation-force\",\"type\":\"text\",\"value\":\"true\"},{\"name\":\"opt-in-dynamic-api-scan\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-dynamic-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-dynamic-ui-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-gosec\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-sonar\",\"type\":\"text\",\"value\":\"true\"},{\"name\":\"peer-review-compliance\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"sonarqube-config\",\"type\":\"text\",\"value\":\"default\"}]}]"
+ },
+ {
+ "name": "cd_pipeline_properties",
+ "value": "[{\"pipeline_id\":\"cd\",\"properties\":[{\"name\":\"change-request-id\",\"type\":\"text\",\"value\":\"notAvailable\"},{\"name\":\"cluster\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cluster-namespace\",\"type\":\"text\",\"value\":\"prod\"},{\"name\":\"cluster-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"code-signing-certificate\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-bucket-name\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cos-endpoint\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-environment\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"doi-toolchain-id\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"emergency-label\",\"type\":\"text\",\"value\":\"EMERGENCY\"},{\"name\":\"event-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"force-redeploy\",\"type\":\"single_select\",\"value\":\"false\",\"enum\":\"[false,true]\"},{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"merge-cra-sbom\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"peer-review-compliance\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"main\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"pre-prod-evidence-collection\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"satellite-cluster-group\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"source-environment\",\"type\":\"text\",\"value\":\"master\"},{\"name\":\"target-environment\",\"type\":\"text\",\"value\":\"prod\"},{\"name\":\"target-environment-detail\",\"type\":\"text\",\"value\":\"Production target environment\"},{\"name\":\"target-environment-purpose\",\"type\":\"text\",\"value\":\"production\"},{\"name\":\"version\",\"type\":\"text\",\"value\":\"v1\"}]}]"
+ },
{
"name": "ci_pipeline_properties",
"value": "[{\"pipeline_id\":\"ci\",\"properties\":[{\"name\":\"cluster-name\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cos-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cos-bucket-name\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cos-endpoint\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"cra-bom-generate\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-deploy-analysis\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-generate-cyclonedx-format\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"cra-vulnerability-scan\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"custom_image_tag\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"dev-cluster-namespace\",\"type\":\"text\",\"value\":\"dev\"},{\"name\":\"dev-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-environment\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"doi-ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"doi-toolchain-id\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"event-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"opt-in-dynamic-api-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-dynamic-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-dynamic-ui-scan\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"opt-in-gosec\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"opt-in-sonar\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"peer-review-compliance\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"print-code-signing-certificate\",\"type\":\"text\",\"value\":\"1\"},{\"name\":\"registry-namespace\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"registry-region\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"signing-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"0\"},{\"name\":\"sonarqube-config\",\"type\":\"text\",\"value\":\"default\"},{\"name\":\"version\",\"type\":\"text\",\"value\":\"v1\"}]},{\"pipeline_id\":\"pr\",\"properties\":[{\"name\":\"git-token\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"cra-bom-generate\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-deploy-analysis\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"cra-vulnerability-scan\",\"type\":\"single_select\",\"value\":\"1\",\"enum\":\"[0,1]\"},{\"name\":\"ibmcloud-api-key\",\"type\":\"secure\",\"value\":\"\"},{\"name\":\"pipeline-config\",\"type\":\"text\",\"value\":\".pipeline-config.yaml\"},{\"name\":\"pipeline-config-branch\",\"type\":\"text\",\"value\":\"\"},{\"name\":\"pipeline-debug\",\"type\":\"single_select\",\"value\":\"0\",\"enum\":\"[0,1]\"},{\"name\":\"slack-notifications\",\"type\":\"text\",\"value\":\"1\"}]}]"
@@ -709,7 +717,7 @@
},
{
"name": "Workload - Sample RAG App Configuration",
- "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b5a04043-66e7-4a69-9aad-52653cfb7df5-global",
+ "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8fedf6b3-56a4-42e0-87a4-b767eadbe6c8-global",
"inputs": [
{
"name": "toolchain_region",