hereya-cli 0.8.0 → 0.8.2

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.8.0 linux-x64 node-v20.14.0
+hereya-cli/0.8.2 linux-x64 node-v20.15.0
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -71,7 +71,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -96,7 +96,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/bootstrap/index.ts)_
 
 ## `hereya deploy`
 
@@ -117,7 +117,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -139,7 +139,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -170,7 +170,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/env/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -216,7 +216,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/init/index.ts)_
 
 ## `hereya remote exec [PKGPATH]`
 
@@ -240,7 +240,7 @@ EXAMPLES
   $ hereya remote exec
 ```
 
-_See code: [src/commands/remote/exec/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/remote/exec/index.ts)_
+_See code: [src/commands/remote/exec/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/remote/exec/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -263,7 +263,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -289,7 +289,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -314,7 +314,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -335,7 +335,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -357,7 +357,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -377,7 +377,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -397,7 +397,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -423,7 +423,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -449,7 +449,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -475,5 +475,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.0/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.2/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/iac/terraform.d.ts

@@ -2,5 +2,8 @@ import { ApplyInput, ApplyOutput, DestroyInput, DestroyOutput, Iac } from './com
 export declare class Terraform implements Iac {
     apply(input: ApplyInput): Promise<ApplyOutput>;
     destroy(input: DestroyInput): Promise<DestroyOutput>;
+    private downloadTerraform;
     private getEnv;
+    private getTerraformBinary;
+    private terraformBinPath;
 }

package/dist/iac/terraform.js

@@ -1,16 +1,23 @@
+import fs from 'node:fs';
+import https from 'node:https';
+import os from 'node:os';
+import path from 'node:path';
+import { pipeline } from 'node:stream/promises';
+import { Extract as decompress } from 'unzip-stream';
 import { mapObject } from '../lib/object-utils.js';
 import { runShell } from '../lib/shell.js';
 export class Terraform {
     async apply(input) {
         try {
-            runShell('terraform', ['init'], {
+            const terraform = await this.getTerraformBinary();
+            runShell(terraform, ['init'], {
                 directory: input.pkgPath,
                 env: {
                     ...input.env,
                     ...mapObject(input.parameters ?? {}, (key, value) => [`TF_VAR_${key}`, value])
                 }
             });
-            runShell('terraform', ['apply', '-auto-approve'], {
+            runShell(terraform, ['apply', '-auto-approve'], {
                 directory: input.pkgPath,
                 env: {
                     ...input.env,
@@ -31,8 +38,9 @@ export class Terraform {
         }
     }
     async destroy(input) {
+        const terraform = await this.getTerraformBinary();
         try {
-            runShell('terraform', ['init'], {
+            runShell(terraform, ['init'], {
                 directory: input.pkgPath,
                 env: {
                     ...input.env,
@@ -40,7 +48,7 @@ export class Terraform {
                 }
             });
             const env = await this.getEnv(input.pkgPath);
-            runShell('terraform', ['destroy', '-auto-approve'], {
+            runShell(terraform, ['destroy', '-auto-approve'], {
                 directory: input.pkgPath,
                 env: {
                     ...input.env,
@@ -59,8 +67,65 @@ export class Terraform {
             };
         }
     }
+    async downloadTerraform() {
+        const TERRAFORM_DOWNLOAD_URLS = new Map([
+            ['darwin_arm64', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_darwin_arm64.zip'],
+            ['darwin_x64', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_darwin_amd64.zip'],
+            ['freebsd_arm', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_freebsd_arm.zip'],
+            ['freebsd_ia32', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_freebsd_386.zip'],
+            ['freebsd_x64', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_freebsd_amd64.zip'],
+            ['linux_arm', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_linux_arm.zip'],
+            ['linux_arm64', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_linux_arm64.zip'],
+            ['linux_ia32', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_linux_386.zip'],
+            ['linux_x64', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_linux_amd64.zip'],
+            ['openbsd_ia32', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_openbsd_386.zip'],
+            ['openbsd_x64', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_openbsd_amd64.zip'],
+            ['sunos_x64', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_solaris_amd64.zip'],
+            ['win32_ia32', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_windows_386.zip'],
+            ['win32_x64', 'https://releases.hashicorp.com/terraform/1.5.7/terraform_1.5.7_windows_amd64.zip'],
+        ]);
+        const tfPath = this.terraformBinPath();
+        try {
+            await fs.promises.access(tfPath, fs.constants.X_OK);
+            return false;
+        }
+        catch (error) {
+            // file does not exist or is corrupted - continue
+            if (error.code !== 'ENOENT') {
+                await fs.promises.rm(tfPath);
+            }
+        }
+        console.log('Downloading terraform...');
+        const binKey = `${os.platform()}_${os.arch()}`;
+        const url = TERRAFORM_DOWNLOAD_URLS.get(binKey);
+        if (!url) {
+            throw new Error('unsupported platform for terraform');
+        }
+        try {
+            await fs.promises.mkdir(path.dirname(tfPath), { recursive: true });
+        }
+        catch (error) {
+            if (error.code !== 'EEXIST') {
+                throw new Error(`could not download terraform: ${error}`);
+            }
+        }
+        await new Promise((resolve, reject) => {
+            https.get(url, async (response) => {
+                try {
+                    await pipeline(response, decompress({ path: path.dirname(tfPath) }));
+                    await fs.promises.chmod(tfPath, '0755');
+                }
+                catch (error) {
+                    throw new Error(`could not download terraform: ${error}`);
+                }
+                resolve(null);
+            }).on('error', error => reject(error));
+        });
+        return true;
+    }
     async getEnv(pkgPath) {
-        const resourceOut = runShell('terraform', ['output', '--json'], {
+        const terraform = await this.getTerraformBinary();
+        const resourceOut = runShell(terraform, ['output', '--json'], {
             directory: pkgPath,
             stdio: 'pipe'
         });
@@ -76,4 +141,11 @@ export class Terraform {
         }
         return tfEnv;
     }
+    async getTerraformBinary() {
+        await this.downloadTerraform();
+        return this.terraformBinPath();
+    }
+    terraformBinPath() {
+        return path.join(os.homedir(), '.hereya', 'iac', 'terraform', os.platform() === 'win32' ? 'terraform.exe' : 'terraform');
+    }
 }

package/dist/infrastructure/aws.js

@@ -87,30 +87,36 @@ export class AwsInfrastructure {
         return { env, success: true };
     }
     async resolveEnv(input) {
-        const parameterStoreArnPattern = /^arn:aws:ssm:[\da-z-]+:\d{12}:parameter\/[\w./-]+$/;
-        const ssmClient = new SSMClient({});
-        if (parameterStoreArnPattern.test(input.value)) {
-            const response = await ssmClient.send(new GetParameterCommand({
-                Name: input.value,
-                WithDecryption: true,
-            }));
-            return {
-                isSecret: response.Parameter?.Type === 'SecureString',
-                value: response.Parameter?.Value ?? input.value
-            };
+        try {
+            const parameterStoreArnPattern = /^arn:aws:ssm:[\da-z-]+:\d{12}:parameter\/[\w./-]+$/;
+            const ssmClient = new SSMClient({});
+            if (parameterStoreArnPattern.test(input.value)) {
+                const response = await ssmClient.send(new GetParameterCommand({
+                    Name: input.value,
+                    WithDecryption: true,
+                }));
+                return {
+                    isSecret: response.Parameter?.Type === 'SecureString',
+                    value: response.Parameter?.Value ?? input.value
+                };
+            }
+            const secretManagerArnPattern = /^arn:aws:secretsmanager:[\da-z-]+:\d{12}:secret:[\w-]+/;
+            const secretManagerClient = new SecretsManagerClient({});
+            if (secretManagerArnPattern.test(input.value)) {
+                const response = await secretManagerClient.send(new GetSecretValueCommand({
+                    SecretId: input.value,
+                }));
+                return {
+                    isSecret: true,
+                    value: response.SecretString ?? input.value
+                };
+            }
+            return { value: input.value };
         }
-        const secretManagerArnPattern = /^arn:aws:secretsmanager:[\da-z-]+:\d{12}:secret:[\w-]+/;
-        const secretManagerClient = new SecretsManagerClient({});
-        if (secretManagerArnPattern.test(input.value)) {
-            const response = await secretManagerClient.send(new GetSecretValueCommand({
-                SecretId: input.value,
-            }));
-            return {
-                isSecret: true,
-                value: response.SecretString ?? input.value
-            };
+        catch (error) {
+            console.warn(`Could not resolve value "${input.value}": ${error.message}. Will return the original value.`);
+            return { value: input.value };
         }
-        return { value: input.value };
     }
     async saveEnv(input) {
         const key = `/hereya/${input.id}`;

package/oclif.manifest.json

@@ -48,6 +48,45 @@
         "index.js"
       ]
     },
+    "bootstrap": {
+      "aliases": [],
+      "args": {
+        "infrastructureType": {
+          "description": "infrastructure to bootstrap. Options are local, aws",
+          "name": "infrastructureType",
+          "required": true
+        }
+      },
+      "description": "Install necessary resources for hereya operations in an infrastructure.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> aws",
+        "<%= config.bin %> <%= command.id %> local"
+      ],
+      "flags": {
+        "force": {
+          "char": "f",
+          "description": "redeploy hereya resources if already deployed",
+          "name": "force",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "bootstrap",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "bootstrap",
+        "index.js"
+      ]
+    },
     "deploy": {
       "aliases": [],
       "args": {},
@@ -90,45 +129,6 @@
         "index.js"
       ]
     },
-    "bootstrap": {
-      "aliases": [],
-      "args": {
-        "infrastructureType": {
-          "description": "infrastructure to bootstrap. Options are local, aws",
-          "name": "infrastructureType",
-          "required": true
-        }
-      },
-      "description": "Install necessary resources for hereya operations in an infrastructure.",
-      "examples": [
-        "<%= config.bin %> <%= command.id %> aws",
-        "<%= config.bin %> <%= command.id %> local"
-      ],
-      "flags": {
-        "force": {
-          "char": "f",
-          "description": "redeploy hereya resources if already deployed",
-          "name": "force",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "bootstrap",
-      "pluginAlias": "hereya-cli",
-      "pluginName": "hereya-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "bootstrap",
-        "index.js"
-      ]
-    },
     "down": {
       "aliases": [],
       "args": {},
@@ -783,5 +783,5 @@
       ]
     }
   },
-  "version": "0.8.0"
+  "version": "0.8.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hereya-cli",
   "description": "Infrastructure as Package",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "author": "Hereya Developers",
   "bin": {
     "hereya": "./bin/run.js"
@@ -23,6 +23,7 @@
     "glob": "^10.4.1",
     "ignore": "^5.3.1",
     "simple-git": "^3.24.0",
+    "unzip-stream": "^0.3.4",
     "yaml": "^2.4.2",
     "zod": "^3.23.8"
   },
@@ -34,6 +35,7 @@
     "@types/mock-fs": "^4.13.4",
     "@types/node": "^18",
     "@types/sinon": "^17.0.3",
+    "@types/unzip-stream": "^0.3.4",
     "chai": "^4",
     "eslint": "^8",
     "eslint-config-oclif": "^5",