hereya-cli 0.18.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.18.0 linux-x64 node-v22.13.1
+hereya-cli/0.20.0 linux-x64 node-v22.13.1
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -56,7 +56,7 @@ Add a package to the project.
 
 ```
 USAGE
-  $ hereya add PACKAGE [--chdir <value>] [--debug] [-p <value>]
+  $ hereya add PACKAGE [--chdir <value>] [--debug] [-p <value>...]
 
 ARGUMENTS
   PACKAGE  The package to add. Packages are gitHub repositories. Use the format owner/repository
@@ -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.18.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.18.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.18.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.18.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.18.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.18.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]`
 
@@ -222,7 +222,7 @@ DESCRIPTION
   Display help for hereya.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.1.0/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.25/src/commands/help.ts)_
 
 ## `hereya init PROJECT`
 
@@ -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.18.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.18.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.18.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.18.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.18.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.18.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.18.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.18.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.18.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.18.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.18.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`
 
@@ -487,7 +487,7 @@ Add a package to the workspace.
 
 ```
 USAGE
-  $ hereya workspace install PACKAGE -w <value> [--debug] [-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
@@ -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.18.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`
 
@@ -514,7 +514,7 @@ Remove a package from a workspace.
 
 ```
 USAGE
-  $ hereya workspace uninstall PACKAGE -w <value> [--debug] [-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
@@ -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.18.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/bin/dev.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env -S node --loader ts-node/esm --no-warnings=ExperimentalWarning
 
-// eslint-disable-next-line n/shebang
+ 
 import {execute} from '@oclif/core'
 
 await execute({development: true, dir: import.meta.url})

package/dist/backend/common.d.ts

@@ -86,6 +86,10 @@ export type GetWorkspaceEnvOutput = {
 export type GetWorkspaceOutput = {
     found: false;
 } | ({
+    error: string;
+    found: true;
+    hasError: true;
+} | {
     found: true;
     hasError: false;
     workspace: {
@@ -103,10 +107,6 @@ export type GetWorkspaceOutput = {
             };
         };
     };
-} | {
-    error: string;
-    found: true;
-    hasError: true;
 });
 export type GetStateInput = {
     project: string;

package/dist/backend/local.js

@@ -2,8 +2,8 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { z } from 'zod';
+import { getExecutor } from '../executor/index.js';
 import { getInfrastructure } from '../infrastructure/index.js';
-import { resolveEnvValues } from '../lib/env-utils.js';
 import { getAnyPath } from '../lib/filesystem.js';
 import { load, save } from '../lib/yaml-utils.js';
 const WorkspaceSchema = z.object({
@@ -181,8 +181,16 @@ export class LocalBackend {
                 success: false,
             };
         }
+        const executor$ = getExecutor();
+        if (!executor$.success) {
+            return {
+                reason: executor$.reason,
+                success: false,
+            };
+        }
+        const { executor } = executor$;
         return {
-            env: await resolveEnvValues(workspace$.workspace.env ?? {}),
+            env: await executor.resolveEnvValues({ env: workspace$.workspace.env ?? {} }),
             success: true,
         };
     }

package/dist/commands/add/index.d.ts

@@ -1,14 +1,14 @@
 import { Command } from '@oclif/core';
 export default class Add extends Command {
     static args: {
-        package: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+        package: import("@oclif/core/interfaces").Arg<string, 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>;
-        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>;
+        chdir: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        parameter: import("@oclif/core/interfaces").OptionFlag<string[], import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/add/index.js

@@ -1,10 +1,10 @@
 import { Args, Command, Flags } from '@oclif/core';
-import { Listr, ListrLogLevels, ListrLogger } from 'listr2';
+import { Listr, ListrLogger, ListrLogLevels } from 'listr2';
 import { getBackend } from '../../backend/index.js';
-import { provisionPackage } from '../../infrastructure/index.js';
+import { getExecutor } from '../../executor/index.js';
 import { getConfigManager } from '../../lib/config/index.js';
-import { getEnvManager } from '../../lib/env/index.js';
 import { logEnv } from '../../lib/env-utils.js';
+import { getEnvManager } from '../../lib/env/index.js';
 import { arrayOfStringToObject } from '../../lib/object-utils.js';
 import { getParameterManager } from '../../lib/parameter/index.js';
 import { delay, setDebug } from '../../lib/shell.js';
@@ -49,32 +49,18 @@ export default class Add extends Command {
                             },
                         },
                         {
-                            async task(ctx) {
+                            async task(ctx, task) {
                                 const configManager = getConfigManager();
                                 const loadConfigOutput = await configManager.loadConfig({ projectRootDir });
                                 if (!loadConfigOutput.found) {
                                     throw new Error("Project not initialized. Run 'hereya init' first.");
                                 }
                                 ctx.configOutput = loadConfigOutput;
+                                task.output = `Loaded project config`;
                                 await delay(500);
                             },
                             title: 'Loading project config',
                         },
-                        {
-                            async task(ctx) {
-                                const backend = await getBackend();
-                                const getWorkspaceEnvOutput = await backend.getWorkspaceEnv({
-                                    project: ctx.configOutput.config.project,
-                                    workspace: ctx.configOutput.config.workspace,
-                                });
-                                if (!getWorkspaceEnvOutput.success) {
-                                    throw new Error(getWorkspaceEnvOutput.reason);
-                                }
-                                ctx.workspaceEnvOutput = getWorkspaceEnvOutput;
-                                await delay(500);
-                            },
-                            title: 'Loading Workspace environment variables',
-                        },
                         {
                             async task(ctx) {
                                 const userSpecifiedParameters = arrayOfStringToObject(ctx.userSpecifiedParameters);
@@ -92,11 +78,16 @@ export default class Add extends Command {
                         },
                         {
                             async task(ctx) {
-                                const provisionOutput = await provisionPackage({
-                                    env: ctx.workspaceEnvOutput.env,
+                                const executor$ = getExecutor();
+                                if (!executor$.success) {
+                                    throw new Error(executor$.reason);
+                                }
+                                const { executor } = executor$;
+                                const provisionOutput = await executor.provision({
                                     package: ctx.package,
                                     parameters: ctx.parametersOutput.parameters,
                                     project: ctx.configOutput.config.project,
+                                    projectRootDir,
                                     skipDeploy: true,
                                     workspace: ctx.configOutput.config.workspace,
                                 });

package/dist/commands/bootstrap/index.d.ts

@@ -1,12 +1,12 @@
 import { Command } from '@oclif/core';
 export default class Bootstrap extends Command {
     static args: {
-        infrastructureType: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+        infrastructureType: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static description: string;
     static examples: string[];
     static flags: {
-        force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/deploy/index.d.ts

@@ -3,9 +3,9 @@ export default class Deploy extends Command {
     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>;
-        debug: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        workspace: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        chdir: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        workspace: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/deploy/index.js

@@ -1,8 +1,8 @@
 import { Command, Flags } from '@oclif/core';
-import { Listr, ListrLogLevels, ListrLogger } from 'listr2';
+import { Listr, ListrLogger, ListrLogLevels } from 'listr2';
 import path from 'node:path';
 import { getBackend } from '../../backend/index.js';
-import { destroyPackage, provisionPackage } from '../../infrastructure/index.js';
+import { getExecutor } from '../../executor/index.js';
 import { getConfigManager } from '../../lib/config/index.js';
 import { getEnvManager } from '../../lib/env/index.js';
 import { getParameterManager } from '../../lib/parameter/index.js';
@@ -41,34 +41,23 @@ export default class Deploy extends Command {
                     ctx.configOutput = loadConfigOutput;
                     ctx.deployPackages = Object.keys(loadConfigOutput.config.deploy ?? {});
                     ctx.packages = Object.keys(loadConfigOutput.config.packages ?? {});
-                    await delay(500);
-                },
-                title: 'Loading project config',
-            },
-            {
-                async task(ctx) {
-                    const backend = await getBackend();
-                    const getWorkspaceEnvOutput = await backend.getWorkspaceEnv({
-                        project: ctx.configOutput.config.project,
-                        workspace: flags.workspace,
-                    });
-                    if (!getWorkspaceEnvOutput.success) {
-                        throw new Error(getWorkspaceEnvOutput.reason);
-                    }
-                    ctx.workspaceEnv = getWorkspaceEnvOutput.env;
                     ctx.workspace = flags.workspace;
                     await delay(500);
                 },
-                title: 'Loading workspace environment variables',
+                title: 'Loading project config',
             },
             {
                 async task(ctx) {
                     const envManager = getEnvManager();
-                    const { env: projectEnv } = await envManager.getProjectEnv({
+                    const getProjectEnvOutput = await envManager.getProjectEnv({
                         markSecret: true,
                         projectRootDir,
                         workspace: ctx.workspace,
                     });
+                    if (!getProjectEnvOutput.success) {
+                        throw new Error(getProjectEnvOutput.reason);
+                    }
+                    const { env: projectEnv } = getProjectEnvOutput;
                     ctx.projectEnv = projectEnv;
                     await delay(500);
                 },
@@ -109,8 +98,12 @@ export default class Deploy extends Command {
                                 projectRootDir,
                                 workspace: ctx.workspace,
                             });
-                            const destroyOutput = await destroyPackage({
-                                env: ctx.workspaceEnv,
+                            const executor$ = getExecutor();
+                            if (!executor$.success) {
+                                throw new Error(executor$.reason);
+                            }
+                            const { executor } = executor$;
+                            const destroyOutput = await executor.destroy({
                                 isDeploying: true,
                                 package: packageName,
                                 parameters,
@@ -139,12 +132,17 @@ export default class Deploy extends Command {
                                 projectRootDir,
                                 workspace: ctx.workspace,
                             });
-                            const destroyOutput = await destroyPackage({
-                                env: ctx.workspaceEnv,
+                            const executor$ = getExecutor();
+                            if (!executor$.success) {
+                                throw new Error(executor$.reason);
+                            }
+                            const { executor } = executor$;
+                            const destroyOutput = await executor.destroy({
                                 isDeploying: true,
                                 package: packageName,
                                 parameters,
                                 project: ctx.configOutput.config.project,
+                                projectRootDir,
                                 workspace: ctx.workspace,
                             });
                             if (!destroyOutput.success) {
@@ -174,12 +172,17 @@ export default class Deploy extends Command {
                                 projectRootDir,
                                 workspace: ctx.workspace,
                             });
-                            const provisionOutput = await provisionPackage({
-                                env: ctx.workspaceEnv,
+                            const executor$ = getExecutor();
+                            if (!executor$.success) {
+                                throw new Error(executor$.reason);
+                            }
+                            const { executor } = executor$;
+                            const provisionOutput = await executor.provision({
                                 isDeploying: true,
                                 package: packageName,
                                 parameters,
                                 project: ctx.configOutput.config.project,
+                                projectRootDir,
                                 workspace: ctx.workspace,
                             });
                             if (!provisionOutput.success) {
@@ -204,14 +207,12 @@ export default class Deploy extends Command {
                     const envManager = getEnvManager();
                     for (const { env, metadata } of ctx.removed) {
                         // eslint-disable-next-line no-await-in-loop
-                        await Promise.all([
-                            envManager.removeProjectEnv({
-                                env,
-                                infra: metadata.originalInfra ?? metadata.infra,
-                                projectRootDir,
-                                workspace: ctx.workspace,
-                            }),
-                        ]);
+                        await envManager.removeProjectEnv({
+                            env,
+                            infra: metadata.originalInfra ?? metadata.infra,
+                            projectRootDir,
+                            workspace: ctx.workspace,
+                        });
                     }
                     await delay(500);
                 },
@@ -251,11 +252,15 @@ export default class Deploy extends Command {
                 skip: (ctx) => ctx.deployPackages.length === 0,
                 async task(ctx, task) {
                     const envManager = getEnvManager();
-                    const { env: projectEnv } = await envManager.getProjectEnv({
+                    const getProjectEnvOutput = await envManager.getProjectEnv({
                         markSecret: true,
                         projectRootDir,
                         workspace: ctx.workspace,
                     });
+                    if (!getProjectEnvOutput.success) {
+                        throw new Error(getProjectEnvOutput.reason);
+                    }
+                    const { env: projectEnv } = getProjectEnvOutput;
                     return task.newListr(ctx.deployPackages.map((packageName) => ({
                         async task() {
                             const parameterManager = getParameterManager();
@@ -264,8 +269,12 @@ export default class Deploy extends Command {
                                 projectRootDir,
                                 workspace: ctx.workspace,
                             });
-                            const provisionOutput = await provisionPackage({
-                                env: ctx.workspaceEnv,
+                            const executor$ = getExecutor();
+                            if (!executor$.success) {
+                                throw new Error(executor$.reason);
+                            }
+                            const { executor } = executor$;
+                            const provisionOutput = await executor.provision({
                                 isDeploying: true,
                                 package: packageName,
                                 parameters,

package/dist/commands/down/index.d.ts

@@ -3,10 +3,10 @@ export default class Down extends Command {
     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>;
-        debug: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        deploy: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        workspace: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        chdir: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        deploy: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        workspace: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/down/index.js

@@ -1,7 +1,7 @@
 import { Command, Flags } from '@oclif/core';
-import { Listr, ListrLogLevels, ListrLogger } from 'listr2';
+import { Listr, ListrLogger, ListrLogLevels } from 'listr2';
 import { getBackend } from '../../backend/index.js';
-import { destroyPackage } from '../../infrastructure/index.js';
+import { getExecutor } from '../../executor/index.js';
 import { getConfigManager } from '../../lib/config/index.js';
 import { getEnvManager } from '../../lib/env/index.js';
 import { getParameterManager } from '../../lib/parameter/index.js';
@@ -45,27 +45,11 @@ export default class Down extends Command {
                                     throw new Error("Project not initialized. Run 'hereya init' first.");
                                 }
                                 ctx.configOutput = loadConfigOutput;
+                                ctx.workspace = flags.workspace || loadConfigOutput.config.workspace;
                                 await delay(500);
                             },
                             title: 'Loading project config',
                         },
-                        {
-                            async task(ctx) {
-                                const backend = await getBackend();
-                                const workspace = flags.workspace || ctx.configOutput.config.workspace;
-                                const getWorkspaceEnvOutput = await backend.getWorkspaceEnv({
-                                    project: ctx.configOutput.config.project,
-                                    workspace,
-                                });
-                                if (!getWorkspaceEnvOutput.success) {
-                                    throw new Error(getWorkspaceEnvOutput.reason);
-                                }
-                                ctx.workspaceEnvOutput = getWorkspaceEnvOutput;
-                                ctx.workspace = workspace;
-                                await delay(500);
-                            },
-                            title: 'Loading workspace environment variables',
-                        },
                         {
                             async task(ctx) {
                                 const packages = Object.keys(ctx.configOutput.config.packages ?? {});
@@ -98,12 +82,17 @@ export default class Down extends Command {
                                             projectRootDir,
                                             workspace: ctx.workspace,
                                         });
-                                        const destroyOutput = await destroyPackage({
-                                            env: ctx.workspaceEnvOutput.env,
+                                        const executor$ = getExecutor();
+                                        if (!executor$.success) {
+                                            throw new Error(executor$.reason);
+                                        }
+                                        const { executor } = executor$;
+                                        const destroyOutput = await executor.destroy({
                                             isDeploying: flags.deploy,
                                             package: packageName,
                                             parameters,
                                             project: ctx.configOutput.config.project,
+                                            projectRootDir,
                                             workspace: ctx.workspace,
                                         });
                                         if (!destroyOutput.success) {

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

@@ -1,14 +1,14 @@
 import { Command } from '@oclif/core';
 export default class Env extends Command {
     static args: {
-        name: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
+        name: import("@oclif/core/interfaces").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>;
-        list: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        workspace: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        chdir: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        list: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        workspace: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }