hereya-cli 0.72.1 → 0.73.1

package/dist/commands/uninit/index.js

@@ -0,0 +1,81 @@
+import { Args, Command, Flags } from '@oclif/core';
+import { Listr, ListrLogger, ListrLogLevels } from 'listr2';
+import { getBackend } from '../../backend/index.js';
+import { getExecutorForWorkspace } from '../../executor/context.js';
+import { getConfigManager } from '../../lib/config/index.js';
+import { getLogger, getLogPath, isDebug } from '../../lib/log.js';
+export default class Uninit extends Command {
+    static args = {
+        project: Args.string({ description: 'project name', required: true }),
+    };
+    static description = 'Destroy template infrastructure and uninitialize a project.';
+    static examples = [
+        '<%= config.bin %> <%= command.id %> myProject -w dev',
+    ];
+    static flags = {
+        chdir: Flags.string({
+            description: 'directory to run command in',
+            required: false,
+        }),
+        workspace: Flags.string({
+            char: 'w',
+            description: 'workspace used during init',
+            required: true,
+        }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(Uninit);
+        const projectRootDir = flags.chdir || process.env.HEREYA_PROJECT_ROOT_DIR;
+        const task = new Listr([
+            {
+                async task(ctx) {
+                    const backend = await getBackend();
+                    if (!backend.getProjectMetadata) {
+                        throw new Error('Uninit requires cloud backend. Run `hereya login` first.');
+                    }
+                    const result = await backend.getProjectMetadata({ project: args.project });
+                    if (!result.found) {
+                        throw new Error(`No template metadata found for project ${args.project}. Was it initialized with a template?`);
+                    }
+                    ctx.metadata = result.metadata;
+                },
+                title: 'Fetching project metadata',
+            },
+            {
+                rendererOptions: { persistentOutput: isDebug() },
+                async task(ctx, task) {
+                    const executor$ = await getExecutorForWorkspace(flags.workspace, args.project);
+                    if (!executor$.success)
+                        throw new Error(executor$.reason);
+                    const destroyOutput = await executor$.executor.destroy({
+                        logger: getLogger(task),
+                        package: ctx.metadata.template,
+                        project: args.project,
+                        workspace: flags.workspace,
+                    });
+                    if (!destroyOutput.success)
+                        throw new Error(destroyOutput.reason);
+                },
+                title: 'Destroying template infrastructure',
+            },
+            {
+                async task() {
+                    const backend = await getBackend();
+                    await backend.deleteState({ project: args.project, workspace: flags.workspace });
+                    const configManager = getConfigManager();
+                    await configManager.deleteConfig({ projectRootDir });
+                },
+                title: 'Cleaning up project state',
+            },
+        ], { concurrent: false });
+        try {
+            await task.run();
+            const myLogger = new ListrLogger({ useIcons: false });
+            myLogger.log(ListrLogLevels.COMPLETED, `Template infrastructure destroyed for ${args.project}`);
+            myLogger.log(ListrLogLevels.COMPLETED, 'Complete cleanup on Hereya Cloud dashboard.');
+        }
+        catch (error) {
+            this.error(`${error.message}\n\nSee ${getLogPath()} for more details`);
+        }
+    }
+}

package/dist/lib/config/common.d.ts

@@ -1,6 +1,10 @@
 import { IPackageMetadata } from '../package/index.js';
+export interface DeleteConfigInput {
+    projectRootDir?: string;
+}
 export interface ConfigManager {
     addPackage: (input: AddPackageInput) => Promise<void>;
+    deleteConfig: (input: DeleteConfigInput) => Promise<void>;
     loadConfig: (input: LoadConfigInput) => Promise<LoadConfigOutput>;
     removePackage: (input: RemovePackageInput) => Promise<void>;
     saveConfig: (input: SaveConfigInput) => Promise<void>;

package/dist/lib/config/simple.d.ts

@@ -1,6 +1,7 @@
-import { AddPackageInput, ConfigManager, LoadConfigInput, LoadConfigOutput, RemovePackageInput, SaveConfigInput } from './common.js';
+import { AddPackageInput, ConfigManager, DeleteConfigInput, LoadConfigInput, LoadConfigOutput, RemovePackageInput, SaveConfigInput } from './common.js';
 export declare class SimpleConfigManager implements ConfigManager {
     addPackage(input: AddPackageInput): Promise<void>;
+    deleteConfig(input: DeleteConfigInput): Promise<void>;
     loadConfig(input: LoadConfigInput): Promise<LoadConfigOutput>;
     removePackage(input: RemovePackageInput): Promise<void>;
     saveConfig(input: SaveConfigInput): Promise<void>;

package/dist/lib/config/simple.js

@@ -1,5 +1,6 @@
+import { unlink } from 'node:fs/promises';
 import path from 'node:path';
-import { getAnyPath } from '../filesystem.js';
+import { fileExists, getAnyPath } from '../filesystem.js';
 import * as yaml from '../yaml-utils.js';
 export class SimpleConfigManager {
     async addPackage(input) {
@@ -46,6 +47,12 @@ export class SimpleConfigManager {
             ...sectionUpdate,
         }, await this.getConfigPath(input.projectRootDir));
     }
+    async deleteConfig(input) {
+        const configPath = await this.getConfigPath(input.projectRootDir);
+        if (await fileExists(configPath)) {
+            await unlink(configPath);
+        }
+    }
     async loadConfig(input) {
         const configFilePath = await this.getConfigPath(input.projectRootDir);
         const { data: config, found } = await yaml.load(configFilePath);

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

@@ -1,4 +1,8 @@
 export declare const gitUtils: {
+    /**
+     * Clones a git repository using the hereya credential helper.
+     */
+    cloneWithCredentialHelper(input: CloneWithCredentialHelperInput): Promise<CloneOutput>;
     /**
      * Gets the current git branch name.
      * @param cwd The working directory to execute git command in
@@ -26,4 +30,29 @@ export declare const gitUtils: {
      * @returns The sanitized branch name
      */
     sanitizeBranchName(branch: string): string;
+    /**
+     * Sets up the hereya credential helper in a git repository.
+     */
+    setupCredentialHelper(input: {
+        hereyaBinPath: string;
+        projectDir: string;
+    }): Promise<void>;
+};
+export type CloneWithCredentialHelperInput = {
+    gitUrl: string;
+    hereyaBinPath: string;
+    password?: string;
+    targetDir: string;
+    username?: string;
+};
+export type CloneOutput = {
+    reason: string;
+    success: false;
+} | {
+    success: true;
 };
+export declare function cloneWithCredentialHelper(input: CloneWithCredentialHelperInput): Promise<CloneOutput>;
+export declare function setupCredentialHelper(input: {
+    hereyaBinPath: string;
+    projectDir: string;
+}): Promise<void>;

package/dist/lib/git-utils.js

@@ -1,5 +1,12 @@
+import { spawn } from 'node:child_process';
 import { runShell } from './shell.js';
 export const gitUtils = {
+    /**
+     * Clones a git repository using the hereya credential helper.
+     */
+    async cloneWithCredentialHelper(input) {
+        return cloneWithCredentialHelper(input);
+    },
     /**
      * Gets the current git branch name.
      * @param cwd The working directory to execute git command in
@@ -58,5 +65,67 @@ export const gitUtils = {
      */
     sanitizeBranchName(branch) {
         return branch.replaceAll(/[^a-zA-Z0-9_-]/g, '');
-    }
+    },
+    /**
+     * Sets up the hereya credential helper in a git repository.
+     */
+    async setupCredentialHelper(input) {
+        return setupCredentialHelper(input);
+    },
 };
+export async function cloneWithCredentialHelper(input) {
+    const { gitUrl, hereyaBinPath, password, targetDir, username } = input;
+    // Build the credential helper config
+    // The ! prefix tells git to treat it as a shell command
+    const credHelper = `!${hereyaBinPath} credential-helper`;
+    return new Promise((resolve) => {
+        const env = { ...process.env };
+        if (username)
+            env.hereyaGitUsername = username;
+        if (password)
+            env.hereyaGitPassword = password;
+        const child = spawn('git', [
+            'clone',
+            '-c', 'credential.helper=',
+            '-c', `credential.helper=${credHelper}`,
+            gitUrl,
+            targetDir,
+        ], {
+            env,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        let stderr = '';
+        child.stderr?.on('data', (data) => {
+            stderr += data.toString();
+        });
+        child.on('close', (code) => {
+            if (code === 0) {
+                resolve({ success: true });
+            }
+            else {
+                resolve({ reason: `git clone failed (exit code ${code}): ${stderr.trim()}`, success: false });
+            }
+        });
+        child.on('error', (err) => {
+            resolve({ reason: `git clone failed: ${err.message}`, success: false });
+        });
+    });
+}
+export async function setupCredentialHelper(input) {
+    const { hereyaBinPath, projectDir } = input;
+    const credHelper = `!${hereyaBinPath} credential-helper`;
+    const runGitConfig = (args) => new Promise((resolve, reject) => {
+        const child = spawn('git', args, { cwd: projectDir, stdio: 'pipe' });
+        child.on('close', (code) => {
+            if (code === 0)
+                resolve();
+            else
+                reject(new Error(`git config failed with exit code ${code}`));
+        });
+        child.on('error', reject);
+    });
+    // Empty string resets the helper list, clearing any global/system helpers (e.g. GCM)
+    await runGitConfig(['config', 'credential.helper', '']);
+    // Then add ours — git tries helpers in config order, so this is the only one
+    await runGitConfig(['config', '--add', 'credential.helper', credHelper]);
+}

package/dist/lib/hereya-token.d.ts

@@ -0,0 +1,6 @@
+export declare const hereyaTokenUtils: {
+    generateHereyaToken(description: string): Promise<null | {
+        cloudUrl: string;
+        token: string;
+    }>;
+};

package/dist/lib/hereya-token.js

@@ -0,0 +1,29 @@
+import { getCloudCredentials, loadBackendConfig } from '../backend/config.js';
+export const hereyaTokenUtils = {
+    async generateHereyaToken(description) {
+        const backendConfig = await loadBackendConfig();
+        if (!backendConfig.cloud) {
+            return null;
+        }
+        const { clientId, url } = backendConfig.cloud;
+        const credentials = await getCloudCredentials(clientId);
+        if (!credentials) {
+            return null;
+        }
+        const formData = new FormData();
+        formData.append('description', description);
+        formData.append('expiresInDays', '365');
+        const response = await fetch(`${url}/api/personal-tokens`, {
+            body: formData,
+            headers: {
+                Authorization: `Bearer ${credentials.accessToken}`,
+            },
+            method: 'POST',
+        });
+        if (!response.ok) {
+            return null;
+        }
+        const result = await response.json();
+        return { cloudUrl: url, token: result.data.token };
+    },
+};

package/oclif.manifest.json

@@ -102,6 +102,34 @@
         "index.js"
       ]
     },
+    "credential-helper": {
+      "aliases": [],
+      "args": {
+        "operation": {
+          "description": "Git credential operation (get, store, erase)",
+          "name": "operation",
+          "required": true
+        }
+      },
+      "description": "Git credential helper for hereya-managed repositories",
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hidden": true,
+      "hiddenAliases": [],
+      "id": "credential-helper",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "credential-helper",
+        "index.js"
+      ]
+    },
     "delete-state": {
       "aliases": [],
       "args": {},
@@ -459,7 +487,9 @@
       "description": "Initialize hereya in a project directory.",
       "examples": [
         "<%= config.bin %> <%= command.id %> myProject -w=defaultWorkspace",
-        "<%= config.bin %> <%= command.id %> myProject -w=defaultWorkspace --chdir=./myProject"
+        "<%= config.bin %> <%= command.id %> myProject -w=defaultWorkspace --chdir=./myProject",
+        "<%= config.bin %> <%= command.id %> myProject -w=dev -t=acme/node-starter",
+        "<%= config.bin %> <%= command.id %> myProject -w=dev -t=acme/node-starter -p region=us-east-1"
       ],
       "flags": {
         "chdir": {
@@ -470,6 +500,24 @@
           "multiple": false,
           "type": "option"
         },
+        "parameter": {
+          "char": "p",
+          "description": "template parameter, in the form of 'key=value'. Can be specified multiple times.",
+          "name": "parameter",
+          "default": [],
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "template": {
+          "char": "t",
+          "description": "template package name (e.g. owner/repo)",
+          "name": "template",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "workspace": {
           "char": "w",
           "description": "workspace to set as default",
@@ -898,6 +946,54 @@
         "index.js"
       ]
     },
+    "uninit": {
+      "aliases": [],
+      "args": {
+        "project": {
+          "description": "project name",
+          "name": "project",
+          "required": true
+        }
+      },
+      "description": "Destroy template infrastructure and uninitialize a project.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> myProject -w dev"
+      ],
+      "flags": {
+        "chdir": {
+          "description": "directory to run command in",
+          "name": "chdir",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "workspace": {
+          "char": "w",
+          "description": "workspace used during init",
+          "name": "workspace",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "uninit",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "uninit",
+        "index.js"
+      ]
+    },
     "up": {
       "aliases": [],
       "args": {},
@@ -2227,6 +2323,56 @@
         "index.js"
       ]
     },
+    "devenv:project:uninit": {
+      "aliases": [],
+      "args": {
+        "project": {
+          "description": "project name",
+          "name": "project",
+          "required": true
+        }
+      },
+      "description": "Uninitialize a project on a remote dev environment.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> my-app -w my-workspace",
+        "<%= config.bin %> <%= command.id %> my-app -w my-workspace --force"
+      ],
+      "flags": {
+        "force": {
+          "char": "f",
+          "description": "also remove the project directory after uninit",
+          "name": "force",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "workspace": {
+          "char": "w",
+          "description": "name of the workspace",
+          "name": "workspace",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "devenv:project:uninit",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "devenv",
+        "project",
+        "uninit",
+        "index.js"
+      ]
+    },
     "devenv:project:init": {
       "aliases": [],
       "args": {
@@ -2238,7 +2384,9 @@
       },
       "description": "Initialize a project on a remote dev environment.",
       "examples": [
-        "<%= config.bin %> <%= command.id %> my-app -w my-workspace"
+        "<%= config.bin %> <%= command.id %> my-app -w my-workspace",
+        "<%= config.bin %> <%= command.id %> my-app -w my-workspace -t acme/node-starter",
+        "<%= config.bin %> <%= command.id %> my-app -w my-workspace -t acme/node-starter -p region=us-east-1"
       ],
       "flags": {
         "force": {
@@ -2248,6 +2396,25 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "parameter": {
+          "char": "p",
+          "description": "parameter for the template, in the form of 'key=value'. Can be specified multiple times.",
+          "name": "parameter",
+          "required": false,
+          "default": [],
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "template": {
+          "char": "t",
+          "description": "template package to scaffold the project from",
+          "name": "template",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "workspace": {
           "char": "w",
           "description": "name of the workspace",
@@ -2505,11 +2672,17 @@
         "index.js"
       ]
     },
-    "workspace:executor:token": {
+    "workspace:executor:uninstall": {
       "aliases": [],
       "args": {},
-      "description": "Generate a workspace-scoped executor token for the remote executor",
+      "description": "Uninstall the remote executor from a workspace",
       "flags": {
+        "debug": {
+          "description": "enable debug mode",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "workspace": {
           "char": "w",
           "description": "name of the workspace",
@@ -2522,7 +2695,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "workspace:executor:token",
+      "id": "workspace:executor:uninstall",
       "pluginAlias": "hereya-cli",
       "pluginName": "hereya-cli",
       "pluginType": "core",
@@ -2534,21 +2707,15 @@
         "commands",
         "workspace",
         "executor",
-        "token",
+        "uninstall",
         "index.js"
       ]
     },
-    "workspace:executor:uninstall": {
+    "workspace:executor:token": {
       "aliases": [],
       "args": {},
-      "description": "Uninstall the remote executor from a workspace",
+      "description": "Generate a workspace-scoped executor token for the remote executor",
       "flags": {
-        "debug": {
-          "description": "enable debug mode",
-          "name": "debug",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "workspace": {
           "char": "w",
           "description": "name of the workspace",
@@ -2561,7 +2728,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "workspace:executor:uninstall",
+      "id": "workspace:executor:token",
       "pluginAlias": "hereya-cli",
       "pluginName": "hereya-cli",
       "pluginType": "core",
@@ -2573,10 +2740,10 @@
         "commands",
         "workspace",
         "executor",
-        "uninstall",
+        "token",
         "index.js"
       ]
     }
   },
-  "version": "0.72.1"
+  "version": "0.73.1"
 }

package/package.json

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