hereya-cli 0.39.0 → 0.40.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.39.0 linux-x64 node-v22.16.0
+hereya-cli/0.40.0 linux-x64 node-v22.16.0
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -40,6 +40,7 @@ USAGE
 * [`hereya env [NAME]`](#hereya-env-name)
 * [`hereya env set [NAME]`](#hereya-env-set-name)
 * [`hereya help [COMMAND]`](#hereya-help-command)
+* [`hereya import PACKAGE`](#hereya-import-package)
 * [`hereya init PROJECT`](#hereya-init-project)
 * [`hereya login [URL]`](#hereya-login-url)
 * [`hereya logout`](#hereya-logout)
@@ -88,7 +89,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -113,7 +114,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/bootstrap/index.ts)_
 
 ## `hereya config export-backend [FILE]`
 
@@ -135,7 +136,7 @@ EXAMPLES
   $ hereya config export-backend ./path/to/export.json
 ```
 
-_See code: [src/commands/config/export-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/config/export-backend/index.ts)_
+_See code: [src/commands/config/export-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/config/export-backend/index.ts)_
 
 ## `hereya config get-backend`
 
@@ -152,7 +153,7 @@ EXAMPLES
   $ hereya config get-backend
 ```
 
-_See code: [src/commands/config/get-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.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.40.0/src/commands/config/get-backend/index.ts)_
 
 ## `hereya config import-backend FILE`
 
@@ -172,7 +173,7 @@ EXAMPLES
   $ hereya config import-backend ./path/to/cloud-backend.json
 ```
 
-_See code: [src/commands/config/import-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/config/import-backend/index.ts)_
+_See code: [src/commands/config/import-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/config/import-backend/index.ts)_
 
 ## `hereya config use-backend TYPE`
 
@@ -194,7 +195,7 @@ EXAMPLES
   $ hereya config use-backend local
 ```
 
-_See code: [src/commands/config/use-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.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.40.0/src/commands/config/use-backend/index.ts)_
 
 ## `hereya deploy`
 
@@ -219,7 +220,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -246,7 +247,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -277,7 +278,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/env/index.ts)_
 
 ## `hereya env set [NAME]`
 
@@ -304,7 +305,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.39.0/src/commands/env/set/index.ts)_
+_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/env/set/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -326,6 +327,43 @@ DESCRIPTION
 
 _See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.25/src/commands/help.ts)_
 
+## `hereya import PACKAGE`
+
+Import a package resource into your project
+
+```
+USAGE
+  $ hereya import PACKAGE -f <value> [--chdir <value>] [--debug] [-p <value>...] [-w <value>]
+
+ARGUMENTS
+  PACKAGE  The package to import, specified as a GitHub repository in the format owner/repository.
+           To change the registry URL, set the HEREYA_REGISTRY_URL environment variable, so that it points to
+           $HEREYA_REGISTRY_URL/owner/repository.
+           For local packages, use the format local://path/to/package where path/to/package is the path to the package
+           on your local machine.
+
+FLAGS
+  -f, --stateFile=<value>     (required) state file to use
+  -p, --parameter=<value>...  [default: ] parameters for the package, in the form of 'key=value'. Can be specified
+                              multiple times.
+  -w, --workspace=<value>     workspace to import into
+      --chdir=<value>         Directory where the command will be executed.
+                              If not specified, it defaults to the current working directory.
+                              Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR
+                              environment variable.
+      --debug                 enable debug mode
+
+DESCRIPTION
+  Import a package resource into your project
+
+EXAMPLES
+  $ hereya import hereya/my-package -f state.tfstate
+
+  $ hereya import org/my-package -f state.tfstate -w my-workspace
+```
+
+_See code: [src/commands/import/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/import/index.ts)_
+
 ## `hereya init PROJECT`
 
 Initialize hereya in a project directory.
@@ -350,7 +388,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/init/index.ts)_
 
 ## `hereya login [URL]`
 
@@ -379,7 +417,7 @@ EXAMPLES
   $ hereya login --token=your-token https://cloud.hereya.dev
 ```
 
-_See code: [src/commands/login/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/login/index.ts)_
+_See code: [src/commands/login/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/login/index.ts)_
 
 ## `hereya logout`
 
@@ -396,7 +434,7 @@ EXAMPLES
   $ hereya logout
 ```
 
-_See code: [src/commands/logout/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/logout/index.ts)_
+_See code: [src/commands/logout/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/logout/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -423,7 +461,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -449,7 +487,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -474,7 +512,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -499,7 +537,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -526,7 +564,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -549,7 +587,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -569,7 +607,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -595,7 +633,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace env set`
 
@@ -619,7 +657,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.39.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.40.0/src/commands/workspace/env/set/index.ts)_
 
 ## `hereya workspace env unset`
 
@@ -640,7 +678,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.39.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.40.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -667,7 +705,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace list`
 
@@ -684,7 +722,7 @@ EXAMPLES
   $ hereya workspace list
 ```
 
-_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/workspace/list/index.ts)_
+_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/workspace/list/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -711,5 +749,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.39.0/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.40.0/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

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

@@ -0,0 +1,16 @@
+import { Command } from '@oclif/core';
+export default class Import extends Command {
+    static args: {
+        package: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static description: string;
+    static examples: string[];
+    static flags: {
+        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[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        stateFile: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        workspace: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/import/index.js

@@ -0,0 +1,172 @@
+import { Args, Command, Flags } from '@oclif/core';
+import { Listr, ListrLogger, ListrLogLevels } from 'listr2';
+import { getBackend } from '../../backend/index.js';
+import { getExecutor } from '../../executor/index.js';
+import { getConfigManager } from '../../lib/config/index.js';
+import { logEnv } from '../../lib/env-utils.js';
+import { getLogPath, isDebug, setDebug } from '../../lib/log.js';
+import { arrayOfStringToObject } from '../../lib/object-utils.js';
+import { getParameterManager } from '../../lib/parameter/index.js';
+import { delay } from '../../lib/shell.js';
+export default class Import extends Command {
+    static args = {
+        package: Args.string({
+            description: `
+        The package to import, specified as a GitHub repository in the format owner/repository.
+        To change the registry URL, set the HEREYA_REGISTRY_URL environment variable, so that it points to $HEREYA_REGISTRY_URL/owner/repository.
+        For local packages, use the format local://path/to/package where path/to/package is the path to the package on your local machine.
+      `,
+            required: true,
+        }),
+    };
+    static description = 'Import a package resource into your project';
+    static examples = [
+        '<%= config.bin %> <%= command.id %> hereya/my-package -f state.tfstate',
+        '<%= config.bin %> <%= command.id %> org/my-package -f state.tfstate -w my-workspace',
+    ];
+    static flags = {
+        chdir: Flags.string({
+            description: `
+        Directory where the command will be executed.
+        If not specified, it defaults to the current working directory.
+        Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR environment variable.
+      `,
+            required: false,
+        }),
+        debug: Flags.boolean({
+            default: false,
+            description: 'enable debug mode',
+        }),
+        parameter: Flags.string({
+            char: 'p',
+            default: [],
+            description: "parameters for the package, in the form of 'key=value'. Can be specified multiple times.",
+            multiple: true,
+            required: false,
+        }),
+        stateFile: Flags.string({
+            char: 'f',
+            description: 'state file to use',
+            required: true,
+        }),
+        workspace: Flags.string({
+            char: 'w',
+            description: 'workspace to import into',
+            required: false,
+        }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(Import);
+        setDebug(flags.debug);
+        const projectRootDir = flags.chdir || process.env.HEREYA_PROJECT_ROOT_DIR;
+        const myLogger = new ListrLogger({ useIcons: false });
+        const task = new Listr([
+            {
+                async task(ctx, task) {
+                    return task.newListr([
+                        {
+                            async task(ctx) {
+                                ctx.package = args.package;
+                                ctx.userSpecifiedParameters = flags.parameter || [];
+                            },
+                        },
+                        {
+                            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;
+                                ctx.workspace = flags.workspace || loadConfigOutput.config.workspace;
+                                task.output = `Loaded project config`;
+                                await delay(500);
+                            },
+                            title: 'Loading project config',
+                        },
+                        {
+                            async task(ctx) {
+                                const userSpecifiedParameters = arrayOfStringToObject(ctx.userSpecifiedParameters);
+                                const parameterManager = getParameterManager();
+                                const parametersOutput = await parameterManager.getPackageParameters({
+                                    package: ctx.package,
+                                    projectRootDir,
+                                    userSpecifiedParameters,
+                                    workspace: ctx.workspace,
+                                });
+                                ctx.parametersOutput = parametersOutput;
+                                await delay(500);
+                            },
+                            title: 'Resolving package parameters',
+                        },
+                        {
+                            async task(ctx) {
+                                const executor$ = getExecutor();
+                                if (!executor$.success) {
+                                    throw new Error(executor$.reason);
+                                }
+                                const { executor } = executor$;
+                                const importOutput = await executor.import({
+                                    package: ctx.package,
+                                    project: ctx.configOutput.config.project,
+                                    projectRootDir,
+                                    stateFile: flags.stateFile,
+                                    workspace: ctx.workspace,
+                                });
+                                if (!importOutput.success) {
+                                    throw new Error(importOutput.reason);
+                                }
+                                ctx.importOutput = importOutput;
+                            },
+                        },
+                        {
+                            skip: (ctx) => Boolean(flags.workspace) && flags.workspace !== ctx.configOutput.config.workspace,
+                            async task(ctx) {
+                                const configManager = getConfigManager();
+                                await configManager.addPackage({
+                                    metadata: ctx.importOutput.metadata,
+                                    package: ctx.package,
+                                    projectRootDir,
+                                });
+                                await delay(500);
+                            },
+                            title: 'Adding package to hereya manifest',
+                        },
+                        {
+                            async task(ctx) {
+                                const backend = await getBackend();
+                                const configManager = getConfigManager();
+                                const { config: newConfig } = await configManager.loadConfig({ projectRootDir });
+                                await backend.saveState(newConfig);
+                                const parameterManager = getParameterManager();
+                                const { filePath, saved } = await parameterManager.savePackageParameters({
+                                    package: ctx.package,
+                                    parameters: ctx.parametersOutput.parameters,
+                                    projectRootDir,
+                                    workspace: ctx.workspace,
+                                });
+                                await delay(500);
+                                if (saved) {
+                                    myLogger.log(ListrLogLevels.COMPLETED, `Saved the following parameters for the package in ${filePath}:`);
+                                    logEnv(ctx.parametersOutput.parameters, (msg) => myLogger.log(ListrLogLevels.COMPLETED, msg));
+                                }
+                            },
+                            title: 'Saving state',
+                        },
+                    ], { concurrent: false, rendererOptions: { collapseSubtasks: !isDebug() } });
+                },
+                title: `Importing ${args.package} into workspace ${flags.workspace}`,
+            },
+        ], { concurrent: false });
+        try {
+            await task.run();
+            myLogger.log(ListrLogLevels.COMPLETED, 'Package imported successfully. You can now run `hereya up` to inject exported environment variables.');
+        }
+        catch (error) {
+            this.error(`${error.message}
+
+See ${getLogPath()} for more details
+      `);
+        }
+    }
+}

package/dist/executor/interface.d.ts

@@ -60,8 +60,23 @@ export type ExecutorUnsetEnvVarInput = {
     name: string;
     workspace: string;
 };
+export type ExecutorImportInput = {
+    package: string;
+    project: string;
+    projectRootDir?: string;
+    stateFile: string;
+    workspace: string;
+};
+export type ExecutorImportOutput = {
+    metadata: IPackageMetadata;
+    success: true;
+} | {
+    reason: string;
+    success: false;
+};
 export interface Executor {
     destroy(input: ExecutorDestroyInput): Promise<ExecutorDestroyOutput>;
+    import(input: ExecutorImportInput): Promise<ExecutorImportOutput>;
     provision(input: ExecutorProvisionInput): Promise<ExecutorProvisionOutput>;
     resolveEnvValues(input: ExecutorResolveEnvValuesInput): Promise<ExecutorResolveEnvValuesOutput>;
     setEnvVar(input: ExecutorSetEnvVarInput): Promise<ExecutorSetEnvVarOutput>;

package/dist/executor/local.d.ts

@@ -1,6 +1,7 @@
-import { Executor, ExecutorDestroyInput, ExecutorDestroyOutput, ExecutorProvisionInput, ExecutorProvisionOutput, ExecutorResolveEnvValuesInput, ExecutorResolveEnvValuesOutput, ExecutorSetEnvVarInput, ExecutorSetEnvVarOutput, ExecutorUnsetEnvVarInput, ExecutorUnsetEnvVarOutput } from './interface.js';
+import { Executor, ExecutorDestroyInput, ExecutorDestroyOutput, ExecutorImportInput, ExecutorImportOutput, ExecutorProvisionInput, ExecutorProvisionOutput, ExecutorResolveEnvValuesInput, ExecutorResolveEnvValuesOutput, ExecutorSetEnvVarInput, ExecutorSetEnvVarOutput, ExecutorUnsetEnvVarInput, ExecutorUnsetEnvVarOutput } from './interface.js';
 export declare class LocalExecutor implements Executor {
     destroy(input: ExecutorDestroyInput): Promise<ExecutorDestroyOutput>;
+    import(input: ExecutorImportInput): Promise<ExecutorImportOutput>;
     provision(input: ExecutorProvisionInput): Promise<ExecutorProvisionOutput>;
     resolveEnvValues(input: ExecutorResolveEnvValuesInput): Promise<ExecutorResolveEnvValuesOutput>;
     setEnvVar(input: ExecutorSetEnvVarInput): Promise<ExecutorSetEnvVarOutput>;

package/dist/executor/local.js

@@ -1,5 +1,6 @@
 import { getBackend } from '../backend/index.js';
-import { destroyPackage, getInfrastructure, provisionPackage } from '../infrastructure/index.js';
+import { destroyPackage, getInfrastructure, getProvisioningLogicalId, provisionPackage } from '../infrastructure/index.js';
+import { resolvePackage } from '../lib/package/index.js';
 export class LocalExecutor {
     async destroy(input) {
         const getWorkspaceEnvOutput = await this.getWorkspaceEnv({
@@ -15,6 +16,38 @@ export class LocalExecutor {
             logger: input.logger,
         });
     }
+    async import(input) {
+        const resolvePackageOutput = await resolvePackage({ package: input.package, projectRootDir: input.projectRootDir });
+        if (!resolvePackageOutput.found) {
+            return { reason: resolvePackageOutput.reason, success: false };
+        }
+        const { canonicalName, metadata, pkgName } = resolvePackageOutput;
+        const backend = await getBackend();
+        const id$ = await backend.getProvisioningId({
+            logicalId: getProvisioningLogicalId({ pkg: pkgName, project: input.project, workspace: input.workspace }),
+            packageCanonicalName: canonicalName,
+            project: input.project,
+            workspace: input.workspace,
+        });
+        if (!id$.success) {
+            return { reason: id$.reason, success: false };
+        }
+        const { id } = id$;
+        const infrastructure$ = getInfrastructure({ type: metadata.infra });
+        if (!infrastructure$.supported) {
+            return { reason: infrastructure$.reason, success: false };
+        }
+        const { infrastructure } = infrastructure$;
+        const uploadStateFileOutput = await infrastructure.uploadStateFile({
+            iacType: metadata.iac,
+            provisioningId: id,
+            stateFile: input.stateFile,
+        });
+        if (!uploadStateFileOutput.success) {
+            return { reason: uploadStateFileOutput.reason, success: false };
+        }
+        return { metadata, success: true };
+    }
     async provision(input) {
         const getWorkspaceEnvOutput = await this.getWorkspaceEnv({
             project: input.project,

package/dist/iac/cdk.d.ts

@@ -1,7 +1,8 @@
-import { ApplyInput, ApplyOutput, DestroyInput, DestroyOutput, Iac } from './common.js';
+import { ApplyInput, ApplyOutput, DestroyInput, DestroyOutput, GetStateLocationInput, GetStateLocationOutput, Iac } from './common.js';
 export declare class Cdk implements Iac {
     apply(input: ApplyInput): Promise<ApplyOutput>;
     destroy(input: DestroyInput): Promise<DestroyOutput>;
+    getStateLocation(_: GetStateLocationInput): Promise<GetStateLocationOutput>;
     private getEnv;
     private getParameterNames;
     private getStack;

package/dist/iac/cdk.js

@@ -7,13 +7,11 @@ export class Cdk {
     async apply(input) {
         try {
             const { remainingEnv, serializedParameters, serializedWorkspaceEnv } = await this.serializedParametersAndContext(input);
-            await runShell('npx', [
-                'aws-cdk', 'deploy', '--require-approval', 'never', ...serializedWorkspaceEnv, ...serializedParameters,
-            ], {
+            await runShell('npx', ['aws-cdk', 'deploy', '--require-approval', 'never', ...serializedWorkspaceEnv, ...serializedParameters], {
                 directory: input.pkgPath,
                 env: {
                     ...remainingEnv,
-                    STACK_NAME: input.id
+                    STACK_NAME: input.id,
                 },
                 logger: input.logger,
             });
@@ -28,13 +26,11 @@ export class Cdk {
         try {
             const env = await this.getEnv(input.id);
             const { remainingEnv, serializedParameters, serializedWorkspaceEnv } = await this.serializedParametersAndContext(input);
-            await runShell('npx', [
-                'aws-cdk', 'destroy', '--force', ...serializedWorkspaceEnv, ...serializedParameters
-            ], {
+            await runShell('npx', ['aws-cdk', 'destroy', '--force', ...serializedWorkspaceEnv, ...serializedParameters], {
                 directory: input.pkgPath,
                 env: {
                     ...remainingEnv,
-                    STACK_NAME: input.id
+                    STACK_NAME: input.id,
                 },
                 logger: input.logger,
             });
@@ -44,10 +40,16 @@ export class Cdk {
             return { reason: error.message, success: false };
         }
     }
+    async getStateLocation(_) {
+        return {
+            reason: 'CDK does not support state location',
+            success: false,
+        };
+    }
     async getEnv(stackName) {
         const stack = await this.getStack(stackName);
         const env = {};
-        for (const output of stack?.Outputs?.filter(output => output.OutputKey) ?? []) {
+        for (const output of stack?.Outputs?.filter((output) => output.OutputKey) ?? []) {
             env[output.OutputKey] = output.OutputValue;
         }
         return env;
@@ -55,16 +57,12 @@ export class Cdk {
     async getParameterNames(input) {
         const workDir = input.pkgPath;
         await runShell('npm', ['install'], { directory: workDir });
-        await runShell('npx', [
-            'aws-cdk', 'synth',
-        ], {
+        await runShell('npx', ['aws-cdk', 'synth'], {
             directory: workDir,
             env: { ...input.env, ...input.parameters },
             logger: input.logger,
         });
-        const result = await runShell('npx', [
-            'aws-cdk', 'synth',
-        ], {
+        const result = await runShell('npx', ['aws-cdk', 'synth'], {
             directory: workDir,
             env: { ...input.env, ...input.parameters },
             logger: input.logger,

package/dist/iac/common.d.ts

@@ -2,6 +2,7 @@ import { Logger } from '../lib/log.js';
 export interface Iac {
     apply(input: ApplyInput): Promise<ApplyOutput>;
     destroy(input: DestroyInput): Promise<DestroyOutput>;
+    getStateLocation(input: GetStateLocationInput): Promise<GetStateLocationOutput>;
 }
 export declare enum IacType {
     cdk = "cdk",
@@ -37,3 +38,20 @@ export type ApplyOutput = {
 };
 export type DestroyInput = ApplyInput;
 export type DestroyOutput = ApplyOutput;
+export type GetStateLocationInput = {
+    id: string;
+    infraConfig: {
+        terraformStateBucketName: string;
+        terraformStateBucketRegion?: string;
+        terraformStateLockTableName: string;
+    };
+};
+export type GetStateLocationOutput = {
+    bucket: string;
+    key: string;
+    region: string;
+    success: true;
+} | {
+    reason: string;
+    success: false;
+};

package/dist/iac/terraform.d.ts

@@ -1,9 +1,10 @@
 import { Logger } from '../lib/log.js';
-import { ApplyInput, ApplyOutput, DestroyInput, DestroyOutput, Iac } from './common.js';
+import { ApplyInput, ApplyOutput, DestroyInput, DestroyOutput, GetStateLocationInput, GetStateLocationOutput, Iac } from './common.js';
 export declare class Terraform implements Iac {
     apply(input: ApplyInput): Promise<ApplyOutput>;
     destroy(input: DestroyInput): Promise<DestroyOutput>;
     downloadTerraform(logger?: Logger): Promise<boolean>;
+    getStateLocation(input: GetStateLocationInput): Promise<GetStateLocationOutput>;
     private getEnv;
     private getTerraformBinary;
     private getWithRedirect;

package/dist/iac/terraform.js

@@ -176,6 +176,14 @@ export class Terraform {
         });
         return true;
     }
+    async getStateLocation(input) {
+        return {
+            bucket: input.infraConfig.terraformStateBucketName,
+            key: `${input.id}/terraform.tfstate`,
+            region: input.infraConfig.terraformStateBucketRegion ?? '',
+            success: true,
+        };
+    }
     async getEnv(pkgPath, logger) {
         const terraform = await this.getTerraformBinary(logger);
         const resourceOut = await runShell(terraform, ['output', '--json'], {

package/dist/infrastructure/aws.d.ts

@@ -1,4 +1,4 @@
-import { BootstrapInput, DeployInput, DeployOutput, DestroyInput, DestroyOutput, Infrastructure, ProvisionInput, ProvisionOutput, ResolveEnvInput, ResolveEnvOutput, SaveEnvInput, SaveEnvOutput, StoreEnvInput, StoreEnvOutput, UndeployInput, UndeployOutput, UnstoreEnvInput, UnstoreEnvOutput } from './common.js';
+import { BootstrapInput, DeployInput, DeployOutput, DestroyInput, DestroyOutput, Infrastructure, ProvisionInput, ProvisionOutput, ResolveEnvInput, ResolveEnvOutput, SaveEnvInput, SaveEnvOutput, StoreEnvInput, StoreEnvOutput, UndeployInput, UndeployOutput, UnstoreEnvInput, UnstoreEnvOutput, UploadStateFileInput, UploadStateFileOutput } from './common.js';
 export declare class AwsInfrastructure implements Infrastructure {
     bootstrap(_: BootstrapInput): Promise<void>;
     deploy(input: DeployInput): Promise<DeployOutput>;
@@ -10,4 +10,5 @@ export declare class AwsInfrastructure implements Infrastructure {
     unbootstrap(_: BootstrapInput): Promise<void>;
     undeploy(input: UndeployInput): Promise<UndeployOutput>;
     unstoreEnv(input: UnstoreEnvInput): Promise<UnstoreEnvOutput>;
+    uploadStateFile(input: UploadStateFileInput): Promise<UploadStateFileOutput>;
 }

package/dist/infrastructure/aws.js

@@ -1,8 +1,9 @@
+import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { GetSecretValueCommand, SecretsManagerClient } from '@aws-sdk/client-secrets-manager';
 import { DeleteParameterCommand, GetParameterCommand, PutParameterCommand, SSMClient } from '@aws-sdk/client-ssm';
 import { GetCallerIdentityCommand, STSClient } from '@aws-sdk/client-sts';
 import { randomUUID } from 'node:crypto';
-import fs from 'node:fs/promises';
+import fs from 'node:fs';
 import { getIac } from '../iac/index.js';
 import { downloadPackage } from '../lib/package/index.js';
 import { runShell } from '../lib/shell.js';
@@ -70,7 +71,7 @@ export class AwsInfrastructure {
             return { reason: output.reason, success: false };
         }
         // Remove downloaded package
-        await fs.rm(downloadPath, { recursive: true });
+        await fs.promises.rm(downloadPath, { recursive: true });
         return { env: output.env, success: true };
     }
     async provision(input) {
@@ -220,4 +221,38 @@ export class AwsInfrastructure {
         }));
         return { success: true };
     }
+    async uploadStateFile(input) {
+        const iac$ = getIac({ type: input.iacType });
+        if (!iac$.supported) {
+            return { reason: iac$.reason, success: false };
+        }
+        const { iac } = iac$;
+        const config = await getAwsConfig();
+        const terraformStateBucketRegion = config.terraformStateBucketRegion || process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;
+        const infraConfig = {
+            ...config,
+            terraformStateBucketRegion,
+        };
+        if (!infraConfig.terraformStateBucketName || !infraConfig.terraformStateLockTableName) {
+            return {
+                reason: 'could not find AWS infrastructure config. Did you run `hereya bootstrap aws`?',
+                success: false,
+            };
+        }
+        const stateLocation$ = await iac.getStateLocation({
+            id: input.provisioningId,
+            infraConfig,
+        });
+        if (!stateLocation$.success) {
+            return { reason: stateLocation$.reason, success: false };
+        }
+        const { bucket, key } = stateLocation$;
+        const s3Client = new S3Client({});
+        await s3Client.send(new PutObjectCommand({
+            Body: fs.createReadStream(input.stateFile),
+            Bucket: bucket,
+            Key: key,
+        }));
+        return { success: true };
+    }
 }

package/dist/infrastructure/common.d.ts

@@ -17,6 +17,7 @@ export interface Infrastructure {
     unbootstrap(input: BootstrapInput): Promise<void>;
     undeploy(input: UndeployInput): Promise<UndeployOutput>;
     unstoreEnv(input: UnstoreEnvInput): Promise<UnstoreEnvOutput>;
+    uploadStateFile(input: UploadStateFileInput): Promise<UploadStateFileOutput>;
 }
 export declare function getPackageDownloadPath(input: {
     id: string;
@@ -99,3 +100,14 @@ export type UnstoreEnvOutput = {
 } | {
     success: true;
 };
+export type UploadStateFileInput = {
+    iacType: IacType;
+    provisioningId: string;
+    stateFile: string;
+};
+export type UploadStateFileOutput = {
+    reason: string;
+    success: false;
+} | {
+    success: true;
+};

package/dist/infrastructure/index.d.ts

@@ -9,6 +9,11 @@ export declare const awsInfrastructure: AwsInfrastructure;
 export declare function getInfrastructure(input: GetInfrastructureInput): GetInfrastructureOutput;
 export declare function destroyPackage(input: DestroyPackageInput): Promise<DestroyPackageOutput>;
 export declare function provisionPackage(input: ProvisionPackageInput): Promise<ProvisionPackageOutput>;
+export declare function getProvisioningLogicalId({ pkg, project, workspace }: {
+    pkg: string;
+    project?: string;
+    workspace?: string;
+}): string;
 export type DestroyPackageInput = ProvisionPackageInput;
 export type DestroyPackageOutput = ProvisionPackageOutput;
 export type ProvisionPackageInput = {

package/dist/infrastructure/index.js

@@ -168,6 +168,6 @@ export async function provisionPackage(input) {
     }
     return { env: provisionOutput.env, metadata, success: true };
 }
-function getProvisioningLogicalId({ pkg, project, workspace }) {
+export function getProvisioningLogicalId({ pkg, project, workspace }) {
     return [pkg.replaceAll('/', '.'), workspace, project].filter(Boolean).join('.');
 }

package/dist/infrastructure/local.d.ts

@@ -1,4 +1,4 @@
-import { DeployInput, DeployOutput, Infrastructure, ProvisionInput, ProvisionOutput, SaveEnvInput, SaveEnvOutput, StoreEnvInput, StoreEnvOutput, UndeployInput, UndeployOutput, UnstoreEnvInput, UnstoreEnvOutput } from './common.js';
+import { DeployInput, DeployOutput, Infrastructure, ProvisionInput, ProvisionOutput, SaveEnvInput, SaveEnvOutput, StoreEnvInput, StoreEnvOutput, UndeployInput, UndeployOutput, UnstoreEnvInput, UnstoreEnvOutput, UploadStateFileInput, UploadStateFileOutput } from './common.js';
 export declare class LocalInfrastructure implements Infrastructure {
     bootstrap(): Promise<void>;
     deploy(input: DeployInput): Promise<DeployOutput>;
@@ -14,4 +14,5 @@ export declare class LocalInfrastructure implements Infrastructure {
     unbootstrap(): Promise<void>;
     undeploy(input: UndeployInput): Promise<UndeployOutput>;
     unstoreEnv(_: UnstoreEnvInput): Promise<UnstoreEnvOutput>;
+    uploadStateFile(_: UploadStateFileInput): Promise<UploadStateFileOutput>;
 }

package/dist/infrastructure/local.js

@@ -80,4 +80,7 @@ export class LocalInfrastructure {
     async unstoreEnv(_) {
         return { success: true };
     }
+    uploadStateFile(_) {
+        throw new Error(`Uploading state file is not supported for local infrastructure`);
+    }
 }

package/oclif.manifest.json

@@ -264,6 +264,80 @@
         "index.js"
       ]
     },
+    "import": {
+      "aliases": [],
+      "args": {
+        "package": {
+          "description": "\n        The package to import, specified as a GitHub repository in the format owner/repository.\n        To change the registry URL, set the HEREYA_REGISTRY_URL environment variable, so that it points to $HEREYA_REGISTRY_URL/owner/repository.\n        For local packages, use the format local://path/to/package where path/to/package is the path to the package on your local machine.\n      ",
+          "name": "package",
+          "required": true
+        }
+      },
+      "description": "Import a package resource into your project",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> hereya/my-package -f state.tfstate",
+        "<%= config.bin %> <%= command.id %> org/my-package -f state.tfstate -w my-workspace"
+      ],
+      "flags": {
+        "chdir": {
+          "description": "\n        Directory where the command will be executed.\n        If not specified, it defaults to the current working directory.\n        Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR environment variable.\n      ",
+          "name": "chdir",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "debug": {
+          "description": "enable debug mode",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "parameter": {
+          "char": "p",
+          "description": "parameters for the package, in the form of 'key=value'. Can be specified multiple times.",
+          "name": "parameter",
+          "required": false,
+          "default": [],
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "stateFile": {
+          "char": "f",
+          "description": "state file to use",
+          "name": "stateFile",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "workspace": {
+          "char": "w",
+          "description": "workspace to import into",
+          "name": "workspace",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "import",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "import",
+        "index.js"
+      ]
+    },
     "init": {
       "aliases": [],
       "args": {
@@ -1194,5 +1268,5 @@
       ]
     }
   },
-  "version": "0.39.0"
+  "version": "0.40.0"
 }

package/package.json

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