@ibm-cloud/cd-tools 1.15.22 → 1.15.24

package/cmd/utils/terraform.js

@@ -255,8 +255,7 @@ async function setupTerraformFiles(config) {
         }
 
         if (isCompact || resourceName === 'ibm_cd_tekton_pipeline_trigger') {
-            // by default, disable triggers
-            if (disableTriggers && newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger']) {
+            if (newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger']) {
                 for (const key of Object.keys(newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger'])) {
                     // escape filter, which may contain reserved characters
                     const filterVal = newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger'][key]['filter'];
@@ -265,7 +264,7 @@ async function setupTerraformFiles(config) {
                     }
 
                     // disable all triggers (timed, git, webhooks) except manual triggers
-                    if (newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger'][key]['type'] != 'manual') {
+                    if (disableTriggers && newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger'][key]['type'] != 'manual') {
                         newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger'][key]['enabled'] = false;
                     }
                 }

package/cmd/utils/validate.js

@@ -218,16 +218,16 @@ async function validateTools(token, tcId, region, skipPrompt) {
             if (tool.tool_type_id === 'pipeline' && tool.parameters?.type === 'tekton') {   // Check for secrets in Tekton pipeline
                 const pipelineData = await getPipelineData(token, tool.id, region);
 
-                pipelineData.properties.forEach((prop) => {
-                    if (prop.type === 'secure' && !isSecretReference(prop.value) && prop.value.length > 0)
+                pipelineData.properties?.forEach((prop) => {
+                    if (prop.type === 'secure' && !isSecretReference(prop.value) && prop.value?.length > 0)
                         secrets.push(['properties', prop.name].join('.').replace(/\s+/g, '+'));
                 });
 
-                pipelineData.triggers.forEach((trigger) => {
+                pipelineData.triggers?.forEach((trigger) => {
                     if ((trigger?.secret?.type === 'token_matches' || trigger?.secret?.type === 'digest_matches') && !isSecretReference(trigger.secret?.value) && trigger.secret?.value?.length > 0)
                         secrets.push([trigger.name, trigger.secret.key_name].join('.').replace(/\s+/g, '+'));
                     trigger.properties?.forEach((prop) => {
-                        if (prop.type === 'secure' && !isSecretReference(prop.value) && prop.value.length > 0)
+                        if (prop.type === 'secure' && !isSecretReference(prop.value) && prop.value?.length > 0)
                             secrets.push([trigger.name, 'properties', prop.name].join('.').replace(/\s+/g, '+'));
                     });
                 });
@@ -239,10 +239,14 @@ async function validateTools(token, tcId, region, skipPrompt) {
                 });
             }
             if (secrets.length > 0) {
+                const MAX_SECRETS_DISPLAY = 10;
+                const displaySecrets = secrets.length > MAX_SECRETS_DISPLAY
+                    ? [...secrets.slice(0, MAX_SECRETS_DISPLAY), `... and ${secrets.length - MAX_SECRETS_DISPLAY} more`]
+                    : secrets;
                 toolsWithHashedParams.push({
                     tool_name: toolName,
                     type: tool.tool_type_id,
-                    secret_params: secrets,
+                    secret_params: displaySecrets,
                     url: toolUrl
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibm-cloud/cd-tools",
-  "version": "1.15.22",
+  "version": "1.15.24",
   "description": "Tools and utilities for the IBM Cloud Continuous Delivery service and resources",
   "repository": {
     "type": "git",