hereya-cli 0.45.0 → 0.47.0

package/dist/commands/delete-state/index.js

@@ -0,0 +1,49 @@
+import { Command, Flags } from '@oclif/core';
+import { getBackend } from '../../backend/index.js';
+import { getConfigManager } from '../../lib/config/index.js';
+export default class DeleteState extends Command {
+    static description = 'Delete the remote state of a project for a given workspace';
+    static examples = [
+        '<%= config.bin %> <%= command.id %> -w dev',
+        '<%= config.bin %> <%= command.id %> --workspace 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,
+        }),
+        workspace: Flags.string({
+            char: 'w',
+            description: 'workspace name',
+            required: true,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(DeleteState);
+        const projectRootDir = flags.chdir || process.env.HEREYA_PROJECT_ROOT_DIR;
+        const configManager = getConfigManager();
+        const loadConfigOutput = await configManager.loadConfig({ projectRootDir });
+        if (!loadConfigOutput.found) {
+            this.error("Project not initialized. Run 'hereya init' first.");
+        }
+        const { config } = loadConfigOutput;
+        const backend = await getBackend();
+        const output = await backend.deleteState({
+            project: config.project,
+            workspace: flags.workspace,
+        });
+        if (!output.success) {
+            this.error(`Failed to delete state: ${output.reason}`);
+        }
+        if (output.message) {
+            this.log(output.message);
+        }
+        else {
+            this.log(`State for project ${config.project} in workspace ${flags.workspace} deleted successfully`);
+        }
+    }
+}

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

@@ -3,6 +3,7 @@ import path from 'node:path';
 import { getConfigManager } from '../../../lib/config/index.js';
 import { getEnvManager } from '../../../lib/env/index.js';
 import { getAnyPath } from '../../../lib/filesystem.js';
+import { stripOrgPrefix } from '../../../lib/org-utils.js';
 import { load, save } from '../../../lib/yaml-utils.js';
 export default class EnvSet extends Command {
     static args = {
@@ -43,8 +44,9 @@ export default class EnvSet extends Command {
         }
         const envManager = getEnvManager();
         const envDir = await envManager.getStaticEnvDir(projectRootDir);
-        const candidates = flags.workspace
-            ? [path.join(envDir, `env.${flags.workspace}.yaml`), path.join(envDir, `env.${flags.workspace}.yml`)]
+        const workspaceName = flags.workspace ? stripOrgPrefix(flags.workspace) : null;
+        const candidates = workspaceName
+            ? [path.join(envDir, `env.${workspaceName}.yaml`), path.join(envDir, `env.${workspaceName}.yml`)]
             : [path.join(envDir, `env.yaml`), path.join(envDir, `env.yml`)];
         const envFile = await getAnyPath(...candidates);
         const { data: env } = await load(envFile);

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

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

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

@@ -0,0 +1,110 @@
+import { Command, Flags } from '@oclif/core';
+import { getConfigManager } from '../../../lib/config/index.js';
+import { gitUtils } from '../../../lib/git-utils.js';
+import { setDebug } from '../../../lib/log.js';
+import DeleteState from '../../delete-state/index.js';
+import Down from '../../down/index.js';
+import WorkspaceCreate from '../../workspace/create/index.js';
+import WorkspaceDelete from '../../workspace/delete/index.js';
+export default class FlowDown extends Command {
+    static description = 'Create a git branch-based workspace and destroy all packages';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --debug',
+        '<%= config.bin %> <%= command.id %> --profile staging',
+        '<%= config.bin %> <%= command.id %> --pin',
+    ];
+    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',
+        }),
+        deploy: Flags.boolean({
+            description: 'destroy deployment companion packages',
+            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,
+        }),
+        select: Flags.string({
+            char: 's',
+            default: [],
+            description: 'select the packages to destroy',
+            multiple: true,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(FlowDown);
+        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.");
+        }
+        // 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('---');
+        // 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);
+        // Run down command with the new workspace and all flags
+        const downArgs = ['--workspace', workspaceName];
+        // Pass through all flags
+        if (flags.chdir)
+            downArgs.push('--chdir', flags.chdir);
+        if (flags.debug)
+            downArgs.push('--debug');
+        if (flags.deploy)
+            downArgs.push('--deploy');
+        for (const pkg of flags.select) {
+            downArgs.push('--select', pkg);
+        }
+        await Down.run(downArgs);
+        // Delete state
+        const deleteStateArgs = ['--workspace', workspaceName];
+        if (projectRootDir) {
+            deleteStateArgs.push('--chdir', projectRootDir);
+        }
+        await DeleteState.run(deleteStateArgs);
+        // Delete workspace
+        const deleteWorkspaceArgs = [workspaceName];
+        await WorkspaceDelete.run(deleteWorkspaceArgs);
+    }
+}

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

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

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

@@ -0,0 +1,99 @@
+import { Command, Flags } from '@oclif/core';
+import { getConfigManager } from '../../../lib/config/index.js';
+import { gitUtils } from '../../../lib/git-utils.js';
+import { setDebug } from '../../../lib/log.js';
+import Up from '../../up/index.js';
+import WorkspaceCreate from '../../workspace/create/index.js';
+export default class FlowUp extends Command {
+    static description = 'Create a git branch-based workspace and provision all packages';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --debug',
+        '<%= config.bin %> <%= command.id %> --profile staging',
+        '<%= config.bin %> <%= command.id %> --pin',
+    ];
+    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',
+        }),
+        deploy: Flags.boolean({
+            description: 'provision deployment companion packages',
+            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,
+        }),
+        select: Flags.string({
+            char: 's',
+            default: [],
+            description: 'select the packages to provision',
+            multiple: true,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(FlowUp);
+        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.");
+        }
+        // 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('---');
+        // 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);
+        // Run up command with the new workspace and all flags
+        const upArgs = ['--workspace', workspaceName];
+        // Pass through all flags
+        if (flags.chdir)
+            upArgs.push('--chdir', flags.chdir);
+        if (flags.debug)
+            upArgs.push('--debug');
+        if (flags.deploy)
+            upArgs.push('--deploy');
+        for (const pkg of flags.select) {
+            upArgs.push('--select', pkg);
+        }
+        await Up.run(upArgs);
+    }
+}

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

@@ -8,6 +8,7 @@ export default class Remove extends Command {
     static flags: {
         chdir: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        workspace: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/remove/index.js

@@ -30,6 +30,11 @@ export default class Remove extends Command {
             default: false,
             description: 'enable debug mode',
         }),
+        workspace: Flags.string({
+            char: 'w',
+            description: 'name of the workspace to remove the package from (defaults to current workspace)',
+            required: false,
+        }),
     };
     async run() {
         const { args, flags } = await this.parse(Remove);
@@ -53,6 +58,8 @@ export default class Remove extends Command {
                                     throw new Error("Project not initialized. Run 'hereya init' first.");
                                 }
                                 ctx.configOutput = loadConfigOutput;
+                                // Use workspace from flag if provided, otherwise use config workspace
+                                ctx.workspace = flags.workspace || loadConfigOutput.config.workspace;
                                 const { config } = loadConfigOutput;
                                 if (!(ctx.package in (config.packages ?? {})) && !(ctx.package in (config.deploy ?? {}))) {
                                     throw new Error(`Package ${ctx.package} not found in the project.`);
@@ -65,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.configOutput.config.workspace);
+                                const profile = await getProfileFromWorkspace(backend, ctx.workspace);
                                 const parametersOutput = await parameterManager.getPackageParameters({
                                     package: ctx.package,
                                     profile,
@@ -93,7 +100,7 @@ export default class Remove extends Command {
                                     project: ctx.configOutput.config.project,
                                     projectRootDir,
                                     skipDeploy: true,
-                                    workspace: ctx.configOutput.config.workspace,
+                                    workspace: ctx.workspace,
                                 });
                                 if (!destroyOutput.success) {
                                     throw new Error(destroyOutput.reason);
@@ -109,7 +116,7 @@ export default class Remove extends Command {
                                     env: ctx.destroyOutput.env,
                                     infra: ctx.destroyOutput.metadata.infra,
                                     projectRootDir,
-                                    workspace: ctx.configOutput.config.workspace,
+                                    workspace: ctx.workspace,
                                 });
                                 await delay(500);
                             },
@@ -128,11 +135,11 @@ export default class Remove extends Command {
                             title: 'Removing package from hereya manifest',
                         },
                         {
-                            async task() {
+                            async task(ctx) {
                                 const backend = await getBackend();
                                 const configManager = getConfigManager();
                                 const { config: newConfig } = await configManager.loadConfig({ projectRootDir });
-                                await backend.saveState(newConfig);
+                                await backend.saveState(newConfig, ctx.workspace);
                                 await delay(500);
                             },
                             title: 'Saving state',

package/dist/lib/env/index.js

@@ -2,6 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { getExecutor } from '../../executor/index.js';
 import { getAnyPath } from '../filesystem.js';
+import { stripOrgPrefix } from '../org-utils.js';
 import { load, parseYaml, save } from '../yaml-utils.js';
 export class EnvManager {
     async addProjectEnv(input) {
@@ -92,7 +93,8 @@ export class EnvManager {
         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`));
+        const workspaceName = stripOrgPrefix(input.workspace);
+        return getAnyPath(path.join(input.projectRootDir ?? process.cwd(), '.hereya', `env.${workspaceName}.yaml`), path.join(input.projectRootDir ?? process.cwd(), '.hereya', `env.${workspaceName}.yml`));
     }
     async getUserEnvPaths(profile, projectRootDir) {
         const paths = await Promise.all([

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

@@ -0,0 +1,29 @@
+export declare const gitUtils: {
+    /**
+     * Gets the current git branch name.
+     * @param cwd The working directory to execute git command in
+     * @returns The current branch name
+     * @throws Error if not in a git repository or git command fails
+     */
+    getCurrentGitBranch(cwd?: string): Promise<string>;
+    /**
+     * Gets the short commit SHA of the current HEAD.
+     * @param cwd The working directory to execute git command in
+     * @returns The short commit SHA (7 characters by default)
+     * @throws Error if not in a git repository or git command fails
+     */
+    getShortCommitSHA(cwd?: string): Promise<string>;
+    /**
+     * Checks if the current directory is a git repository.
+     * @param cwd The working directory to check
+     * @returns true if in a git repository, false otherwise
+     */
+    isGitRepository(cwd?: string): Promise<boolean>;
+    /**
+     * Sanitizes a git branch name for use in workspace names.
+     * Keeps only alphanumeric characters, hyphens (-), and underscores (_).
+     * @param branch The branch name to sanitize
+     * @returns The sanitized branch name
+     */
+    sanitizeBranchName(branch: string): string;
+};

package/dist/lib/git-utils.js

@@ -0,0 +1,62 @@
+import { runShell } from './shell.js';
+export const gitUtils = {
+    /**
+     * Gets the current git branch name.
+     * @param cwd The working directory to execute git command in
+     * @returns The current branch name
+     * @throws Error if not in a git repository or git command fails
+     */
+    async getCurrentGitBranch(cwd) {
+        try {
+            const { stdout } = await runShell('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { directory: cwd });
+            return stdout.trim();
+        }
+        catch (error) {
+            if (error.message.includes('not a git repository') || error.message.includes('exit code "128"')) {
+                throw new Error('Not in a git repository. The flow commands require git integration.');
+            }
+            throw new Error(`Failed to get current git branch: ${error.message}`);
+        }
+    },
+    /**
+     * Gets the short commit SHA of the current HEAD.
+     * @param cwd The working directory to execute git command in
+     * @returns The short commit SHA (7 characters by default)
+     * @throws Error if not in a git repository or git command fails
+     */
+    async getShortCommitSHA(cwd) {
+        try {
+            const { stdout } = await runShell('git', ['rev-parse', '--short', 'HEAD'], { directory: cwd });
+            return stdout.trim();
+        }
+        catch (error) {
+            if (error.message.includes('not a git repository') || error.message.includes('exit code "128"')) {
+                throw new Error('Not in a git repository. The flow commands require git integration.');
+            }
+            throw new Error(`Failed to get commit SHA: ${error.message}`);
+        }
+    },
+    /**
+     * Checks if the current directory is a git repository.
+     * @param cwd The working directory to check
+     * @returns true if in a git repository, false otherwise
+     */
+    async isGitRepository(cwd) {
+        try {
+            await runShell('git', ['rev-parse', '--git-dir'], { directory: cwd });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    },
+    /**
+     * Sanitizes a git branch name for use in workspace names.
+     * Keeps only alphanumeric characters, hyphens (-), and underscores (_).
+     * @param branch The branch name to sanitize
+     * @returns The sanitized branch name
+     */
+    sanitizeBranchName(branch) {
+        return branch.replaceAll(/[^a-zA-Z0-9_-]/g, '');
+    }
+};