hereya-cli 0.44.0 → 0.45.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.44.0 linux-x64 node-v22.17.1
+hereya-cli/0.45.0 linux-x64 node-v22.17.1
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -90,7 +90,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -115,7 +115,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/bootstrap/index.ts)_
 
 ## `hereya config export-backend [FILE]`
 
@@ -137,7 +137,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.44.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.45.0/src/commands/config/export-backend/index.ts)_
 
 ## `hereya config get-backend`
 
@@ -154,7 +154,7 @@ EXAMPLES
   $ hereya config get-backend
 ```
 
-_See code: [src/commands/config/get-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.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.45.0/src/commands/config/get-backend/index.ts)_
 
 ## `hereya config import-backend FILE`
 
@@ -174,7 +174,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.44.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.45.0/src/commands/config/import-backend/index.ts)_
 
 ## `hereya config use-backend TYPE`
 
@@ -196,7 +196,7 @@ EXAMPLES
   $ hereya config use-backend local
 ```
 
-_See code: [src/commands/config/use-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.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.45.0/src/commands/config/use-backend/index.ts)_
 
 ## `hereya deploy`
 
@@ -221,7 +221,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -248,7 +248,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -279,7 +279,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/env/index.ts)_
 
 ## `hereya env set [NAME]`
 
@@ -306,7 +306,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.44.0/src/commands/env/set/index.ts)_
+_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/env/set/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -363,7 +363,7 @@ EXAMPLES
   $ 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.44.0/src/commands/import/index.ts)_
+_See code: [src/commands/import/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/import/index.ts)_
 
 ## `hereya init PROJECT`
 
@@ -389,7 +389,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/init/index.ts)_
 
 ## `hereya login [URL]`
 
@@ -418,7 +418,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.44.0/src/commands/login/index.ts)_
+_See code: [src/commands/login/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/login/index.ts)_
 
 ## `hereya logout`
 
@@ -435,7 +435,7 @@ EXAMPLES
   $ hereya logout
 ```
 
-_See code: [src/commands/logout/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/logout/index.ts)_
+_See code: [src/commands/logout/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/logout/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -462,7 +462,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -488,7 +488,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -513,7 +513,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -538,7 +538,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -565,7 +565,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -589,7 +589,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -609,7 +609,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -635,7 +635,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace env set`
 
@@ -659,7 +659,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.44.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.45.0/src/commands/workspace/env/set/index.ts)_
 
 ## `hereya workspace env unset`
 
@@ -680,7 +680,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.44.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.45.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -707,7 +707,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace list`
 
@@ -724,7 +724,7 @@ EXAMPLES
   $ hereya workspace list
 ```
 
-_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/workspace/list/index.ts)_
+_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/workspace/list/index.ts)_
 
 ## `hereya workspace set-profile PROFILE`
 
@@ -747,7 +747,7 @@ EXAMPLES
   $ hereya workspace set-profile prod-profile -w production
 ```
 
-_See code: [src/commands/workspace/set-profile/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/workspace/set-profile/index.ts)_
+_See code: [src/commands/workspace/set-profile/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/workspace/set-profile/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -774,5 +774,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.44.0/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.45.0/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/commands/deploy/index.js

@@ -54,9 +54,12 @@ export default class Deploy extends Command {
             },
             {
                 async task(ctx) {
+                    const backend = await getBackend();
+                    const profile = await getProfileFromWorkspace(backend, ctx.workspace);
                     const envManager = getEnvManager();
                     const getProjectEnvOutput = await envManager.getProjectEnv({
                         markSecret: true,
+                        profile,
                         projectRootDir,
                         workspace: ctx.workspace,
                     });
@@ -275,9 +278,12 @@ export default class Deploy extends Command {
             {
                 skip: (ctx) => ctx.deployPackages.length === 0,
                 async task(ctx, task) {
+                    const backend = await getBackend();
+                    const profile = await getProfileFromWorkspace(backend, ctx.workspace);
                     const envManager = getEnvManager();
                     const getProjectEnvOutput = await envManager.getProjectEnv({
                         markSecret: true,
+                        profile,
                         projectRootDir,
                         workspace: ctx.workspace,
                     });

package/dist/commands/env/index.js

@@ -1,7 +1,9 @@
 import { Args, Command, Flags } from '@oclif/core';
+import { getBackend } from '../../backend/index.js';
 import { getConfigManager } from '../../lib/config/index.js';
 import { logEnv } from '../../lib/env-utils.js';
 import { getEnvManager } from '../../lib/env/index.js';
+import { getProfileFromWorkspace } from '../../lib/profile-utils.js';
 export default class Env extends Command {
     static args = {
         name: Args.string({ description: 'name of the env to display', required: false }),
@@ -46,8 +48,11 @@ export default class Env extends Command {
         if (!workspace) {
             this.error('you must specify a workspace to print the env vars for');
         }
+        const backend = await getBackend();
+        const profile = await getProfileFromWorkspace(backend, workspace);
         const envManager = getEnvManager();
         const getProjectEnvOutput = await envManager.getProjectEnv({
+            profile,
             projectRootDir,
             workspace,
         });

package/dist/commands/run/index.js

@@ -1,6 +1,8 @@
 import { Args, Command, Flags } from '@oclif/core';
+import { getBackend } from '../../backend/index.js';
 import { getConfigManager } from '../../lib/config/index.js';
 import { getEnvManager } from '../../lib/env/index.js';
+import { getProfileFromWorkspace } from '../../lib/profile-utils.js';
 import { runShell } from '../../lib/shell.js';
 export default class Run extends Command {
     static args = {
@@ -40,8 +42,11 @@ export default class Run extends Command {
         if (!workspace) {
             this.error('you must specify a workspace to run the command in');
         }
+        const backend = await getBackend();
+        const profile = await getProfileFromWorkspace(backend, workspace);
         const envManager = getEnvManager();
         const getProjectEnvOutput = await envManager.getProjectEnv({
+            profile,
             projectRootDir,
             workspace,
         });

package/dist/commands/undeploy/index.js

@@ -55,9 +55,12 @@ export default class Undeploy extends Command {
                         },
                         {
                             async task(ctx) {
+                                const backend = await getBackend();
+                                const profile = await getProfileFromWorkspace(backend, ctx.workspace);
                                 const envManager = getEnvManager();
                                 const getProjectEnvOutput = await envManager.getProjectEnv({
                                     markSecret: true,
+                                    profile,
                                     projectRootDir,
                                     workspace: ctx.workspace,
                                 });

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

@@ -4,8 +4,10 @@ export declare class EnvManager {
     getProjectEnv(input: GetProjectEnvInput): Promise<GetProjectEnvOutput>;
     getStaticEnvDir(projectRootDir?: string): Promise<string>;
     removeProjectEnv(input: RemoveEnvInput): Promise<void>;
+    private extractProfileSections;
     private getEnvPath;
     private getUserEnvPaths;
+    private loadFirstDocument;
 }
 export declare const envManager: EnvManager;
 export declare function getEnvManager(): EnvManager;
@@ -20,6 +22,7 @@ export type AddEnvInput = {
 export type RemoveEnvInput = AddEnvInput;
 export type GetProjectEnvInput = {
     markSecret?: boolean;
+    profile: string;
     projectRootDir?: string;
     workspace: string;
 };

package/dist/lib/env/index.js

@@ -1,7 +1,8 @@
+import fs from 'node:fs/promises';
 import path from 'node:path';
 import { getExecutor } from '../../executor/index.js';
 import { getAnyPath } from '../filesystem.js';
-import { load, save } from '../yaml-utils.js';
+import { load, parseYaml, save } from '../yaml-utils.js';
 export class EnvManager {
     async addProjectEnv(input) {
         const envPath = await this.getEnvPath(input);
@@ -25,10 +26,24 @@ export class EnvManager {
         if (found) {
             resolvedEnv = await executor.resolveEnvValues({ env, markSecret: input.markSecret });
         }
-        const userEnvs = await this.getUserEnvPaths(input).then((paths) => Promise.all(paths.map((path) => load(path))));
+        const userEnvPaths = await this.getUserEnvPaths(input.profile, input.projectRootDir);
         let userMergedEnv = {};
-        for (const { data } of userEnvs) {
-            userMergedEnv = { ...userMergedEnv, ...data };
+        // First load the base env.yaml (first document only)
+        if (userEnvPaths[0]) {
+            const baseEnv = await this.loadFirstDocument(userEnvPaths[0]);
+            if (baseEnv) {
+                userMergedEnv = { ...userMergedEnv, ...baseEnv };
+            }
+        }
+        // Then merge profile-specific env file
+        const profileFileEnv = await load(userEnvPaths[1]);
+        if (profileFileEnv.data) {
+            userMergedEnv = { ...userMergedEnv, ...profileFileEnv.data };
+        }
+        // Finally, extract and merge profile sections from env.yaml
+        const profileSections = await this.extractProfileSections(userEnvPaths[0], input.profile);
+        if (profileSections) {
+            userMergedEnv = { ...userMergedEnv, ...profileSections };
         }
         const finalEnv = { ...resolvedEnv, ...userMergedEnv };
         return { env: finalEnv, success: true };
@@ -46,16 +61,61 @@ export class EnvManager {
         const finalEnv = Object.fromEntries(Object.entries(existingEnv).filter(([key]) => !envKeysToRemove.includes(key)));
         await save(finalEnv, envPath);
     }
+    async extractProfileSections(filePath, targetProfile) {
+        if (!filePath)
+            return null;
+        try {
+            // Check if file exists first
+            await fs.access(filePath);
+            const content = await fs.readFile(filePath, 'utf8');
+            const documents = content.split(/^---$/m);
+            // Parse all documents in parallel
+            const parsedDocs = await Promise.all(documents.slice(1).map(async (doc) => {
+                if (!doc.trim())
+                    return null;
+                const { data } = await parseYaml(doc);
+                return data;
+            }));
+            // Find matching profile document
+            for (const data of parsedDocs) {
+                if (data && data.profile === targetProfile) {
+                    // Remove the profile field and return the rest
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                    const { profile, ...envVars } = data;
+                    return envVars;
+                }
+            }
+        }
+        catch {
+            // Ignore errors, return null
+        }
+        return null;
+    }
     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) {
+    async getUserEnvPaths(profile, projectRootDir) {
         const paths = await Promise.all([
-            getAnyPath(path.join(await this.getStaticEnvDir(input.projectRootDir), `env.yaml`), path.join(await this.getStaticEnvDir(input.projectRootDir), `env.yml`)),
-            getAnyPath(path.join(await this.getStaticEnvDir(input.projectRootDir), `env.${input.workspace}.yaml`), path.join(await this.getStaticEnvDir(input.projectRootDir), `env.${input.workspace}.yml`)),
+            getAnyPath(path.join(await this.getStaticEnvDir(projectRootDir), `env.yaml`), path.join(await this.getStaticEnvDir(projectRootDir), `env.yml`)),
+            getAnyPath(path.join(await this.getStaticEnvDir(projectRootDir), `env.${profile}.yaml`), path.join(await this.getStaticEnvDir(projectRootDir), `env.${profile}.yml`)),
         ]);
         return paths;
     }
+    async loadFirstDocument(filePath) {
+        try {
+            await fs.access(filePath);
+            const content = await fs.readFile(filePath, 'utf8');
+            // Split by document separator and take only the first document
+            const firstDoc = content.split(/^---$/m)[0];
+            if (!firstDoc.trim())
+                return null;
+            const { data } = await parseYaml(firstDoc);
+            return data;
+        }
+        catch {
+            return null;
+        }
+    }
 }
 export const envManager = new EnvManager();
 export function getEnvManager() {

package/oclif.manifest.json

@@ -1317,5 +1317,5 @@
       ]
     }
   },
-  "version": "0.44.0"
+  "version": "0.45.0"
 }

package/package.json

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