hereya-cli 0.48.0 → 0.50.0

package/dist/commands/flow/down/index.js

@@ -1,6 +1,6 @@
 import { Command, Flags } from '@oclif/core';
 import { getConfigManager } from '../../../lib/config/index.js';
-import { gitUtils } from '../../../lib/git-utils.js';
+import { buildFlowWorkspaceName } from '../../../lib/flow-utils.js';
 import { setDebug } from '../../../lib/log.js';
 import DeleteState from '../../delete-state/index.js';
 import Down from '../../down/index.js';
@@ -56,22 +56,13 @@ export default class FlowDown extends Command {
         if (!loadConfigOutput.found) {
             this.error("Project not initialized. Run 'hereya init' first.");
         }
-        // Get current git branch
-        const gitBranch = await gitUtils.getCurrentGitBranch(projectRootDir);
-        // Sanitize branch name
-        const sanitizedBranch = gitUtils.sanitizeBranchName(gitBranch);
-        if (!sanitizedBranch) {
-            this.error('Branch name contains only special characters and cannot be used for workspace name');
-        }
-        // Get commit SHA if pin flag is set
-        const commitSHA = flags.pin ? await gitUtils.getShortCommitSHA(projectRootDir) : null;
-        // Build workspace name parts
-        const parts = [loadConfigOutput.config.project, sanitizedBranch];
-        if (flags.profile)
-            parts.push(flags.profile);
-        if (commitSHA)
-            parts.push(commitSHA);
-        const workspaceName = parts.join('---');
+        // Build workspace name using flow utility
+        const workspaceName = await buildFlowWorkspaceName({
+            pin: flags.pin,
+            profile: flags.profile,
+            project: loadConfigOutput.config.project,
+            projectRootDir,
+        });
         // Create workspace with mirror
         const createArgs = [workspaceName, '--mirror', loadConfigOutput.config.workspace];
         if (projectRootDir) {

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

@@ -0,0 +1,15 @@
+import { Command } from '@oclif/core';
+export default class FlowEnv extends Command {
+    static args: {
+        name: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static description: string;
+    static examples: string[];
+    static flags: {
+        chdir: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        list: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        pin: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

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

@@ -0,0 +1,64 @@
+import { Args, Command, Flags } from '@oclif/core';
+import { getConfigManager } from '../../../lib/config/index.js';
+import { buildFlowWorkspaceName } from '../../../lib/flow-utils.js';
+import Env from '../../env/index.js';
+export default class FlowEnv extends Command {
+    static args = {
+        name: Args.string({ description: 'name of the env to display', required: false }),
+    };
+    static description = 'Print project environment variables for a git branch-based workspace';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> myEnv',
+        '<%= config.bin %> <%= command.id %> --profile staging',
+        '<%= config.bin %> <%= command.id %> --pin',
+        '<%= config.bin %> <%= command.id %> -l',
+    ];
+    static flags = {
+        chdir: Flags.string({
+            description: 'project root directory',
+            required: false,
+        }),
+        list: Flags.boolean({
+            char: 'l',
+            description: 'list only the env vars without values',
+            required: false,
+        }),
+        pin: Flags.boolean({
+            description: 'append git commit SHA to workspace name for commit-specific isolation',
+            required: false,
+        }),
+        profile: Flags.string({
+            description: 'profile to use for the workspace (will be appended to workspace name)',
+            required: false,
+        }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(FlowEnv);
+        const projectRootDir = flags.chdir || process.env.HEREYA_PROJECT_ROOT_DIR;
+        // Load project config
+        const configManager = getConfigManager();
+        const loadConfigOutput = await configManager.loadConfig({ projectRootDir });
+        if (!loadConfigOutput.found) {
+            this.error("Project not initialized. Run 'hereya init' first.");
+        }
+        // Build workspace name using flow utility
+        const workspaceName = await buildFlowWorkspaceName({
+            pin: flags.pin,
+            profile: flags.profile,
+            project: loadConfigOutput.config.project,
+            projectRootDir,
+        });
+        // Build args for env command
+        const envArgs = ['--workspace', workspaceName];
+        // Pass through all flags
+        if (flags.chdir)
+            envArgs.push('--chdir', flags.chdir);
+        if (flags.list)
+            envArgs.push('--list');
+        // Add the env name argument if provided
+        if (args.name)
+            envArgs.push(args.name);
+        await Env.run(envArgs);
+    }
+}

package/dist/commands/flow/remove/index.d.ts

@@ -0,0 +1,14 @@
+import { Command } from '@oclif/core';
+export default class FlowRemove 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>;
+        profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/flow/remove/index.js

@@ -0,0 +1,75 @@
+import { Args, Command, Flags } from '@oclif/core';
+import { getConfigManager } from '../../../lib/config/index.js';
+import { buildFlowWorkspaceName } from '../../../lib/flow-utils.js';
+import { setDebug } from '../../../lib/log.js';
+import Remove from '../../remove/index.js';
+import WorkspaceCreate from '../../workspace/create/index.js';
+export default class FlowRemove extends Command {
+    static args = {
+        package: Args.string({
+            description: `Remove a previously added package.`,
+            required: true,
+        }),
+    };
+    static description = 'Remove a package from the project in a git branch-based workspace';
+    static examples = [
+        '<%= config.bin %> <%= command.id %> cloudy/docker_postgres',
+        '<%= config.bin %> <%= command.id %> cloudy/docker_postgres --profile staging',
+    ];
+    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',
+        }),
+        profile: Flags.string({
+            description: 'profile to use for the workspace (will be appended to workspace name)',
+            required: false,
+        }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(FlowRemove);
+        setDebug(flags.debug);
+        const projectRootDir = flags.chdir || process.env.HEREYA_PROJECT_ROOT_DIR;
+        // Load project config
+        const configManager = getConfigManager();
+        const loadConfigOutput = await configManager.loadConfig({ projectRootDir });
+        if (!loadConfigOutput.found) {
+            this.error("Project not initialized. Run 'hereya init' first.");
+        }
+        // Build workspace name using flow utility (no pin support)
+        const workspaceName = await buildFlowWorkspaceName({
+            pin: false,
+            profile: flags.profile,
+            project: loadConfigOutput.config.project,
+            projectRootDir,
+        });
+        // Create workspace with mirror
+        const createArgs = [workspaceName, '--mirror', loadConfigOutput.config.workspace];
+        if (projectRootDir) {
+            createArgs.push('--chdir', projectRootDir);
+        }
+        if (flags.debug) {
+            createArgs.push('--debug');
+        }
+        if (flags.profile) {
+            createArgs.push('--profile', flags.profile);
+        }
+        await WorkspaceCreate.run(createArgs);
+        // Build args for remove command
+        const removeArgs = [args.package, '--workspace', workspaceName];
+        // Pass through all flags
+        if (flags.chdir)
+            removeArgs.push('--chdir', flags.chdir);
+        if (flags.debug)
+            removeArgs.push('--debug');
+        await Remove.run(removeArgs);
+    }
+}

package/dist/commands/flow/run/index.js

@@ -1,6 +1,6 @@
 import { Args, Command, Flags } from '@oclif/core';
 import { getConfigManager } from '../../../lib/config/index.js';
-import { gitUtils } from '../../../lib/git-utils.js';
+import { buildFlowWorkspaceName } from '../../../lib/flow-utils.js';
 import Run from '../../run/index.js';
 export default class FlowRun extends Command {
     static args = {
@@ -36,22 +36,13 @@ export default class FlowRun extends Command {
         if (!loadConfigOutput.found) {
             this.error("Project not initialized. Run 'hereya init' first.");
         }
-        // Get current git branch
-        const gitBranch = await gitUtils.getCurrentGitBranch(projectRootDir);
-        // Sanitize branch name
-        const sanitizedBranch = gitUtils.sanitizeBranchName(gitBranch);
-        if (!sanitizedBranch) {
-            this.error('Branch name contains only special characters and cannot be used for workspace name');
-        }
-        // Get commit SHA if pin flag is set
-        const commitSHA = flags.pin ? await gitUtils.getShortCommitSHA(projectRootDir) : null;
-        // Build workspace name parts
-        const parts = [loadConfigOutput.config.project, sanitizedBranch];
-        if (flags.profile)
-            parts.push(flags.profile);
-        if (commitSHA)
-            parts.push(commitSHA);
-        const workspaceName = parts.join('---');
+        // Build workspace name using flow utility
+        const workspaceName = await buildFlowWorkspaceName({
+            pin: flags.pin,
+            profile: flags.profile,
+            project: loadConfigOutput.config.project,
+            projectRootDir,
+        });
         // Build args for run command
         const runArgs = ['--workspace', workspaceName];
         // Pass through chdir flag

package/dist/commands/flow/up/index.js

@@ -1,6 +1,6 @@
 import { Command, Flags } from '@oclif/core';
 import { getConfigManager } from '../../../lib/config/index.js';
-import { gitUtils } from '../../../lib/git-utils.js';
+import { buildFlowWorkspaceName } from '../../../lib/flow-utils.js';
 import { setDebug } from '../../../lib/log.js';
 import Up from '../../up/index.js';
 import WorkspaceCreate from '../../workspace/create/index.js';
@@ -54,22 +54,13 @@ export default class FlowUp extends Command {
         if (!loadConfigOutput.found) {
             this.error("Project not initialized. Run 'hereya init' first.");
         }
-        // Get current git branch
-        const gitBranch = await gitUtils.getCurrentGitBranch(projectRootDir);
-        // Sanitize branch name
-        const sanitizedBranch = gitUtils.sanitizeBranchName(gitBranch);
-        if (!sanitizedBranch) {
-            this.error('Branch name contains only special characters and cannot be used for workspace name');
-        }
-        // Get commit SHA if pin flag is set
-        const commitSHA = flags.pin ? await gitUtils.getShortCommitSHA(projectRootDir) : null;
-        // Build workspace name parts
-        const parts = [loadConfigOutput.config.project, sanitizedBranch];
-        if (flags.profile)
-            parts.push(flags.profile);
-        if (commitSHA)
-            parts.push(commitSHA);
-        const workspaceName = parts.join('---');
+        // Build workspace name using flow utility
+        const workspaceName = await buildFlowWorkspaceName({
+            pin: flags.pin,
+            profile: flags.profile,
+            project: loadConfigOutput.config.project,
+            projectRootDir,
+        });
         // Create workspace with mirror
         const createArgs = [workspaceName, '--mirror', loadConfigOutput.config.workspace];
         if (projectRootDir) {

package/dist/commands/import/index.js

@@ -90,7 +90,7 @@ export default class Import extends Command {
                                 const userSpecifiedParameters = arrayOfStringToObject(ctx.userSpecifiedParameters);
                                 const parameterManager = getParameterManager();
                                 const backend = await getBackend();
-                                const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                                const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                 const parametersOutput = await parameterManager.getPackageParameters({
                                     package: ctx.package,
                                     profile,

package/dist/commands/remove/index.js

@@ -72,7 +72,7 @@ export default class Remove extends Command {
                             async task(ctx) {
                                 const parameterManager = getParameterManager();
                                 const backend = await getBackend();
-                                const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                                const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                 const parametersOutput = await parameterManager.getPackageParameters({
                                     package: ctx.package,
                                     profile,

package/dist/commands/run/index.js

@@ -43,7 +43,7 @@ export default class Run extends Command {
             this.error('you must specify a workspace to run the command in');
         }
         const backend = await getBackend();
-        const profile = await getProfileFromWorkspace(backend, workspace);
+        const profile = await getProfileFromWorkspace(backend, workspace, config.project);
         const envManager = getEnvManager();
         const getProjectEnvOutput = await envManager.getProjectEnv({
             profile,

package/dist/commands/undeploy/index.js

@@ -56,7 +56,7 @@ export default class Undeploy extends Command {
                         {
                             async task(ctx) {
                                 const backend = await getBackend();
-                                const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                                const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                 const envManager = getEnvManager();
                                 const getProjectEnvOutput = await envManager.getProjectEnv({
                                     markSecret: true,
@@ -111,7 +111,7 @@ export default class Undeploy extends Command {
                                     async task(_, task) {
                                         const parameterManager = getParameterManager();
                                         const backend = await getBackend();
-                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                         const { parameters } = await parameterManager.getPackageParameters({
                                             package: packageName,
                                             profile,
@@ -151,7 +151,7 @@ export default class Undeploy extends Command {
                                     async task(_, task) {
                                         const parameterManager = getParameterManager();
                                         const backend = await getBackend();
-                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                         const { parameters } = await parameterManager.getPackageParameters({
                                             package: packageName,
                                             profile,

package/dist/commands/up/index.js

@@ -104,7 +104,7 @@ export default class Up extends Command {
                                     async task(_, task) {
                                         const parameterManager = getParameterManager();
                                         const backend = await getBackend();
-                                        const profile = await getProfileFromWorkspace(backend, workspace);
+                                        const profile = await getProfileFromWorkspace(backend, workspace, ctx.configOutput.config.project);
                                         const { parameters } = await parameterManager.getPackageParameters({
                                             package: packageName,
                                             profile,
@@ -150,7 +150,7 @@ export default class Up extends Command {
                                     async task(_, task) {
                                         const parameterManager = getParameterManager();
                                         const backend = await getBackend();
-                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                         const { parameters } = await parameterManager.getPackageParameters({
                                             package: packageName,
                                             profile,

package/dist/lib/flow-utils.d.ts

@@ -0,0 +1,7 @@
+export interface BuildFlowWorkspaceNameOptions {
+    pin?: boolean;
+    profile?: string;
+    project: string;
+    projectRootDir?: string;
+}
+export declare function buildFlowWorkspaceName(options: BuildFlowWorkspaceNameOptions): Promise<string>;

package/dist/lib/flow-utils.js

@@ -0,0 +1,22 @@
+import { gitUtils } from './git-utils.js';
+export async function buildFlowWorkspaceName(options) {
+    const { pin, profile, project, projectRootDir } = options;
+    // Get current git branch
+    const gitBranch = await gitUtils.getCurrentGitBranch(projectRootDir);
+    // Sanitize branch name
+    const sanitizedBranch = gitUtils.sanitizeBranchName(gitBranch);
+    if (!sanitizedBranch) {
+        throw new Error('Branch name contains only special characters and cannot be used for workspace name');
+    }
+    // Get commit SHA if pin is enabled
+    const commitSHA = pin ? await gitUtils.getShortCommitSHA(projectRootDir) : null;
+    // Build workspace name parts
+    const parts = [project, sanitizedBranch];
+    if (profile) {
+        parts.push(profile);
+    }
+    if (commitSHA) {
+        parts.push(commitSHA);
+    }
+    return parts.join('---');
+}

package/dist/lib/org-utils.js

@@ -9,7 +9,7 @@ export function extractOrgPrefix(name) {
     return { name };
 }
 export function addOrgPrefix(org, name) {
-    if (!org || name.includes('/')) {
+    if (!org || !name || name.includes('/')) {
         return name;
     }
     return `${org}/${name}`;

package/dist/lib/parameter/index.js

@@ -45,20 +45,6 @@ export class ParameterManager {
             };
         }
         const pkgName = getPackageCanonicalName(input.package);
-        const paramFilesExist = await Promise.all([
-            [`${pkgName}.yaml`, `${pkgName}.yml`],
-            [`${pkgName}.${input.workspace}.yaml`, `${pkgName}.${input.workspace}.yml`],
-        ].map(async ([filename, altFilename]) => {
-            const filePath = await getAnyPath(path.join(await this.getParametersFolder(input.projectRootDir), filename), path.join(await this.getParametersFolder(input.projectRootDir), altFilename));
-            const { found } = await load(filePath);
-            return found;
-        }));
-        if (paramFilesExist.some(Boolean)) {
-            return {
-                filePath: null,
-                saved: false,
-            };
-        }
         const filePath = path.join(await this.getParametersFolder(input.projectRootDir), `${pkgName}.yaml`);
         await save(input.parameters, filePath);
         return {

package/dist/lib/profile-utils.d.ts

@@ -1,2 +1,2 @@
 import { Backend } from '../backend/common.js';
-export declare function getProfileFromWorkspace(backend: Backend, workspaceName: string): Promise<string>;
+export declare function getProfileFromWorkspace(backend: Backend, workspaceName: string, project?: string): Promise<string>;

package/dist/lib/profile-utils.js

@@ -1,5 +1,8 @@
-export async function getProfileFromWorkspace(backend, workspaceName) {
-    const workspace$ = await backend.getWorkspace(workspaceName);
+import { resolveWorkspaceName } from './workspace-utils.js';
+export async function getProfileFromWorkspace(backend, workspaceName, project) {
+    // Resolve workspace name with org prefix if needed
+    const resolvedWorkspaceName = resolveWorkspaceName(workspaceName, project);
+    const workspace$ = await backend.getWorkspace(resolvedWorkspaceName);
     if (!workspace$.found || workspace$.hasError) {
         // Fallback to workspace name if workspace not found
         return workspaceName;

package/dist/lib/workspace-utils.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Resolves a workspace name by adding org prefix from project if needed.
+ *
+ * If the project has an org prefix and the workspace doesn't already have one,
+ * the org prefix from the project will be added to the workspace name.
+ *
+ * @param workspace - The workspace name
+ * @param project - Optional project name that may contain org prefix
+ * @returns The resolved workspace name
+ *
+ * @example
+ * resolveWorkspaceName('dev', 'myorg/myproject') // returns 'myorg/dev'
+ * resolveWorkspaceName('myorg/dev', 'myorg/myproject') // returns 'myorg/dev'
+ * resolveWorkspaceName('dev', 'myproject') // returns 'dev'
+ */
+export declare function resolveWorkspaceName(workspace: string, project?: string): string;

package/dist/lib/workspace-utils.js

@@ -0,0 +1,26 @@
+import { addOrgPrefix, extractOrgPrefix } from './org-utils.js';
+/**
+ * Resolves a workspace name by adding org prefix from project if needed.
+ *
+ * If the project has an org prefix and the workspace doesn't already have one,
+ * the org prefix from the project will be added to the workspace name.
+ *
+ * @param workspace - The workspace name
+ * @param project - Optional project name that may contain org prefix
+ * @returns The resolved workspace name
+ *
+ * @example
+ * resolveWorkspaceName('dev', 'myorg/myproject') // returns 'myorg/dev'
+ * resolveWorkspaceName('myorg/dev', 'myorg/myproject') // returns 'myorg/dev'
+ * resolveWorkspaceName('dev', 'myproject') // returns 'dev'
+ */
+export function resolveWorkspaceName(workspace, project) {
+    if (!project) {
+        return workspace;
+    }
+    const { org: projectOrg } = extractOrgPrefix(project);
+    if (!projectOrg) {
+        return workspace;
+    }
+    return addOrgPrefix(projectOrg, workspace);
+}