hereya-cli 0.19.0 → 0.20.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.19.0 linux-x64 node-v22.13.1
+hereya-cli/0.20.0 linux-x64 node-v22.13.1
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -74,7 +74,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -99,7 +99,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/bootstrap/index.ts)_
 
 ## `hereya deploy`
 
@@ -121,7 +121,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -144,7 +144,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -175,7 +175,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/env/index.ts)_
 
 ## `hereya env set [NAME]`
 
@@ -202,7 +202,7 @@ EXAMPLES
   $ hereya env set FOO -v bar -w dev
 ```
 
-_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/env/set/index.ts)_
+_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/env/set/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -248,7 +248,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/init/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -272,7 +272,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -298,7 +298,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -323,7 +323,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -345,7 +345,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -368,7 +368,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -388,7 +388,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -408,7 +408,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -434,7 +434,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace env set`
 
@@ -458,7 +458,7 @@ EXAMPLES
   $ hereya workspace env set -w my-workspace -n myVar -v my-value -i aws -s
 ```
 
-_See code: [src/commands/workspace/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/workspace/env/set/index.ts)_
+_See code: [src/commands/workspace/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/workspace/env/set/index.ts)_
 
 ## `hereya workspace env unset`
 
@@ -479,7 +479,7 @@ EXAMPLES
   $ hereya workspace env unset -w my-workspace -n myVar
 ```
 
-_See code: [src/commands/workspace/env/unset/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/workspace/env/unset/index.ts)_
+_See code: [src/commands/workspace/env/unset/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -506,7 +506,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -533,5 +533,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.19.0/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.20.0/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/commands/run/index.js

@@ -52,13 +52,13 @@ export default class Run extends Command {
         const { cmd } = args;
         const cmdArgs = argv.slice(1);
         this.log(`Running command "${cmd} ${cmdArgs.join(' ')}" ...`);
-        const res = runShell(cmd, cmdArgs, {
+        const res = await runShell(cmd, cmdArgs, {
             directory: projectRootDir,
             env: { ...process.env, ...env },
             stdio: 'inherit',
         });
         if (res.status !== 0) {
-            this.error(res.error?.message || 'Command failed');
+            this.error(res.stderr || 'Command failed');
         }
     }
 }

package/dist/iac/cdk.js

@@ -7,7 +7,7 @@ export class Cdk {
     async apply(input) {
         try {
             const { remainingEnv, serializedParameters, serializedWorkspaceEnv } = await this.serializedParametersAndContext(input);
-            runShell('npx', [
+            await runShell('npx', [
                 'aws-cdk', 'deploy', '--require-approval', 'never', ...serializedWorkspaceEnv, ...serializedParameters,
             ], {
                 directory: input.pkgPath,
@@ -27,7 +27,7 @@ export class Cdk {
         try {
             const env = await this.getEnv(input.id);
             const { remainingEnv, serializedParameters, serializedWorkspaceEnv } = await this.serializedParametersAndContext(input);
-            runShell('npx', [
+            await runShell('npx', [
                 'aws-cdk', 'destroy', '--force', ...serializedWorkspaceEnv, ...serializedParameters
             ], {
                 directory: input.pkgPath,
@@ -52,14 +52,14 @@ export class Cdk {
     }
     async getParameterNames(input) {
         const workDir = input.pkgPath;
-        runShell('npm', ['install'], { directory: workDir });
-        runShell('npx', [
+        await runShell('npm', ['install'], { directory: workDir });
+        await runShell('npx', [
             'aws-cdk', 'synth',
         ], {
             directory: workDir,
             env: { ...input.env, ...input.parameters },
         });
-        const result = runShell('npx', [
+        const result = await runShell('npx', [
             'aws-cdk', 'synth',
         ], {
             directory: workDir,

package/dist/iac/terraform.js

@@ -27,7 +27,7 @@ export class Terraform {
         }
         try {
             const terraform = await this.getTerraformBinary();
-            runShell(terraform, ['init'], {
+            await runShell(terraform, ['init'], {
                 directory: input.pkgPath,
                 env: {
                     ...mapObject(input.env ?? {}, (key, value) => [
@@ -41,7 +41,7 @@ export class Terraform {
                     ]),
                 },
             });
-            runShell(terraform, ['apply', '-auto-approve'], {
+            await runShell(terraform, ['apply', '-auto-approve'], {
                 directory: input.pkgPath,
                 env: {
                     ...mapObject(input.env ?? {}, (key, value) => [
@@ -71,7 +71,7 @@ export class Terraform {
     async destroy(input) {
         const terraform = await this.getTerraformBinary();
         try {
-            runShell(terraform, ['init'], {
+            await runShell(terraform, ['init'], {
                 directory: input.pkgPath,
                 env: {
                     ...mapObject(input.env ?? {}, (key, value) => [
@@ -86,7 +86,7 @@ export class Terraform {
                 },
             });
             const env = await this.getEnv(input.pkgPath);
-            runShell(terraform, ['destroy', '-auto-approve'], {
+            await runShell(terraform, ['destroy', '-auto-approve'], {
                 directory: input.pkgPath,
                 env: {
                     ...mapObject(input.env ?? {}, (key, value) => [
@@ -170,11 +170,11 @@ export class Terraform {
     }
     async getEnv(pkgPath) {
         const terraform = await this.getTerraformBinary();
-        const resourceOut = runShell(terraform, ['output', '--json'], {
+        const resourceOut = await runShell(terraform, ['output', '--json'], {
             directory: pkgPath,
             stdio: 'pipe',
         });
-        let outStr = resourceOut.output.toString().trim();
+        let outStr = resourceOut.stdout.toString().trim();
         const start = outStr.indexOf('{');
         const end = outStr.lastIndexOf('}');
         outStr = outStr.slice(start, end + 1);

package/dist/infrastructure/aws.js

@@ -15,7 +15,7 @@ export class AwsInfrastructure {
         const stsClient = new STSClient({});
         const { Account: accountId } = await stsClient.send(new GetCallerIdentityCommand({}));
         const region = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;
-        runShell('npx', ['cdk', 'bootstrap', `aws://${accountId}/${region}`]);
+        await runShell('npx', ['cdk', 'bootstrap', `aws://${accountId}/${region}`]);
         const bootstrapPackage = 'hereya/bootstrap-aws-stack';
         const output = await provisionPackage({ package: bootstrapPackage });
         if (!output.success) {

package/dist/lib/shell.d.ts

@@ -1,10 +1,22 @@
-import { spawnSync, StdioOptions } from 'node:child_process';
+import { SpawnOptions } from 'node:child_process';
 export declare function setDebug(value: boolean): void;
 export declare function isDebug(): boolean;
-export type RunShellOptions = {
+export interface RunShellOptions {
     directory?: string;
     env?: NodeJS.ProcessEnv;
-    stdio?: StdioOptions;
-};
-export declare function runShell(cmd: string, args: string[], options?: RunShellOptions): ReturnType<typeof spawnSync>;
+    logger?: typeof defaultLogger;
+    stdio?: SpawnOptions['stdio'];
+}
+export declare function runShell(cmd: string, args: string[], options?: RunShellOptions): Promise<{
+    pid: number;
+    signal: NodeJS.Signals | null;
+    status: null | number;
+    stderr: string;
+    stdout: string;
+}>;
 export declare function delay(ms: number): Promise<unknown> | undefined;
+export declare const defaultLogger: {
+    debug(message: string): void;
+    error(message: string): void;
+    info(message: string): void;
+};

package/dist/lib/shell.js

@@ -1,4 +1,4 @@
-import { spawnSync } from 'node:child_process';
+import { spawn } from 'node:child_process';
 let debug = false;
 export function setDebug(value) {
     debug = value;
@@ -6,20 +6,62 @@ export function setDebug(value) {
 export function isDebug() {
     return debug;
 }
-export function runShell(cmd, args, options = {}) {
-    // Run the command
-    const result = spawnSync(cmd, args, {
-        cwd: options.directory ?? process.cwd(),
-        encoding: 'utf8',
-        env: { ...process.env, ...options.env },
-        shell: true,
-        stdio: options.stdio ?? (isDebug() ? 'inherit' : 'ignore'),
+// Asynchronous runShell that logs output using the provided logger.
+export async function runShell(cmd, args, options = {}) {
+    return new Promise((resolve, reject) => {
+        // Use the provided logger or default to console.log
+        const logger = options.logger ?? defaultLogger;
+        const spawnOptions = {
+            cwd: options.directory ?? process.cwd(),
+            env: { ...process.env, ...options.env },
+            shell: true,
+            // If not explicitly set, use 'inherit' when debugging, or 'pipe' otherwise
+            stdio: options.stdio ?? (isDebug() ? 'inherit' : 'pipe'),
+        };
+        logger.debug(`Executing: ${cmd} ${args.join(' ')}`);
+        const child = spawn(cmd, args, spawnOptions);
+        // Buffers to accumulate output from the process.
+        let stdout = '';
+        let stderr = '';
+        if (child.stdout) {
+            child.stdout.on('data', (data) => {
+                const chunk = data.toString();
+                stdout += chunk;
+                logger.info(chunk);
+            });
+        }
+        if (child.stderr) {
+            child.stderr.on('data', (data) => {
+                const chunk = data.toString();
+                stderr += chunk;
+                logger.info(chunk);
+            });
+        }
+        child.on('error', (err) => {
+            logger.error(`Error: ${err.message}`);
+            reject(err);
+        });
+        let exitCode = null;
+        let exitSignal = null;
+        child.on('exit', (code, signal) => {
+            exitCode = code;
+            exitSignal = signal;
+        });
+        child.on('close', () => {
+            if (exitCode !== 0) {
+                const errorMsg = `Command "${cmd} ${args.join(' ')}" failed with exit code "${exitCode}"`;
+                logger.error(errorMsg);
+                return reject(new Error(errorMsg));
+            }
+            resolve({
+                pid: child.pid,
+                signal: exitSignal,
+                status: exitCode,
+                stderr,
+                stdout,
+            });
+        });
     });
-    // Throw an error if the command failed
-    if (result.status !== 0) {
-        throw new Error(`Command "${cmd} ${args.join(' ')}" failed with exit code "${result.status}"`);
-    }
-    return result;
 }
 export function delay(ms) {
     if (process.env.NODE_ENV === 'test') {
@@ -29,3 +71,20 @@ export function delay(ms) {
         setTimeout(resolve, ms);
     });
 }
+export const defaultLogger = {
+    debug(message) {
+        if (isDebug()) {
+            console.debug(message);
+        }
+    },
+    error(message) {
+        if (isDebug()) {
+            console.error(message);
+        }
+    },
+    info(message) {
+        if (isDebug()) {
+            console.info(message);
+        }
+    },
+};

package/oclif.manifest.json

@@ -954,5 +954,5 @@
       ]
     }
   },
-  "version": "0.19.0"
+  "version": "0.20.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hereya-cli",
   "description": "Infrastructure as Package",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "author": "Hereya Developers",
   "bin": {
     "hereya": "./bin/run.js"