@ibm-cloud/cd-tools 1.15.20 → 1.15.22

package/cmd/export-secrets.js

@@ -104,7 +104,7 @@ async function main(options) {
                         const pipelineBaseUrl = `https://${CLOUD_PLATFORM}/devops/pipelines/tekton/${tool.id}`
                         const pipelineData = await getPipelineData(bearer, tool.id, region);
 
-                        pipelineData?.properties.forEach((prop) => {
+                        pipelineData?.properties?.forEach((prop) => {
                             if (prop.type === 'secure' && !isSecretReference(prop.value) && prop.value.length > 0) {
                                 pipelineResults.push({
                                     'Pipeline ID': pipelineData.id,

package/cmd/utils/import-terraform.js

@@ -109,7 +109,7 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
             ];
 
 
-            pipelineData.definitions.forEach((def) => {
+            pipelineData.definitions?.forEach((def) => {
                 block = importBlock(`${pipelineData.id}/${def.id}`, 'definition', 'ibm_cd_tekton_pipeline_definition');
                 importBlocks.push(block);
 
@@ -119,7 +119,7 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
                 ];
             });
 
-            pipelineData.properties.forEach((prop) => {
+            pipelineData.properties?.forEach((prop) => {
                 block = importBlock(`${pipelineData.id}/${prop.name}`, prop.name, 'ibm_cd_tekton_pipeline_property');
                 importBlocks.push(block);
 
@@ -129,7 +129,7 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
                 ];
             });
 
-            pipelineData.triggers.forEach((trig) => {
+            pipelineData.triggers?.forEach((trig) => {
                 block = importBlock(`${pipelineData.id}/${trig.id}`, trig.name, 'ibm_cd_tekton_pipeline_trigger');
                 importBlocks.push(block);
 
@@ -140,7 +140,7 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
 
                 const triggerResName = block.name;
 
-                trig.properties.forEach((trigProp) => {
+                trig.properties?.forEach((trigProp) => {
                     block = importBlock(`${pipelineData.id}/${trig.id}/${trigProp.name}`, trigProp.name, 'ibm_cd_tekton_pipeline_trigger_property');
                     importBlocks.push(block);
 

package/cmd/utils/utils.js

@@ -10,6 +10,16 @@
 import * as readline from 'node:readline/promises';
 import { randomInt } from 'node:crypto';
 
+// Drain stdout before opening a readline prompt. When ora or console.log have
+// queued writes to a TTY, readline's cursor-management sequences can overwrite
+// the last printed lines if we don't wait for the stream to flush first.
+function drainStdout() {
+    return new Promise(resolve => {
+        if (!process.stdout.writableNeedDrain) return resolve();
+        process.stdout.once('drain', resolve);
+    });
+}
+
 import { logger } from './logger.js';
 import { VAULT_REGEX } from '../../config.js';
 
@@ -22,6 +32,7 @@ export function parseEnvVar(name) {
 };
 
 export async function promptUserYesNo(question) {
+    await drainStdout();
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout
@@ -48,6 +59,7 @@ export async function promptUserYesNo(question) {
 }
 
 export async function promptUserConfirmation(question, expectedAns, exitMsg) {
+    await drainStdout();
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout
@@ -70,6 +82,7 @@ export async function promptUserConfirmation(question, expectedAns, exitMsg) {
 }
 
 export async function promptUserInput(question, initialInput, validationFn) {
+    await drainStdout();
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,

package/cmd/utils/validate.js

@@ -224,9 +224,9 @@ async function validateTools(token, tcId, region, skipPrompt) {
                 });
 
                 pipelineData.triggers.forEach((trigger) => {
-                    if ((trigger?.secret?.type === 'token_matches' || trigger?.secret?.type === 'digest_matches') && !isSecretReference(trigger.secret.value) && trigger.secret.value.length > 0)
+                    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) => {
+                    trigger.properties?.forEach((prop) => {
                         if (prop.type === 'secure' && !isSecretReference(prop.value) && prop.value.length > 0)
                             secrets.push([trigger.name, 'properties', prop.name].join('.').replace(/\s+/g, '+'));
                     });
@@ -279,9 +279,9 @@ async function validateTools(token, tcId, region, skipPrompt) {
         logger.table(toolsWithHashedParams);
     }
 
-    if (!skipPrompt && (classicPipelines.length > 0 || hasInvalidConfig))
+    if (!skipPrompt && (classicPipelines.length > 0 || hasInvalidConfig)) {
         await promptUserConfirmation('Caution: The above tool(s) will not be properly configured post migration. Do you want to proceed?', 'yes', 'Toolchain migration cancelled.');
-
+    }
     return allTools.tools;
 }
 

package/package.json

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