fix: pipeline properties fix for roks + reorder CE members (#70)

terraform-ibm-modules · Oct 1, 2024 · 84853b5 · 84853b5
1 parent 2fc8334
commit 84853b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json
@@ -572,7 +572,7 @@
       ]
     },
     {
-      "name": "Workload - Application Lifecycle Management",
+      "name": "Workload - DevSecOps Application Lifecycle Management",
       "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.72e3b0a3-9d6c-4b85-be2c-baed5a5ac732-global",
       "inputs": [
         {
@@ -687,11 +687,11 @@
         },
         {
           "name": "cd_pipeline_id",
-          "value": "ref:../Workload - Application Lifecycle Management/outputs/cd_pipeline_id"
+          "value": "ref:../Workload - DevSecOps Application Lifecycle Management/outputs/cd_pipeline_id"
         },
         {
           "name": "ci_pipeline_id",
-          "value": "ref:../Workload - Application Lifecycle Management/outputs/ci_pipeline_id"
+          "value": "ref:../Workload - DevSecOps Application Lifecycle Management/outputs/ci_pipeline_id"
         },
         {
           "name": "watson_machine_learning_instance_guid",

diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json
@@ -700,6 +700,10 @@
         {
           "name": "add_container_name_suffix",
           "value": true
+        },
+        {
+          "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\"}]}]"
         }
       ]
     },