hereya-cli 0.32.0 → 0.34.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.32.0 linux-x64 node-v22.14.0
+hereya-cli/0.34.0 linux-x64 node-v22.14.0
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -84,7 +84,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -109,7 +109,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/bootstrap/index.ts)_
 
 ## `hereya config get-backend`
 
@@ -126,7 +126,7 @@ EXAMPLES
   $ hereya config get-backend
 ```
 
-_See code: [src/commands/config/get-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/config/get-backend/index.ts)_
+_See code: [src/commands/config/get-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/config/get-backend/index.ts)_
 
 ## `hereya config use-backend TYPE`
 
@@ -148,7 +148,7 @@ EXAMPLES
   $ hereya config use-backend local
 ```
 
-_See code: [src/commands/config/use-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/config/use-backend/index.ts)_
+_See code: [src/commands/config/use-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/config/use-backend/index.ts)_
 
 ## `hereya deploy`
 
@@ -173,7 +173,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -200,7 +200,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -231,7 +231,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/env/index.ts)_
 
 ## `hereya env set [NAME]`
 
@@ -258,7 +258,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.32.0/src/commands/env/set/index.ts)_
+_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/env/set/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -304,7 +304,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/init/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -331,7 +331,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -357,7 +357,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -382,7 +382,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -407,7 +407,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -434,7 +434,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -457,7 +457,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -477,7 +477,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -503,7 +503,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace env set`
 
@@ -527,7 +527,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.32.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.34.0/src/commands/workspace/env/set/index.ts)_
 
 ## `hereya workspace env unset`
 
@@ -548,7 +548,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.32.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.34.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -575,7 +575,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace list`
 
@@ -592,7 +592,7 @@ EXAMPLES
   $ hereya workspace list
 ```
 
-_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/workspace/list/index.ts)_
+_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/workspace/list/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -619,5 +619,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.32.0/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.34.0/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/backend/file-storage/s3.js

@@ -111,7 +111,7 @@ export class S3FileStorage {
      * Build an S3 key by joining the basePath with a relative path.
      */
     getKey(relativePath) {
-        return [this.basePath, relativePath].join('/');
+        return [this.basePath, relativePath].filter(Boolean).join('/');
     }
     /**
      * Helper to convert a Readable stream into a string.

package/dist/backend/index.d.ts

@@ -1,5 +1,6 @@
 import { Backend } from './common.js';
 export declare function getBackend(): Promise<Backend>;
+export declare function setBackendType(type: BackendType): void;
 export declare enum BackendType {
     Local = "local",
     S3 = "s3"

package/dist/backend/index.js

@@ -3,11 +3,12 @@ import { getCurrentBackendType } from './config.js';
 import { LocalFileBackend } from './local.js';
 import { S3FileBackend } from './s3.js';
 let backend;
+let currentBackendType;
 export async function getBackend() {
     if (backend) {
         return backend;
     }
-    const backendType = await getCurrentBackendType();
+    const backendType = currentBackendType ?? await getCurrentBackendType();
     switch (backendType) {
         case BackendType.Local: {
             backend = new LocalFileBackend();
@@ -27,6 +28,9 @@ export async function getBackend() {
     }
     return backend;
 }
+export function setBackendType(type) {
+    currentBackendType = type;
+}
 export var BackendType;
 (function (BackendType) {
     BackendType["Local"] = "local";

package/dist/commands/bootstrap/index.js

@@ -1,28 +1,36 @@
 import { Args, Command, Flags } from '@oclif/core';
+import { BackendType, setBackendType } from '../../backend/index.js';
 import { getInfrastructure } from '../../infrastructure/index.js';
+import { getLogPath, setDebug } from '../../lib/log.js';
 export default class Bootstrap extends Command {
     static args = {
         infrastructureType: Args.string({
             description: 'infrastructure to bootstrap. Options are local, aws',
-            required: true
-        })
+            required: true,
+        }),
     };
     static description = 'Install necessary resources for hereya operations in an infrastructure.';
-    static examples = [
-        '<%= config.bin %> <%= command.id %> aws',
-        '<%= config.bin %> <%= command.id %> local'
-    ];
+    static examples = ['<%= config.bin %> <%= command.id %> aws', '<%= config.bin %> <%= command.id %> local'];
     static flags = {
         force: Flags.boolean({ char: 'f', description: 'redeploy hereya resources if already deployed' }),
     };
     async run() {
         const { args, flags } = await this.parse(Bootstrap);
+        setBackendType(BackendType.Local);
         const infrastructure$ = getInfrastructure({ type: args.infrastructureType });
         if (!infrastructure$.supported) {
             this.warn(infrastructure$.reason);
             return;
         }
         const { infrastructure } = infrastructure$;
-        await infrastructure.bootstrap({ force: flags.force });
+        setDebug(true);
+        try {
+            await infrastructure.bootstrap({ force: flags.force });
+        }
+        catch (error) {
+            this.error(`${error.message}
+
+See ${getLogPath()} for more details`);
+        }
     }
 }

package/dist/commands/unbootstrap/index.js

@@ -1,5 +1,7 @@
 import { Args, Command, Flags } from '@oclif/core';
+import { BackendType, setBackendType } from '../../backend/index.js';
 import { getInfrastructure } from '../../infrastructure/index.js';
+import { getLogPath, setDebug } from '../../lib/log.js';
 export default class Unbootstrap extends Command {
     static args = {
         infrastructureType: Args.string({
@@ -17,12 +19,21 @@ export default class Unbootstrap extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(Unbootstrap);
+        setBackendType(BackendType.Local);
         const infrastructure$ = getInfrastructure({ type: args.infrastructureType });
         if (!infrastructure$.supported) {
             this.warn(infrastructure$.reason);
             return;
         }
         const { infrastructure } = infrastructure$;
-        await infrastructure.unbootstrap({ force: flags.force });
+        setDebug(true);
+        try {
+            await infrastructure.unbootstrap({ force: flags.force });
+        }
+        catch (error) {
+            this.error(`${error.message}
+      
+      See ${getLogPath()} for more details`);
+        }
     }
 }

package/dist/infrastructure/aws-config.js

@@ -1,12 +1,23 @@
 import { GetParameterCommand, SSMClient } from '@aws-sdk/client-ssm';
+import { getDefaultLogger } from '../lib/log.js';
 const configKey = '/hereya-bootstrap/config';
 export function getAwsConfigKey() {
     return configKey;
 }
 export async function getAwsConfig() {
-    const ssmClient = new SSMClient({});
-    const ssmParameter = await ssmClient.send(new GetParameterCommand({
-        Name: configKey,
-    }));
-    return JSON.parse(ssmParameter.Parameter?.Value ?? '{}');
+    try {
+        const ssmClient = new SSMClient({});
+        const ssmParameter = await ssmClient.send(new GetParameterCommand({
+            Name: configKey,
+        }));
+        return JSON.parse(ssmParameter.Parameter?.Value ?? '{}');
+    }
+    catch (error) {
+        getDefaultLogger().error(`Could not get AWS config: ${error.message}`);
+        return {
+            backendBucket: '',
+            terraformStateBucketName: '',
+            terraformStateLockTableName: '',
+        };
+    }
 }

package/dist/infrastructure/aws.js

@@ -192,8 +192,13 @@ export class AwsInfrastructure {
         return { success: true, value: parameter.Parameter.ARN };
     }
     async unbootstrap(_) {
+        const bootstrapPackage = 'hereya/bootstrap-aws-stack';
+        const output = await destroyPackage({ package: bootstrapPackage });
+        if (!output.success) {
+            throw new Error(output.reason);
+        }
         const ssmClient = new SSMClient({});
-        const key = '/hereya-bootstrap/config';
+        const key = getAwsConfigKey();
         try {
             await ssmClient.send(new DeleteParameterCommand({
                 Name: key,
@@ -202,11 +207,6 @@ export class AwsInfrastructure {
         catch (error) {
             console.log(`Could not delete parameter "${key}": ${error.message}. Continuing with unbootstrap...`);
         }
-        const bootstrapPackage = 'hereya/bootstrap-aws-stack';
-        const output = await destroyPackage({ package: bootstrapPackage });
-        if (!output.success) {
-            throw new Error(output.reason);
-        }
     }
     async undeploy(input) {
         input.parameters = {

package/oclif.manifest.json

@@ -1063,5 +1063,5 @@
       ]
     }
   },
-  "version": "0.32.0"
+  "version": "0.34.0"
 }

package/package.json

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