MI-85: Use stdio inherit for preserving cli colours

Author: kai-nguyen-aligent

bin/index.ts

@@ -68,14 +68,16 @@ async function main() {
             `${baseCommand} --stage ${stage} --aws-profile ${profile} ${verbose}`
         );
 
-        await runCLICommand(commands);
+        await runCLICommand(commands, bitbucketCloneDir);
 
         deploymentStatus = true;
     } catch (error) {
-        console.error(logSymbols.error, chalk.red(error));
+        if (error instanceof Error) {
+            console.error(logSymbols.error, chalk.redBright(error.message));
+        }
         console.error(
             logSymbols.error,
-            chalk.red(
+            chalk.redBright(
                 'Deployment failed! Please check the logs for more details.'
             )
         );

lib/cmd.ts

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import * as cp from 'child_process';
+import { SpawnOptions, spawn } from 'child_process';
 import logSymbols from 'log-symbols';
 import { env } from './env';
 
@@ -20,29 +20,22 @@ function splitCommandAndArgs(command: string): Command {
 // Wrap spawn in a promise
 function asyncSpawn(
     command: string,
-    args?: ReadonlyArray<string>,
-    options?: cp.SpawnOptionsWithoutStdio
+    args: ReadonlyArray<string>,
+    options: SpawnOptions
 ): Promise<number | null> {
     return new Promise(function (resolve, reject) {
         if (env.debug) {
             const commandWithArgs = `${command} ${args?.join(' ')}`;
             const optionsStr = JSON.stringify(options);
             console.log(
-                chalk.white(
-                    `ℹ️ Executing command: ${commandWithArgs} with options: ${optionsStr}`
+                logSymbols.info,
+                chalk.whiteBright(
+                    `Executing command: ${commandWithArgs} with options: ${optionsStr}`
                 )
             );
         }
 
-        const process = cp.spawn(command, args, options);
-
-        process.stdout.on('data', (data) => {
-            console.log(logSymbols.info, chalk.white(data.toString()));
-        });
-
-        process.stderr.on('data', (data) => {
-            console.error(logSymbols.error, chalk.red(data.toString()));
-        });
+        const process = spawn(command, args, options);
 
         process.on('exit', function (code) {
             if (code !== 0) reject(code);
@@ -57,15 +50,23 @@ function asyncSpawn(
 
 function runCommandString(
     command: string,
-    workDir?: string
+    workDir: string
 ): Promise<number | null> {
-    console.log(logSymbols.info, chalk.white(`Running command: ${command}`));
+    console.log(
+        logSymbols.info,
+        chalk.whiteBright(`Running command: ${command}`)
+    );
     const cmd = splitCommandAndArgs(command);
-    return asyncSpawn(cmd.command, cmd.args, { cwd: workDir });
+    return asyncSpawn(cmd.command, cmd.args, {
+        cwd: workDir,
+        stdio: ['pipe', 'inherit', 'inherit'],
+    });
 }
 
-export async function runCLICommand(commandStr: Array<string>) {
-    const workDir = process.env.BITBUCKET_CLONE_DIR;
+export async function runCLICommand(
+    commandStr: Array<string>,
+    workDir: string
+) {
     console.log(logSymbols.info, chalk.white(`Running commands in ${workDir}`));
 
     for (const cmd of commandStr) {

lib/findServerlessYaml.ts

@@ -8,7 +8,7 @@ export async function findServerlessYaml(basePath: string) {
 
     console.log(
         logSymbols.info,
-        chalk.white(
+        chalk.whiteBright(
             `Fetching serverless configuration with pattern ${globPattern}`
         )
     );
@@ -18,7 +18,7 @@ export async function findServerlessYaml(basePath: string) {
     for (const file of files) {
         console.log(
             logSymbols.info,
-            chalk.white('Found serverless.yml at: ', file)
+            chalk.whiteBright('Found serverless.yml at:', file)
         );
     }
 

lib/injectCfnRole.ts

@@ -19,7 +19,7 @@ export async function injectCfnRole(
         if (env.debug) {
             console.log(
                 logSymbols.info,
-                chalk.white(JSON.stringify(serverless, null, 2))
+                chalk.whiteBright(JSON.stringify(serverless, null, 2))
             );
         }
 
@@ -35,22 +35,22 @@ export async function injectCfnRole(
         ) {
             console.warn(
                 logSymbols.warning,
-                chalk.yellow(
+                chalk.yellowBright(
                     'It looks like serverless.yaml already defines a CFN role.'
                 )
             );
 
             if (cfnRole) {
                 console.log(
                     logSymbols.warning,
-                    chalk.yellow(
+                    chalk.yellowBright(
                         'This can now be injected by deploy pipe and removed from serverless.yaml'
                     )
                 );
             } else {
                 console.log(
                     logSymbols.warning,
-                    chalk.yellow(
+                    chalk.yellowBright(
                         `This will be overwritten with ${cfnRole}. Please remove from serverless.yaml`
                     )
                 );
@@ -63,7 +63,7 @@ export async function injectCfnRole(
         if (!cfnRole) {
             console.warn(
                 logSymbols.warning,
-                chalk.yellow('Please provide a CFN role for deployment')
+                chalk.yellowBright('Please provide a CFN role for deployment')
             );
             return;
         }
@@ -79,10 +79,12 @@ export async function injectCfnRole(
         await writeFile(serverlessYamlPath, modifiedYaml, 'utf8');
         console.log(
             logSymbols.success,
-            chalk.green(`Injected CFN role ${cfnRole} at ${serverlessYamlPath}`)
+            chalk.greenBright(
+                `Injected CFN role ${cfnRole} at ${serverlessYamlPath}`
+            )
         );
     } catch (error) {
-        console.error(logSymbols.error, chalk.red(error));
+        console.error(logSymbols.error, chalk.redBright(error));
         throw new Error(
             `Failed to inject CFN role at path ${serverlessYamlPath}`
         );

lib/serverlessProjectType.ts

@@ -7,6 +7,7 @@ export async function isNxServerlessMonorepo(directoryPath: string) {
 
     const serverlessYmlFiles = await glob('serverless.{yml,yaml}', {
         cwd: directoryPath,
+        ignore: ['**/node_modules/**'],
     });
     const isServerlessFileExist = serverlessYmlFiles.length > 0;
 

lib/uploadDeploymentBadge.ts

@@ -29,7 +29,10 @@ export async function uploadDeploymentBadge(
 
     try {
         if (!uploadBadge) {
-            console.log(logSymbols.info, chalk.white('Skipping badge upload'));
+            console.log(
+                logSymbols.info,
+                chalk.whiteBright('Skipping badge upload')
+            );
             return statusCode;
         }
 
@@ -59,7 +62,7 @@ export async function uploadDeploymentBadge(
         );
         return statusCode;
     } catch (error) {
-        console.error(logSymbols.error, chalk.red(error));
+        console.error(logSymbols.error, chalk.redBright(error));
         return 1;
     }
 }