hereya-cli 0.16.0 → 0.17.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.16.0 linux-x64 node-v22.13.1
+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.16.0/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.16.0/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.16.0/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.16.0/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.16.0/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.16.0/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.16.0/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.16.0/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.16.0/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.16.0/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.16.0/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.16.0/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.16.0/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.16.0/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.16.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.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.16.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.17.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -478,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.16.0/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`
 
@@ -505,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.16.0/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/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/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

@@ -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": {
@@ -571,6 +628,37 @@
         "index.js"
       ]
     },
+    "workspace:delete": {
+      "aliases": [],
+      "args": {
+        "name": {
+          "description": "name of the workspace to delete",
+          "name": "name",
+          "required": true
+        }
+      },
+      "description": "Delete a workspace if it exists.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> dev"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "workspace:delete",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "workspace",
+        "delete",
+        "index.js"
+      ]
+    },
     "workspace:env": {
       "aliases": [],
       "args": {
@@ -621,37 +709,6 @@
         "index.js"
       ]
     },
-    "workspace:delete": {
-      "aliases": [],
-      "args": {
-        "name": {
-          "description": "name of the workspace to delete",
-          "name": "name",
-          "required": true
-        }
-      },
-      "description": "Delete a workspace if it exists.",
-      "examples": [
-        "<%= config.bin %> <%= command.id %> dev"
-      ],
-      "flags": {},
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "workspace:delete",
-      "pluginAlias": "hereya-cli",
-      "pluginName": "hereya-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "workspace",
-        "delete",
-        "index.js"
-      ]
-    },
     "workspace:install": {
       "aliases": [],
       "args": {
@@ -896,5 +953,5 @@
       ]
     }
   },
-  "version": "0.16.0"
+  "version": "0.17.0"
 }

package/package.json

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