hereya-cli 0.9.2 → 0.11.0

package/dist/infrastructure/local.js

@@ -1,8 +1,8 @@
 import * as fs from 'node:fs/promises';
 import * as os from 'node:os';
 import * as path from 'node:path';
-import { simpleGit } from 'simple-git';
 import { getIac } from '../iac/index.js';
+import { downloadPackage } from '../lib/package/index.js';
 export class LocalInfrastructure {
     async bootstrap() {
         console.log('Bootstrapping local infrastructure');
@@ -11,14 +11,14 @@ export class LocalInfrastructure {
         input.parameters = {
             ...input.parameters,
             hereyaProjectEnv: JSON.stringify(input.projectEnv ?? {}),
-            hereyaProjectRootDir: input.projectRootDir
+            hereyaProjectRootDir: input.projectRootDir,
         };
         return this.provision(input);
     }
     async destroy(input) {
         // noinspection DuplicatedCode
         const destPath = path.join(os.homedir(), '.hereya', input.id, input.canonicalName);
-        const downloadPath = await this.download(input.pkgUrl, destPath);
+        const downloadPath = await downloadPackage(input.pkgUrl, destPath);
         const iac$ = getIac({ type: input.iacType });
         if (!iac$.supported) {
             return { reason: iac$.reason, success: false };
@@ -28,7 +28,7 @@ export class LocalInfrastructure {
             env: input.env ?? {},
             id: input.id,
             parameters: input.parameters,
-            pkgPath: downloadPath
+            pkgPath: downloadPath,
         });
         if (!output.success) {
             return { reason: output.reason, success: false };
@@ -40,7 +40,7 @@ export class LocalInfrastructure {
     async provision(input) {
         // noinspection DuplicatedCode
         const destPath = path.join(os.homedir(), '.hereya', input.id, input.canonicalName);
-        const downloadPath = await this.download(input.pkgUrl, destPath);
+        const downloadPath = await downloadPackage(input.pkgUrl, destPath);
         const iac$ = getIac({ type: input.iacType });
         if (!iac$.supported) {
             return { reason: iac$.reason, success: false };
@@ -50,7 +50,7 @@ export class LocalInfrastructure {
             env: input.env ?? {},
             id: input.id,
             parameters: input.parameters,
-            pkgPath: downloadPath
+            pkgPath: downloadPath,
         });
         if (!output.success) {
             return { reason: output.reason, success: false };
@@ -64,6 +64,9 @@ export class LocalInfrastructure {
         console.log(`Saving env to ${input.id}`);
         return { success: true };
     }
+    async storeEnv(input) {
+        return { success: true, value: input.value };
+    }
     async unbootstrap() {
         console.log('Unbootstrapping local infrastructure');
     }
@@ -71,30 +74,11 @@ export class LocalInfrastructure {
         input.parameters = {
             ...input.parameters,
             hereyaProjectEnv: JSON.stringify(input.projectEnv ?? {}),
-            hereyaProjectRootDir: input.projectRootDir
+            hereyaProjectRootDir: input.projectRootDir,
         };
         return this.destroy(input);
     }
-    async download(pkgUrl, destPath) {
-        if (await this.isNotEmpty(destPath)) {
-            console.log(`Package already downloaded at ${destPath}`);
-            return destPath;
-        }
-        await fs.mkdir(destPath, { recursive: true });
-        console.log(`Downloading package from ${pkgUrl}`);
-        // Initialize simple-git
-        const git = simpleGit();
-        // Clone repository into temp directory
-        await git.clone(pkgUrl, destPath, ['--depth=1']);
-        return destPath;
-    }
-    async isNotEmpty(directoryPath) {
-        try {
-            const files = await fs.readdir(directoryPath);
-            return files.length > 0;
-        }
-        catch {
-            return false; // or you can handle the error as needed
-        }
+    async unstoreEnv(_) {
+        return { success: true };
     }
 }

package/dist/lib/filesystem.d.ts

@@ -1,2 +1,3 @@
 export declare function getAnyPath(...candidates: string[]): Promise<string>;
 export declare function fileExists(filePath: string): Promise<boolean>;
+export declare function isNotEmpty(directoryPath: string): Promise<boolean>;

package/dist/lib/filesystem.js

@@ -1,4 +1,4 @@
-import { access, constants } from 'node:fs/promises';
+import { access, constants, readdir } from 'node:fs/promises';
 export async function getAnyPath(...candidates) {
     const checkAccess = async (index) => {
         if (index >= candidates.length)
@@ -22,3 +22,12 @@ export async function fileExists(filePath) {
         return false;
     }
 }
+export async function isNotEmpty(directoryPath) {
+    try {
+        const files = await readdir(directoryPath);
+        return files.length > 0;
+    }
+    catch {
+        return false;
+    }
+}

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

@@ -6,6 +6,7 @@ export declare const packageManager: PackageManager;
 export declare function getPackageManager(): PackageManager;
 export declare function resolvePackage(input: ResolvePackageInput): Promise<ResolvePackageOutput>;
 export declare function getPackageCanonicalName(packageName: string): string;
+export declare function downloadPackage(pkgUrl: string, destPath: string): Promise<string>;
 export type ResolvePackageInput = {
     isDeploying?: boolean;
     package: string;

package/dist/lib/package/index.js

@@ -1,7 +1,10 @@
+import * as fs from 'node:fs/promises';
+import { simpleGit } from 'simple-git';
 import * as yaml from 'yaml';
 import { z } from 'zod';
 import { IacType } from '../../iac/common.js';
 import { InfrastructureType } from '../../infrastructure/common.js';
+import { isNotEmpty } from '../filesystem.js';
 import { GitHubPackageManager } from './github.js';
 export const packageManager = new GitHubPackageManager();
 export function getPackageManager() {
@@ -18,7 +21,7 @@ export async function resolvePackage(input) {
     const metadataContentCandidates = (await Promise.all([
         packageManager.getRepoContent({ owner, path: 'hereyarc.yaml', repo }),
         packageManager.getRepoContent({ owner, path: 'hereyarc.yml', repo }),
-    ])).filter(content$ => content$.found);
+    ])).filter((content$) => content$.found);
     if (metadataContentCandidates.length === 0) {
         return { found: false, reason: `No hereya metadata file found in ${pkgUrl}` };
     }
@@ -31,16 +34,16 @@ export async function resolvePackage(input) {
         if (input.isDeploying && metadata.onDeploy) {
             return resolvePackage({ package: metadata.onDeploy.pkg });
         }
-        if (process.env.HEREYA_OVERRIDE_INFRA) {
-            metadata.originalInfra = metadata.infra;
-            metadata.infra = process.env.HEREYA_OVERRIDE_INFRA;
-        }
+        // if (process.env.HEREYA_OVERRIDE_INFRA) {
+        //   metadata.originalInfra = metadata.infra
+        //   metadata.infra = process.env.HEREYA_OVERRIDE_INFRA as InfrastructureType
+        // }
         return {
             canonicalName: getPackageCanonicalName(input.package),
             found: true,
             metadata,
             packageUri: pkgUrl,
-            pkgName: input.package
+            pkgName: input.package,
         };
     }
     catch (error) {
@@ -50,14 +53,29 @@ export async function resolvePackage(input) {
 export function getPackageCanonicalName(packageName) {
     return packageName.replace('/', '-');
 }
+export async function downloadPackage(pkgUrl, destPath) {
+    if (await isNotEmpty(destPath)) {
+        console.log(`Package already downloaded at ${destPath}`);
+        return destPath;
+    }
+    await fs.mkdir(destPath, { recursive: true });
+    console.log(`Downloading package from ${pkgUrl}`);
+    // Initialize simple-git
+    const git = simpleGit();
+    // Clone repository into temp directory
+    await git.clone(pkgUrl, destPath, ['--depth=1']);
+    return destPath;
+}
 export const PackageMetadata = z.object({
     dependencies: z.record(z.string()).optional(),
     deploy: z.boolean().optional(),
     iac: z.nativeEnum(IacType),
     infra: z.nativeEnum(InfrastructureType),
-    onDeploy: z.object({
+    onDeploy: z
+        .object({
         pkg: z.string(),
         version: z.string(),
-    }).optional(),
+    })
+        .optional(),
     originalInfra: z.nativeEnum(InfrastructureType).optional(),
 });

package/oclif.manifest.json

@@ -504,56 +504,6 @@
         "index.js"
       ]
     },
-    "remote:exec": {
-      "aliases": [],
-      "args": {
-        "pkgPath": {
-          "description": "The path to the package to provision or destroy",
-          "name": "pkgPath",
-          "required": false
-        }
-      },
-      "description": "remotely provision or destroy a package",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>"
-      ],
-      "flags": {
-        "output": {
-          "char": "o",
-          "description": "The path to store the output env in",
-          "name": "output",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "source": {
-          "char": "s",
-          "description": "The source of the project to provision or destroy the package for",
-          "name": "source",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "remote:exec",
-      "pluginAlias": "hereya-cli",
-      "pluginName": "hereya-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "remote",
-        "exec",
-        "index.js"
-      ]
-    },
     "workspace:create": {
       "aliases": [],
       "args": {
@@ -585,37 +535,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:env": {
       "aliases": [],
       "args": {
@@ -666,6 +585,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:install": {
       "aliases": [],
       "args": {
@@ -781,7 +731,122 @@
         "uninstall",
         "index.js"
       ]
+    },
+    "workspace:env:set": {
+      "aliases": [],
+      "args": {},
+      "description": "set an env var for a workspace",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> -w my-workspace -n myVar -v my-value -i aws -s"
+      ],
+      "flags": {
+        "infra": {
+          "char": "i",
+          "description": "the infrastructure to store the env var in",
+          "name": "infra",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "name": {
+          "char": "n",
+          "description": "name of the env var to set",
+          "name": "name",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "sensitive": {
+          "char": "s",
+          "description": "whether the env var is sensitive",
+          "name": "sensitive",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "value": {
+          "char": "v",
+          "description": "value of the env var to set",
+          "name": "value",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "workspace": {
+          "char": "w",
+          "description": "name of the workspace to set an env var for",
+          "name": "workspace",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "workspace:env:set",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "workspace",
+        "env",
+        "set",
+        "index.js"
+      ]
+    },
+    "workspace:env:unset": {
+      "aliases": [],
+      "args": {},
+      "description": "unset an env var for a workspace",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> -w my-workspace -n myVar"
+      ],
+      "flags": {
+        "name": {
+          "char": "n",
+          "description": "name of the env var to unset",
+          "name": "name",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "workspace": {
+          "char": "w",
+          "description": "name of the workspace to unset an env var for",
+          "name": "workspace",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "workspace:env:unset",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "workspace",
+        "env",
+        "unset",
+        "index.js"
+      ]
     }
   },
-  "version": "0.9.2"
+  "version": "0.11.0"
 }

package/package.json

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

package/dist/commands/remote/exec/index.d.ts

@@ -1,13 +0,0 @@
-import { Command } from '@oclif/core';
-export default class RemoteExec extends Command {
-    static args: {
-        pkgPath: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
-    };
-    static description: string;
-    static examples: string[];
-    static flags: {
-        output: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        source: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-    };
-    run(): Promise<void>;
-}

package/dist/commands/remote/exec/index.js

@@ -1,89 +0,0 @@
-import { Args, Command, Flags } from '@oclif/core';
-import path from 'node:path';
-import { getIac } from '../../../iac/index.js';
-import { getInfrastructure } from '../../../infrastructure/index.js';
-import { tryBase64ToJSONString } from '../../../lib/object-utils.js';
-import { save } from '../../../lib/yaml-utils.js';
-export default class RemoteExec extends Command {
-    static args = {
-        pkgPath: Args.string({
-            description: 'The path to the package to provision or destroy',
-            required: false,
-        }),
-    };
-    static description = 'remotely provision or destroy a package';
-    static examples = [
-        '<%= config.bin %> <%= command.id %>',
-    ];
-    static flags = {
-        output: Flags.string({
-            char: 'o',
-            description: 'The path to store the output env in',
-            required: false,
-        }),
-        source: Flags.string({
-            char: 's',
-            description: 'The source of the project to provision or destroy the package for',
-            required: false,
-        }),
-    };
-    async run() {
-        const { args, flags } = await this.parse(RemoteExec);
-        const workspaceEnv = Object.fromEntries((process.env.HEREYA_WORKSPACE_ENV?.split(',') ?? [])
-            .filter(param => param.trim())
-            .map(param => param.split('='))
-            .map(([key, value]) => [key, tryBase64ToJSONString(value)]));
-        const parameters = Object.fromEntries((process.env.HEREYA_PARAMETERS?.split(',') ?? [])
-            .filter(param => param.trim())
-            .map(param => param.split('='))
-            .map(([key, value]) => [key, tryBase64ToJSONString(value)]));
-        const id = process.env.HEREYA_ID;
-        const iacType = process.env.HEREYA_IAC_TYPE;
-        const destroy = process.env.HEREYA_DESTROY === 'true';
-        const infraType = process.env.HEREYA_INFRA_TYPE;
-        const deploy = process.env.HEREYA_DEPLOY === 'true';
-        const source = flags.source ? path.resolve(flags.source) : '';
-        if (deploy && !source) {
-            return this.error('Deploy packages provisioning requires a source path');
-        }
-        if (!id || !iacType || !infraType) {
-            return this.error(`
-                Missing required environment variables:
-                HEREYA_ID: ${id}
-                HEREYA_IAC_TYPE: ${iacType}
-                HEREYA_INFRA_TYPE: ${infraType}
-            `);
-        }
-        const input = {
-            env: workspaceEnv, id, parameters, pkgPath: args.pkgPath || process.cwd(),
-        };
-        if (deploy) {
-            input.parameters = {
-                ...input.parameters,
-                hereyaProjectRootDir: source,
-            };
-        }
-        const iac$ = getIac({ type: iacType });
-        if (!iac$.supported) {
-            return this.error(iac$.reason);
-        }
-        const { iac } = iac$;
-        const output = await (destroy ? iac.destroy(input) : iac.apply(input));
-        if (!output.success) {
-            return this.error(output.reason);
-        }
-        if (flags.output) {
-            await save(output.env, flags.output);
-            this.log(`Output env saved to ${flags.output}`);
-        }
-        const infra$ = getInfrastructure({ type: infraType });
-        if (!infra$.supported) {
-            return this.error(infra$.reason);
-        }
-        const { infrastructure } = infra$;
-        const saveOutput = await infrastructure.saveEnv({ env: output.env, id });
-        if (!saveOutput.success) {
-            return this.error(saveOutput.reason);
-        }
-    }
-}