hereya-cli 0.15.1 → 0.17.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.15.1 linux-x64 node-v22.13.0
+hereya-cli/0.17.0 linux-x64 node-v22.13.1
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -34,6 +34,7 @@ USAGE
 * [`hereya deploy`](#hereya-deploy)
 * [`hereya down`](#hereya-down)
 * [`hereya env [NAME]`](#hereya-env-name)
+* [`hereya env set [NAME]`](#hereya-env-set-name)
 * [`hereya help [COMMAND]`](#hereya-help-command)
 * [`hereya init PROJECT`](#hereya-init-project)
 * [`hereya remove PACKAGE`](#hereya-remove-package)
@@ -73,7 +74,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -98,7 +99,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/bootstrap/index.ts)_
 
 ## `hereya deploy`
 
@@ -120,7 +121,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -143,7 +144,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -174,7 +175,32 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/env/index.ts)_
+
+## `hereya env set [NAME]`
+
+Set an environment variable for the current workspace
+
+```
+USAGE
+  $ hereya env set [NAME] -v <value> [--chdir <value>] [-w <value>]
+
+ARGUMENTS
+  NAME  name of the environment variable to set
+
+FLAGS
+  -v, --value=<value>      (required) value of the environment variable
+  -w, --workspace=<value>  name of the workspace to print the env vars for
+      --chdir=<value>      project root directory
+
+DESCRIPTION
+  Set an environment variable for the current workspace
+
+EXAMPLES
+  $ hereya env set FOO bar
+```
+
+_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/env/set/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -220,7 +246,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/init/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -244,7 +270,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -270,7 +296,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -295,7 +321,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -317,7 +343,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -340,7 +366,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -360,7 +386,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -380,7 +406,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -406,7 +432,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace env set`
 
@@ -430,7 +456,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.15.1/src/commands/workspace/env/set/index.ts)_
+_See code: [src/commands/workspace/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/workspace/env/set/index.ts)_
 
 ## `hereya workspace env unset`
 
@@ -451,7 +477,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.15.1/src/commands/workspace/env/unset/index.ts)_
+_See code: [src/commands/workspace/env/unset/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -459,7 +485,7 @@ Add a package to the workspace.
 
 ```
 USAGE
-  $ hereya workspace install PACKAGE -w <value> [-p <value>] [-f <value>]
+  $ hereya workspace install PACKAGE -w <value> [--debug] [-p <value>] [-f <value>]
 
 ARGUMENTS
   PACKAGE  The package to add. Packages are gitHub repositories. Use the format owner/repository
@@ -469,6 +495,7 @@ FLAGS
   -p, --parameter=<value>...    [default: ] parameter for the package, in the form of 'key=value'. Can be specified
                                 multiple times.
   -w, --workspace=<value>       (required) name of the workspace to add the package to
+      --debug                   enable debug mode
 
 DESCRIPTION
   Add a package to the workspace.
@@ -477,7 +504,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -485,7 +512,7 @@ Remove a package from a workspace.
 
 ```
 USAGE
-  $ hereya workspace uninstall PACKAGE -w <value> [-p <value>] [-f <value>]
+  $ hereya workspace uninstall PACKAGE -w <value> [--debug] [-p <value>] [-f <value>]
 
 ARGUMENTS
   PACKAGE  The package to remove. Packages are gitHub repositories. Use the format owner/repository
@@ -495,6 +522,7 @@ FLAGS
   -p, --parameter=<value>...    [default: ] parameter for the package, in the form of 'key=value'. Can be specified
                                 multiple times.
   -w, --workspace=<value>       (required) name of the workspace to remove the package from
+      --debug                   enable debug mode
 
 DESCRIPTION
   Remove a package from a workspace.
@@ -503,5 +531,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.15.1/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.17.0/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/commands/add/index.js

@@ -42,6 +42,12 @@ export default class Add extends Command {
             {
                 async task(ctx, task) {
                     return task.newListr([
+                        {
+                            async task(ctx) {
+                                ctx.package = args.package;
+                                ctx.userSpecifiedParameters = flags.parameter;
+                            },
+                        },
                         {
                             async task(ctx) {
                                 const configManager = getConfigManager();
@@ -71,10 +77,10 @@ export default class Add extends Command {
                         },
                         {
                             async task(ctx) {
-                                const userSpecifiedParameters = arrayOfStringToObject(flags.parameter);
+                                const userSpecifiedParameters = arrayOfStringToObject(ctx.userSpecifiedParameters);
                                 const parameterManager = getParameterManager();
                                 const parametersOutput = await parameterManager.getPackageParameters({
-                                    package: args.package,
+                                    package: ctx.package,
                                     projectRootDir,
                                     userSpecifiedParameters,
                                     workspace: ctx.configOutput.config.workspace,
@@ -88,7 +94,7 @@ export default class Add extends Command {
                             async task(ctx) {
                                 const provisionOutput = await provisionPackage({
                                     env: ctx.workspaceEnvOutput.env,
-                                    package: args.package,
+                                    package: ctx.package,
                                     parameters: ctx.parametersOutput.parameters,
                                     project: ctx.configOutput.config.project,
                                     skipDeploy: true,
@@ -120,7 +126,7 @@ export default class Add extends Command {
                                 const configManager = getConfigManager();
                                 await configManager.addPackage({
                                     metadata: ctx.provisionOutput.metadata,
-                                    package: args.package,
+                                    package: ctx.package,
                                     projectRootDir,
                                 });
                                 await delay(500);
@@ -135,7 +141,7 @@ export default class Add extends Command {
                                 await backend.saveState(newConfig);
                                 const parameterManager = getParameterManager();
                                 const { filePath, saved } = await parameterManager.savePackageParameters({
-                                    package: args.package,
+                                    package: ctx.package,
                                     parameters: ctx.parametersOutput.parameters,
                                     projectRootDir,
                                     workspace: ctx.configOutput.config.workspace,

package/dist/commands/env/set/index.d.ts

@@ -0,0 +1,14 @@
+import { Command } from '@oclif/core';
+export default class EnvSet extends Command {
+    static args: {
+        name: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static description: string;
+    static examples: string[];
+    static flags: {
+        chdir: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        value: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        workspace: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/env/set/index.js

@@ -0,0 +1,54 @@
+import { Args, Command, Flags } from '@oclif/core';
+import path from 'node:path';
+import { getConfigManager } from '../../../lib/config/index.js';
+import { getAnyPath } from '../../../lib/filesystem.js';
+import { load, save } from '../../../lib/yaml-utils.js';
+export default class EnvSet extends Command {
+    static args = {
+        name: Args.string({ description: 'name of the environment variable to set' }),
+    };
+    static description = 'Set an environment variable for the current workspace';
+    static examples = ['<%= config.bin %> <%= command.id %> FOO bar'];
+    static flags = {
+        chdir: Flags.string({
+            description: 'project root directory',
+            required: false,
+        }),
+        value: Flags.string({
+            char: 'v',
+            description: 'value of the environment variable',
+            required: true,
+        }),
+        workspace: Flags.string({
+            char: 'w',
+            description: 'name of the workspace to print the env vars for',
+            required: false,
+        }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(EnvSet);
+        if (!args.name) {
+            this.error('Missing required argument name');
+        }
+        const projectRootDir = flags.chdir || process.env.HEREYA_PROJECT_ROOT_DIR;
+        const configManager = getConfigManager();
+        const loadConfigOutput = await configManager.loadConfig({ projectRootDir });
+        if (!loadConfigOutput.found) {
+            this.warn(`Project not initialized. Run 'hereya init' first.`);
+            return;
+        }
+        const rootDir = projectRootDir ?? process.cwd();
+        const candidates = flags.workspace ? [
+            path.join(rootDir, 'hereyastaticenv', `env.${flags.workspace}.yaml`),
+            path.join(rootDir, 'hereyastaticenv', `env.${flags.workspace}.yml`),
+        ] : [
+            path.join(rootDir, 'hereyastaticenv', `env.yaml`),
+            path.join(rootDir, 'hereyastaticenv', `env.yml`),
+        ];
+        const envFile = await getAnyPath(...candidates);
+        const { data: env, } = await load(envFile);
+        env[args.name] = flags.value;
+        await save(env, envFile);
+        this.log(`Environment variable ${args.name} set to ${flags.value} in ${envFile}`);
+    }
+}

package/dist/commands/remove/index.js

@@ -34,6 +34,11 @@ export default class Remove extends Command {
             {
                 async task(ctx, task) {
                     return task.newListr([
+                        {
+                            async task(ctx) {
+                                ctx.package = args.package;
+                            },
+                        },
                         {
                             async task(ctx) {
                                 const configManager = getConfigManager();
@@ -43,8 +48,8 @@ export default class Remove extends Command {
                                 }
                                 ctx.configOutput = loadConfigOutput;
                                 const { config } = loadConfigOutput;
-                                if (!(args.package in (config.packages ?? {})) && !(args.package in (config.deploy ?? {}))) {
-                                    throw new Error(`Package ${args.package} not found in project.`);
+                                if (!(ctx.package in (config.packages ?? {})) && !(ctx.package in (config.deploy ?? {}))) {
+                                    throw new Error(`Package ${ctx.package} not found in the project.`);
                                 }
                                 await delay(500);
                             },
@@ -69,7 +74,7 @@ export default class Remove extends Command {
                             async task(ctx) {
                                 const parameterManager = getParameterManager();
                                 const parametersOutput = await parameterManager.getPackageParameters({
-                                    package: args.package,
+                                    package: ctx.package,
                                     projectRootDir,
                                     workspace: ctx.configOutput.config.workspace,
                                 });
@@ -82,7 +87,7 @@ export default class Remove extends Command {
                             async task(ctx) {
                                 const destroyOutput = await destroyPackage({
                                     env: ctx.workspaceEnvOutput.env,
-                                    package: args.package,
+                                    package: ctx.package,
                                     parameters: ctx.parametersOutput.parameters,
                                     project: ctx.configOutput.config.project,
                                     skipDeploy: true,
@@ -113,7 +118,7 @@ export default class Remove extends Command {
                                 const configManager = getConfigManager();
                                 await configManager.removePackage({
                                     metadata: ctx.destroyOutput.metadata,
-                                    package: args.package,
+                                    package: ctx.package,
                                     projectRootDir,
                                 });
                                 await delay(500);

package/dist/commands/workspace/install/index.d.ts

@@ -6,6 +6,7 @@ export default class WorkspaceInstall extends Command {
     static description: string;
     static examples: string[];
     static flags: {
+        debug: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         parameter: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[], import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'parameter-file': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         workspace: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;

package/dist/commands/workspace/install/index.js

@@ -1,24 +1,28 @@
 import { Args, Command, Flags } from '@oclif/core';
+import { Listr, ListrLogLevels, ListrLogger } from 'listr2';
 import { getBackend } from '../../../backend/index.js';
 import { provisionPackage } from '../../../infrastructure/index.js';
 import { arrayOfStringToObject } from '../../../lib/object-utils.js';
+import { delay, setDebug } from '../../../lib/shell.js';
 import { load } from '../../../lib/yaml-utils.js';
 export default class WorkspaceInstall extends Command {
     static args = {
         package: Args.string({
             description: 'The package to add. Packages are gitHub repositories. Use the format owner/repository',
-            required: true
+            required: true,
         }),
     };
     static description = 'Add a package to the workspace.';
-    static examples = [
-        '<%= config.bin %> <%= command.id %> hereya/aws-cognito',
-    ];
+    static examples = ['<%= config.bin %> <%= command.id %> hereya/aws-cognito'];
     static flags = {
+        debug: Flags.boolean({
+            default: false,
+            description: 'enable debug mode',
+        }),
         parameter: Flags.string({
             char: 'p',
             default: [],
-            description: 'parameter for the package, in the form of \'key=value\'. Can be specified multiple times.',
+            description: "parameter for the package, in the form of 'key=value'. Can be specified multiple times.",
             multiple: true,
         }),
         'parameter-file': Flags.string({
@@ -33,42 +37,84 @@ export default class WorkspaceInstall extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(WorkspaceInstall);
-        const backend = await getBackend();
-        const loadWorkspaceOutput = await backend.getWorkspace(flags.workspace);
-        if (!loadWorkspaceOutput.found || loadWorkspaceOutput.hasError) {
-            this.error(`Workspace ${flags.workspace} not found`);
-        }
-        const parametersInCmdline = arrayOfStringToObject(flags.parameter);
-        let parametersFromFile = {};
-        if (flags['parameter-file']) {
-            const { data, found } = await load(flags['parameter-file']);
-            if (!found) {
-                this.error(`Parameter file ${flags['parameter-file']} not found`);
-            }
-            parametersFromFile = data;
-        }
-        const parameters = { ...parametersFromFile, ...parametersInCmdline };
-        const provisionOutput = await provisionPackage({
-            package: args.package,
-            parameters,
-            workspace: flags.workspace,
-        });
-        if (!provisionOutput.success) {
-            this.error(provisionOutput.reason);
+        setDebug(flags.debug);
+        const myLogger = new ListrLogger({ useIcons: false });
+        const task = new Listr([
+            {
+                async task(ctx, task) {
+                    return task.newListr([
+                        {
+                            async task(ctx) {
+                                const backend = await getBackend();
+                                const loadWorkspaceOutput = await backend.getWorkspace(flags.workspace);
+                                if (!loadWorkspaceOutput.found || loadWorkspaceOutput.hasError) {
+                                    throw new Error(`Workspace ${flags.workspace} not found`);
+                                }
+                                ctx.workspace = loadWorkspaceOutput;
+                                await delay(500);
+                            },
+                            title: `Loading workspace ${flags.workspace}`,
+                        },
+                        {
+                            async task(ctx) {
+                                const parametersInCmdline = arrayOfStringToObject(flags.parameter);
+                                let parametersFromFile = {};
+                                if (flags['parameter-file']) {
+                                    const { data, found } = await load(flags['parameter-file']);
+                                    if (!found) {
+                                        throw new Error(`Parameter file ${flags['parameter-file']} not found`);
+                                    }
+                                    parametersFromFile = data;
+                                }
+                                const parameters = { ...parametersFromFile, ...parametersInCmdline };
+                                ctx.parameters = parameters;
+                                await delay(500);
+                            },
+                            title: 'Resolving parameters',
+                        },
+                        {
+                            async task(ctx) {
+                                const provisionOutput = await provisionPackage({
+                                    package: args.package,
+                                    parameters: ctx.parameters,
+                                    workspace: flags.workspace,
+                                });
+                                if (!provisionOutput.success) {
+                                    throw new Error(provisionOutput.reason);
+                                }
+                                ctx.provisionOutput = provisionOutput;
+                            },
+                            title: 'Provisioning package',
+                        },
+                        {
+                            async task(ctx) {
+                                const { env, metadata } = ctx.provisionOutput;
+                                const backend = await getBackend();
+                                const output = await backend.addPackageToWorkspace({
+                                    env,
+                                    infra: metadata.infra,
+                                    package: args.package,
+                                    parameters: ctx.parameters,
+                                    workspace: flags.workspace,
+                                });
+                                if (!output.success) {
+                                    throw new Error(output.reason);
+                                }
+                            },
+                            title: 'Saving exported environment variables to workspace',
+                        },
+                    ]);
+                },
+                title: `Installing ${args.package} into workspace ${flags.workspace}`,
+            },
+        ], { concurrent: false });
+        try {
+            await task.run();
+            myLogger.log(ListrLogLevels.COMPLETED, `Package ${args.package} installed successfully into workspace ${flags.workspace}`);
         }
-        const { env, metadata } = provisionOutput;
-        this.log(`Package ${args.package} provisioned successfully`);
-        this.log(`Saving exported environment variables to workspace ${flags.workspace}...`);
-        const output = await backend.addPackageToWorkspace({
-            env,
-            infra: metadata.infra,
-            package: args.package,
-            parameters,
-            workspace: flags.workspace,
-        });
-        if (!output.success) {
-            this.error(output.reason);
+        catch (error) {
+            myLogger.log(ListrLogLevels.FAILED, error);
+            this.error(error.message);
         }
-        this.log(`Package ${args.package} added to workspace ${flags.workspace}`);
     }
 }

package/dist/commands/workspace/uninstall/index.d.ts

@@ -6,6 +6,7 @@ export default class WorkspaceUninstall extends Command {
     static description: string;
     static examples: string[];
     static flags: {
+        debug: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         parameter: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[], import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         'parameter-file': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         workspace: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;

package/dist/commands/workspace/uninstall/index.js

@@ -1,24 +1,28 @@
 import { Args, Command, Flags } from '@oclif/core';
+import { Listr, ListrLogLevels, ListrLogger } from 'listr2';
 import { getBackend } from '../../../backend/index.js';
 import { destroyPackage } from '../../../infrastructure/index.js';
 import { arrayOfStringToObject } from '../../../lib/object-utils.js';
+import { delay, setDebug } from '../../../lib/shell.js';
 import { load } from '../../../lib/yaml-utils.js';
 export default class WorkspaceUninstall extends Command {
     static args = {
         package: Args.string({
             description: 'The package to remove. Packages are gitHub repositories. Use the format owner/repository',
-            required: true
+            required: true,
         }),
     };
     static description = 'Remove a package from a workspace.';
-    static examples = [
-        '<%= config.bin %> <%= command.id %> hereya/aws-cognito',
-    ];
+    static examples = ['<%= config.bin %> <%= command.id %> hereya/aws-cognito'];
     static flags = {
+        debug: Flags.boolean({
+            default: false,
+            description: 'enable debug mode',
+        }),
         parameter: Flags.string({
             char: 'p',
             default: [],
-            description: 'parameter for the package, in the form of \'key=value\'. Can be specified multiple times.',
+            description: "parameter for the package, in the form of 'key=value'. Can be specified multiple times.",
             multiple: true,
         }),
         'parameter-file': Flags.string({
@@ -33,53 +37,90 @@ export default class WorkspaceUninstall extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(WorkspaceUninstall);
-        const backend = await getBackend();
-        const loadWorkspaceOutput = await backend.getWorkspace(flags.workspace);
-        if (!loadWorkspaceOutput.found) {
-            this.error(`Workspace ${flags.workspace} not found`);
-        }
-        if (loadWorkspaceOutput.hasError) {
-            this.error(`Error loading workspace ${flags.workspace}: ${loadWorkspaceOutput.error}`);
-        }
-        const { workspace } = loadWorkspaceOutput;
-        if (!(args.package in (workspace.packages ?? {}))) {
-            this.log(`Package ${args.package} not found in workspace ${flags.workspace}`);
-            return;
-        }
-        const parametersInCmdline = arrayOfStringToObject(flags.parameter);
-        let parametersFromFile = {};
-        if (flags['parameter-file']) {
-            const { data, found } = await load(flags['parameter-file']);
-            if (!found) {
-                this.error(`Parameter file ${flags['parameter-file']} not found`);
-            }
-            parametersFromFile = data;
-        }
-        const parameters = {
-            ...workspace.packages?.[args.package].parameters,
-            ...parametersFromFile,
-            ...parametersInCmdline
-        };
-        const destroyOutput = await destroyPackage({
-            package: args.package,
-            parameters,
-            workspace: flags.workspace,
-        });
-        if (!destroyOutput.success) {
-            this.error(destroyOutput.reason);
+        setDebug(flags.debug);
+        const myLogger = new ListrLogger({ useIcons: false });
+        const task = new Listr([
+            {
+                async task(ctx, task) {
+                    return task.newListr([
+                        {
+                            async task(ctx) {
+                                const backend = await getBackend();
+                                const loadWorkspaceOutput = await backend.getWorkspace(flags.workspace);
+                                if (!loadWorkspaceOutput.found || loadWorkspaceOutput.hasError) {
+                                    throw new Error(`Workspace ${flags.workspace} not found`);
+                                }
+                                if (!(args.package in (loadWorkspaceOutput.workspace.packages ?? {}))) {
+                                    throw new Error(`Package ${args.package} not found in workspace ${flags.workspace}`);
+                                }
+                                ctx.workspace = loadWorkspaceOutput;
+                                await delay(500);
+                            },
+                            title: `Loading workspace ${flags.workspace}`,
+                        },
+                        {
+                            async task(ctx) {
+                                const parametersInCmdline = arrayOfStringToObject(flags.parameter);
+                                let parametersFromFile = {};
+                                if (flags['parameter-file']) {
+                                    const { data, found } = await load(flags['parameter-file']);
+                                    if (!found) {
+                                        throw new Error(`Parameter file ${flags['parameter-file']} not found`);
+                                    }
+                                    parametersFromFile = data;
+                                }
+                                const parameters = {
+                                    ...ctx.workspace.workspace.packages?.[args.package].parameters,
+                                    ...parametersFromFile,
+                                    ...parametersInCmdline,
+                                };
+                                ctx.parameters = parameters;
+                                await delay(500);
+                            },
+                            title: 'Resolving parameters',
+                        },
+                        {
+                            async task(ctx) {
+                                const destroyOutput = await destroyPackage({
+                                    package: args.package,
+                                    parameters: ctx.parameters,
+                                    workspace: flags.workspace,
+                                });
+                                if (!destroyOutput.success) {
+                                    throw new Error(destroyOutput.reason);
+                                }
+                                ctx.destroyOutput = destroyOutput;
+                            },
+                            title: 'Destroying package',
+                        },
+                        {
+                            async task(ctx) {
+                                const { env, metadata } = ctx.destroyOutput;
+                                const backend = await getBackend();
+                                const output = await backend.removePackageFromWorkspace({
+                                    env,
+                                    infra: metadata.infra,
+                                    package: args.package,
+                                    workspace: flags.workspace,
+                                });
+                                if (!output.success) {
+                                    throw new Error(output.reason);
+                                }
+                            },
+                            title: 'Removing exported environment variables from workspace',
+                        },
+                    ]);
+                },
+                title: `Uninstalling package ${args.package} from workspace ${flags.workspace}`,
+            },
+        ]);
+        try {
+            await task.run();
+            myLogger.log(ListrLogLevels.COMPLETED, `Package ${args.package} uninstalled successfully from workspace ${flags.workspace}`);
         }
-        const { env, metadata } = destroyOutput;
-        this.log(`Package ${args.package} removed successfully`);
-        this.log(`removing exported environment variables from workspace ${flags.workspace}...`);
-        const output = await backend.removePackageFromWorkspace({
-            env,
-            infra: metadata.infra,
-            package: args.package,
-            workspace: flags.workspace,
-        });
-        if (!output.success) {
-            this.error(output.reason);
+        catch (error) {
+            myLogger.log(ListrLogLevels.FAILED, error);
+            this.error(error.message);
         }
-        this.log(`Package ${args.package} removed from workspace ${flags.workspace}`);
     }
 }

package/dist/lib/env/index.d.ts

@@ -4,6 +4,7 @@ export declare class EnvManager {
     getProjectEnv(input: GetProjectEnvInput): Promise<GetProjectEnvOutput>;
     removeProjectEnv(input: RemoveEnvInput): Promise<void>;
     private getEnvPath;
+    private getUserEnvPaths;
 }
 export declare const envManager: EnvManager;
 export declare function getEnvManager(): EnvManager;

package/dist/lib/env/index.js

@@ -6,19 +6,24 @@ export class EnvManager {
     async addProjectEnv(input) {
         const envPath = await this.getEnvPath(input);
         const { data: existingEnv } = await load(envPath);
-        const newEnv = Object.fromEntries(Object.entries(input.env)
-            .map(([key, value]) => [key, `${input.infra}:${value}`]));
+        const newEnv = Object.fromEntries(Object.entries(input.env).map(([key, value]) => [key, `${input.infra}:${value}`]));
         const finalEnv = { ...existingEnv, ...newEnv };
         await save(finalEnv, envPath);
     }
     async getProjectEnv(input) {
         const envPath = await this.getEnvPath(input);
         const { data: env, found } = await load(envPath);
-        if (!found) {
-            return { env: {} };
+        let resolvedEnv = {};
+        if (found) {
+            resolvedEnv = await resolveEnvValues(env, { markSecret: input.markSecret });
+        }
+        const userEnvs = await this.getUserEnvPaths(input).then((paths) => Promise.all(paths.map((path) => load(path))));
+        let userMergedEnv = {};
+        for (const { data } of userEnvs) {
+            userMergedEnv = { ...userMergedEnv, ...data };
         }
-        const resolvedEnv = await resolveEnvValues(env, { markSecret: input.markSecret });
-        return { env: resolvedEnv };
+        const finalEnv = { ...resolvedEnv, ...userMergedEnv };
+        return { env: finalEnv };
     }
     async removeProjectEnv(input) {
         const envPath = await this.getEnvPath(input);
@@ -27,14 +32,19 @@ export class EnvManager {
             return;
         }
         const envKeysToRemove = Object.keys(input.env);
-        const finalEnv = Object.fromEntries(Object
-            .entries(existingEnv)
-            .filter(([key]) => !envKeysToRemove.includes(key)));
+        const finalEnv = Object.fromEntries(Object.entries(existingEnv).filter(([key]) => !envKeysToRemove.includes(key)));
         await save(finalEnv, envPath);
     }
     async getEnvPath(input) {
         return getAnyPath(path.join(input.projectRootDir ?? process.cwd(), '.hereya', `env.${input.workspace}.yaml`), path.join(input.projectRootDir ?? process.cwd(), '.hereya', `env.${input.workspace}.yml`));
     }
+    async getUserEnvPaths(input) {
+        const paths = await Promise.all([
+            getAnyPath(path.join(input.projectRootDir ?? process.cwd(), 'hereyastaticenv', `env.yaml`), path.join(input.projectRootDir ?? process.cwd(), 'hereyastaticenv', `env.yml`)),
+            getAnyPath(path.join(input.projectRootDir ?? process.cwd(), 'hereyastaticenv', `env.${input.workspace}.yaml`), path.join(input.projectRootDir ?? process.cwd(), 'hereyastaticenv', `env.${input.workspace}.yml`)),
+        ]);
+        return paths;
+    }
 }
 export const envManager = new EnvManager();
 export function getEnvManager() {

package/oclif.manifest.json

@@ -54,6 +54,45 @@
         "index.js"
       ]
     },
+    "bootstrap": {
+      "aliases": [],
+      "args": {
+        "infrastructureType": {
+          "description": "infrastructure to bootstrap. Options are local, aws",
+          "name": "infrastructureType",
+          "required": true
+        }
+      },
+      "description": "Install necessary resources for hereya operations in an infrastructure.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> aws",
+        "<%= config.bin %> <%= command.id %> local"
+      ],
+      "flags": {
+        "force": {
+          "char": "f",
+          "description": "redeploy hereya resources if already deployed",
+          "name": "force",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "bootstrap",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "bootstrap",
+        "index.js"
+      ]
+    },
     "deploy": {
       "aliases": [],
       "args": {},
@@ -102,45 +141,6 @@
         "index.js"
       ]
     },
-    "bootstrap": {
-      "aliases": [],
-      "args": {
-        "infrastructureType": {
-          "description": "infrastructure to bootstrap. Options are local, aws",
-          "name": "infrastructureType",
-          "required": true
-        }
-      },
-      "description": "Install necessary resources for hereya operations in an infrastructure.",
-      "examples": [
-        "<%= config.bin %> <%= command.id %> aws",
-        "<%= config.bin %> <%= command.id %> local"
-      ],
-      "flags": {
-        "force": {
-          "char": "f",
-          "description": "redeploy hereya resources if already deployed",
-          "name": "force",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "bootstrap",
-      "pluginAlias": "hereya-cli",
-      "pluginName": "hereya-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "bootstrap",
-        "index.js"
-      ]
-    },
     "down": {
       "aliases": [],
       "args": {},
@@ -540,6 +540,63 @@
         "index.js"
       ]
     },
+    "env:set": {
+      "aliases": [],
+      "args": {
+        "name": {
+          "description": "name of the environment variable to set",
+          "name": "name"
+        }
+      },
+      "description": "Set an environment variable for the current workspace",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> FOO bar"
+      ],
+      "flags": {
+        "chdir": {
+          "description": "project root directory",
+          "name": "chdir",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "value": {
+          "char": "v",
+          "description": "value of the environment variable",
+          "name": "value",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "workspace": {
+          "char": "w",
+          "description": "name of the workspace to print the env vars for",
+          "name": "workspace",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "env:set",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "env",
+        "set",
+        "index.js"
+      ]
+    },
     "workspace:create": {
       "aliases": [],
       "args": {
@@ -666,6 +723,12 @@
         "<%= config.bin %> <%= command.id %> hereya/aws-cognito"
       ],
       "flags": {
+        "debug": {
+          "description": "enable debug mode",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "parameter": {
           "char": "p",
           "description": "parameter for the package, in the form of 'key=value'. Can be specified multiple times.",
@@ -724,6 +787,12 @@
         "<%= config.bin %> <%= command.id %> hereya/aws-cognito"
       ],
       "flags": {
+        "debug": {
+          "description": "enable debug mode",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "parameter": {
           "char": "p",
           "description": "parameter for the package, in the form of 'key=value'. Can be specified multiple times.",
@@ -768,26 +837,51 @@
         "index.js"
       ]
     },
-    "workspace:env:unset": {
+    "workspace:env:set": {
       "aliases": [],
       "args": {},
-      "description": "unset an env var for a workspace",
+      "description": "set an env var for a workspace",
       "examples": [
-        "<%= config.bin %> <%= command.id %> -w my-workspace -n myVar"
+        "<%= config.bin %> <%= command.id %> -w my-workspace -n myVar -v my-value -i aws -s"
       ],
       "flags": {
+        "infra": {
+          "char": "i",
+          "description": "the infrastructure to store the env var in",
+          "name": "infra",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "name": {
           "char": "n",
-          "description": "name of the env var to unset",
+          "description": "name of the env var to set",
           "name": "name",
           "required": true,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "sensitive": {
+          "char": "s",
+          "description": "whether the env var is sensitive",
+          "name": "sensitive",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "value": {
+          "char": "v",
+          "description": "value of the env var to set",
+          "name": "value",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "workspace": {
           "char": "w",
-          "description": "name of the workspace to unset an env var for",
+          "description": "name of the workspace to set an env var for",
           "name": "workspace",
           "required": true,
           "hasDynamicHelp": false,
@@ -797,7 +891,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "workspace:env:unset",
+      "id": "workspace:env:set",
       "pluginAlias": "hereya-cli",
       "pluginName": "hereya-cli",
       "pluginType": "core",
@@ -809,55 +903,30 @@
         "commands",
         "workspace",
         "env",
-        "unset",
+        "set",
         "index.js"
       ]
     },
-    "workspace:env:set": {
+    "workspace:env:unset": {
       "aliases": [],
       "args": {},
-      "description": "set an env var for a workspace",
+      "description": "unset an env var for a workspace",
       "examples": [
-        "<%= config.bin %> <%= command.id %> -w my-workspace -n myVar -v my-value -i aws -s"
+        "<%= config.bin %> <%= command.id %> -w my-workspace -n myVar"
       ],
       "flags": {
-        "infra": {
-          "char": "i",
-          "description": "the infrastructure to store the env var in",
-          "name": "infra",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "name": {
           "char": "n",
-          "description": "name of the env var to set",
+          "description": "name of the env var to unset",
           "name": "name",
           "required": true,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "sensitive": {
-          "char": "s",
-          "description": "whether the env var is sensitive",
-          "name": "sensitive",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "value": {
-          "char": "v",
-          "description": "value of the env var to set",
-          "name": "value",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "workspace": {
           "char": "w",
-          "description": "name of the workspace to set an env var for",
+          "description": "name of the workspace to unset an env var for",
           "name": "workspace",
           "required": true,
           "hasDynamicHelp": false,
@@ -867,7 +936,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "workspace:env:set",
+      "id": "workspace:env:unset",
       "pluginAlias": "hereya-cli",
       "pluginName": "hereya-cli",
       "pluginType": "core",
@@ -879,10 +948,10 @@
         "commands",
         "workspace",
         "env",
-        "set",
+        "unset",
         "index.js"
       ]
     }
   },
-  "version": "0.15.1"
+  "version": "0.17.0"
 }

package/package.json

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