hereya-cli 0.29.0 → 0.31.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.29.0 linux-x64 node-v22.14.0
+hereya-cli/0.31.0 linux-x64 node-v22.14.0
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -82,7 +82,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -107,7 +107,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/bootstrap/index.ts)_
 
 ## `hereya deploy`
 
@@ -132,7 +132,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -159,7 +159,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -190,7 +190,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/env/index.ts)_
 
 ## `hereya env set [NAME]`
 
@@ -217,7 +217,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.29.0/src/commands/env/set/index.ts)_
+_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/env/set/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -263,7 +263,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/init/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -290,7 +290,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -316,7 +316,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -341,7 +341,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -366,7 +366,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -393,7 +393,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -416,7 +416,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -436,7 +436,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -462,7 +462,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace env set`
 
@@ -486,7 +486,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.29.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.31.0/src/commands/workspace/env/set/index.ts)_
 
 ## `hereya workspace env unset`
 
@@ -507,7 +507,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.29.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.31.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -534,7 +534,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace list`
 
@@ -551,7 +551,7 @@ EXAMPLES
   $ hereya workspace list
 ```
 
-_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/workspace/list/index.ts)_
+_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/workspace/list/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -578,5 +578,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.29.0/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.31.0/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/backend/common.d.ts

@@ -35,20 +35,20 @@ export declare const WorkspaceSchema: z.ZodObject<{
     name: string;
     id: string;
     env?: Record<string, string> | undefined;
-    mirrorOf?: string | undefined;
     packages?: Record<string, {
         version: string;
         parameters?: Record<string, any> | undefined;
     }> | undefined;
+    mirrorOf?: string | undefined;
 }, {
     name: string;
     id: string;
     env?: Record<string, string> | undefined;
-    mirrorOf?: string | undefined;
     packages?: Record<string, {
         version: string;
         parameters?: Record<string, any> | undefined;
     }> | undefined;
+    mirrorOf?: string | undefined;
 }>;
 export type Workspace = z.infer<typeof WorkspaceSchema>;
 export type AddPackageToWorkspaceInput = {

package/dist/backend/local.js

@@ -147,14 +147,14 @@ export class LocalBackend {
         };
     }
     async getProvisioningId(input) {
-        const lookupStorepath = await getAnyPath(path.join(os.homedir(), '.hereya', `provisioning.yaml`), path.join(os.homedir(), '.hereya', `provisioning.yml`));
-        const { data, found } = await load(lookupStorepath);
-        if (!found || !data[input.logicalId]) {
-            data[input.logicalId] = `p-${randomUUID()}`;
-            await save(data, lookupStorepath);
+        const idFilePath = await getAnyPath(path.join(os.homedir(), '.hereya', 'provisioning', `${input.logicalId}.yaml`), path.join(os.homedir(), '.hereya', 'provisioning', `${input.logicalId}.yml`));
+        const { data, found } = await load(idFilePath);
+        if (!found || !data.id) {
+            data.id = `p-${randomUUID()}`;
+            await save(data, idFilePath);
         }
         return {
-            id: data[input.logicalId],
+            id: data.id,
             success: true,
         };
     }

package/dist/infrastructure/aws.js

@@ -3,11 +3,10 @@ import { DeleteParameterCommand, GetParameterCommand, PutParameterCommand, SSMCl
 import { GetCallerIdentityCommand, STSClient } from '@aws-sdk/client-sts';
 import { randomUUID } from 'node:crypto';
 import fs from 'node:fs/promises';
-import os from 'node:os';
-import path from 'node:path';
 import { getIac } from '../iac/index.js';
 import { downloadPackage } from '../lib/package/index.js';
 import { runShell } from '../lib/shell.js';
+import { getPackageDownloadPath } from './common.js';
 import { destroyPackage, provisionPackage } from './index.js';
 export class AwsInfrastructure {
     configKey = '/hereya-bootstrap/config';
@@ -41,7 +40,7 @@ export class AwsInfrastructure {
         return this.provision(input);
     }
     async destroy(input) {
-        const destPath = path.join(os.homedir(), '.hereya', input.id, input.canonicalName);
+        const destPath = await getPackageDownloadPath(input);
         const downloadPath = await downloadPackage(input.pkgUrl, destPath);
         const region = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;
         const infraConfig = {
@@ -75,7 +74,7 @@ export class AwsInfrastructure {
         return { env: output.env, success: true };
     }
     async provision(input) {
-        const destPath = path.join(os.homedir(), '.hereya', input.id, input.canonicalName);
+        const destPath = await getPackageDownloadPath(input);
         const downloadPath = await downloadPackage(input.pkgUrl, destPath);
         const config = await this.getConfig();
         const terraformStateBucketRegion = config.terraformStateBucketRegion || process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;

package/dist/infrastructure/common.d.ts

@@ -18,6 +18,9 @@ export interface Infrastructure {
     undeploy(input: UndeployInput): Promise<UndeployOutput>;
     unstoreEnv(input: UnstoreEnvInput): Promise<UnstoreEnvOutput>;
 }
+export declare function getPackageDownloadPath(input: {
+    id: string;
+}): Promise<string>;
 export type BootstrapInput = {
     force?: boolean;
 };

package/dist/infrastructure/common.js

@@ -1,3 +1,5 @@
+import os from 'node:os';
+import path from 'node:path';
 export var InfrastructureType;
 (function (InfrastructureType) {
     InfrastructureType["aws"] = "aws";
@@ -5,3 +7,6 @@ export var InfrastructureType;
     InfrastructureType["gcp"] = "gcp";
     InfrastructureType["local"] = "local";
 })(InfrastructureType || (InfrastructureType = {}));
+export async function getPackageDownloadPath(input) {
+    return path.join(os.homedir(), '.hereya', 'packages', input.id);
+}

package/dist/infrastructure/local.js

@@ -1,8 +1,7 @@
 import * as fs from 'node:fs/promises';
-import * as os from 'node:os';
-import path from 'node:path';
 import { getIac } from '../iac/index.js';
 import { downloadPackage } from '../lib/package/index.js';
+import { getPackageDownloadPath, } from './common.js';
 export class LocalInfrastructure {
     async bootstrap() {
         console.log('Bootstrapping local infrastructure');
@@ -16,8 +15,7 @@ export class LocalInfrastructure {
         return this.provision(input);
     }
     async destroy(input) {
-        // noinspection DuplicatedCode
-        const destPath = path.join(os.homedir(), '.hereya', 'provisioning', input.id, input.canonicalName);
+        const destPath = await getPackageDownloadPath(input);
         const downloadPath = await downloadPackage(input.pkgUrl, destPath);
         const iac$ = getIac({ type: input.iacType });
         if (!iac$.supported) {
@@ -39,8 +37,7 @@ export class LocalInfrastructure {
         return { env: output.env, success: true };
     }
     async provision(input) {
-        // noinspection DuplicatedCode
-        const destPath = path.join(os.homedir(), '.hereya', 'provisioning', input.id, input.canonicalName);
+        const destPath = await getPackageDownloadPath(input);
         const downloadPath = await downloadPackage(input.pkgUrl, destPath);
         const iac$ = getIac({ type: input.iacType });
         if (!iac$.supported) {

package/oclif.manifest.json

@@ -407,6 +407,45 @@
         "index.js"
       ]
     },
+    "unbootstrap": {
+      "aliases": [],
+      "args": {
+        "infrastructureType": {
+          "description": "infrastructure to unbootstrap. Options are local, aws",
+          "name": "infrastructureType",
+          "required": true
+        }
+      },
+      "description": "Uninstall hereya resources deployed with bootstrap command.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> aws",
+        "<%= config.bin %> <%= command.id %> local"
+      ],
+      "flags": {
+        "force": {
+          "char": "f",
+          "description": "try to delete hereya resources even if not deployed",
+          "name": "force",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "unbootstrap",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "unbootstrap",
+        "index.js"
+      ]
+    },
     "undeploy": {
       "aliases": [],
       "args": {},
@@ -455,45 +494,6 @@
         "index.js"
       ]
     },
-    "unbootstrap": {
-      "aliases": [],
-      "args": {
-        "infrastructureType": {
-          "description": "infrastructure to unbootstrap. Options are local, aws",
-          "name": "infrastructureType",
-          "required": true
-        }
-      },
-      "description": "Uninstall hereya resources deployed with bootstrap command.",
-      "examples": [
-        "<%= config.bin %> <%= command.id %> aws",
-        "<%= config.bin %> <%= command.id %> local"
-      ],
-      "flags": {
-        "force": {
-          "char": "f",
-          "description": "try to delete hereya resources even if not deployed",
-          "name": "force",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "unbootstrap",
-      "pluginAlias": "hereya-cli",
-      "pluginName": "hereya-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "unbootstrap",
-        "index.js"
-      ]
-    },
     "up": {
       "aliases": [],
       "args": {},
@@ -1006,5 +1006,5 @@
       ]
     }
   },
-  "version": "0.29.0"
+  "version": "0.31.0"
 }

package/package.json

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