hereya-cli 0.8.5 → 0.8.7

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.8.5 linux-x64 node-v20.15.0
+hereya-cli/0.8.7 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.5/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/remote/exec/index.ts)_
+_See code: [src/commands/remote/exec/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/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.5/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.8.7/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

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

@@ -2,7 +2,7 @@ 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 { base64ToJSONString } from '../../../lib/object-utils.js';
+import { base64ToJSONString, tryBase64ToJSONString } from '../../../lib/object-utils.js';
 import { save } from '../../../lib/yaml-utils.js';
 export default class RemoteExec extends Command {
     static args = {
@@ -31,11 +31,13 @@ export default class RemoteExec extends Command {
         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(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('=')));
-        parameters.hereyaProjectEnv = parameters.hereyaProjectEnv ? base64ToJSONString(parameters.hereyaProjectEnv) : undefined;
+            .map(param => param.split('='))
+            .map(([key, value]) => [key, tryBase64ToJSONString(value)]));
+        parameters.hereyaProjectEnv = parameters.hereyaProjectEnv ? base64ToJSONString(parameters.hereyaProjectEnv) : '';
         const id = process.env.HEREYA_ID;
         const iacType = process.env.HEREYA_IAC_TYPE;
         const destroy = process.env.HEREYA_DESTROY === 'true';

package/dist/iac/terraform.js

@@ -13,17 +13,17 @@ export class Terraform {
             runShell(terraform, ['init'], {
                 directory: input.pkgPath,
                 env: {
-                    ...mapObject(input.env ?? {}, (key, value) => [`TF_VAR_${key}`, value]),
+                    ...mapObject(input.env ?? {}, (key, value) => [`TF_VAR_${key}`, typeof value === "object" ? JSON.stringify(value) : value]),
                     ...input.env,
-                    ...mapObject(input.parameters ?? {}, (key, value) => [`TF_VAR_${key}`, value])
+                    ...mapObject(input.parameters ?? {}, (key, value) => [`TF_VAR_${key}`, typeof value === "object" ? JSON.stringify(value) : value])
                 }
             });
             runShell(terraform, ['apply', '-auto-approve'], {
                 directory: input.pkgPath,
                 env: {
-                    ...mapObject(input.env ?? {}, (key, value) => [`TF_VAR_${key}`, value]),
+                    ...mapObject(input.env ?? {}, (key, value) => [`TF_VAR_${key}`, typeof value === "object" ? JSON.stringify(value) : value]),
                     ...input.env,
-                    ...mapObject(input.parameters ?? {}, (key, value) => [`TF_VAR_${key}`, value])
+                    ...mapObject(input.parameters ?? {}, (key, value) => [`TF_VAR_${key}`, typeof value === "object" ? JSON.stringify(value) : value])
                 }
             });
             const env = await this.getEnv(input.pkgPath);
@@ -45,18 +45,18 @@ export class Terraform {
             runShell(terraform, ['init'], {
                 directory: input.pkgPath,
                 env: {
-                    ...mapObject(input.env ?? {}, (key, value) => [`TF_VAR_${key}`, value]),
+                    ...mapObject(input.env ?? {}, (key, value) => [`TF_VAR_${key}`, typeof value === "object" ? JSON.stringify(value) : value]),
                     ...input.env,
-                    ...mapObject(input.parameters ?? {}, (key, value) => [`TF_VAR_${key}`, value])
+                    ...mapObject(input.parameters ?? {}, (key, value) => [`TF_VAR_${key}`, typeof value === "object" ? JSON.stringify(value) : value])
                 }
             });
             const env = await this.getEnv(input.pkgPath);
             runShell(terraform, ['destroy', '-auto-approve'], {
                 directory: input.pkgPath,
                 env: {
-                    ...mapObject(input.env ?? {}, (key, value) => [`TF_VAR_${key}`, value]),
+                    ...mapObject(input.env ?? {}, (key, value) => [`TF_VAR_${key}`, typeof value === "object" ? JSON.stringify(value) : value]),
                     ...input.env,
-                    ...mapObject(input.parameters ?? {}, (key, value) => [`TF_VAR_${key}`, value])
+                    ...mapObject(input.parameters ?? {}, (key, value) => [`TF_VAR_${key}`, typeof value === "object" ? JSON.stringify(value) : value])
                 }
             });
             return {

package/dist/infrastructure/aws.js

@@ -244,7 +244,7 @@ export class AwsInfrastructure {
         }
         const ssmClient = new SSMClient({});
         const parameterName = `/hereya/package-parameters/${input.id}`;
-        const parameterValue = Object.entries(input.parameters ?? {}).map(([key, value]) => `${key}=${JSON.stringify(value)}`).join(',');
+        const parameterValue = Object.entries(input.parameters ?? {}).map(([key, value]) => `${key}=${typeof value === "object" ? objectToBase64(value) : value}`).join(',');
         if (parameterValue) {
             await ssmClient.send(new PutParameterCommand({
                 Name: parameterName,
@@ -278,7 +278,7 @@ export class AwsInfrastructure {
                 {
                     name: 'HEREYA_WORKSPACE_ENV',
                     type: 'PLAINTEXT',
-                    value: Object.entries(input.env ?? {}).map(([key, value]) => `${key}=${JSON.stringify(value)}`).join(','),
+                    value: Object.entries(input.env ?? {}).map(([key, value]) => `${key}=${typeof value === "object" ? objectToBase64(value) : value}`).join(','),
                 },
                 {
                     name: 'PKG_REPO_URL',

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

@@ -4,3 +4,4 @@ export declare function arrayOfStringToObject(arr: string[], keyValueSeparator?:
 };
 export declare function objectToBase64(obj: object): string;
 export declare function base64ToJSONString(base64: string): string;
+export declare function tryBase64ToJSONString(base64: string): string;

package/dist/lib/object-utils.js

@@ -13,3 +13,15 @@ export function objectToBase64(obj) {
 export function base64ToJSONString(base64) {
     return Buffer.from(base64, 'base64').toString('utf8');
 }
+export function tryBase64ToJSONString(base64) {
+    try {
+        const value = base64ToJSONString(base64);
+        if (typeof JSON.parse(value) === 'object') {
+            return value;
+        }
+        return base64;
+    }
+    catch {
+        return base64;
+    }
+}

package/oclif.manifest.json

@@ -783,5 +783,5 @@
       ]
     }
   },
-  "version": "0.8.5"
+  "version": "0.8.7"
 }

package/package.json

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