@ibm-cloud/cd-tools 1.15.21 → 1.15.23

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

@@ -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
                 });
             }
@@ -279,9 +283,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.21",
+  "version": "1.15.23",
   "description": "Tools and utilities for the IBM Cloud Continuous Delivery service and resources",
   "repository": {
     "type": "git",