hereya-cli 0.4.2 → 0.4.4

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.4.2 linux-x64 node-v20.13.1
+hereya-cli/0.4.4 linux-x64 node-v20.13.1
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -70,7 +70,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -95,7 +95,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/bootstrap/index.ts)_
 
 ## `hereya deploy`
 
@@ -116,7 +116,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -137,7 +137,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/down/index.ts)_
 
 ## `hereya env`
 
@@ -160,7 +160,7 @@ EXAMPLES
   $ hereya env -w dev
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/env/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -206,7 +206,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/init/index.ts)_
 
 ## `hereya remote exec [PKGPATH]`
 
@@ -230,7 +230,7 @@ EXAMPLES
   $ hereya remote exec
 ```
 
-_See code: [src/commands/remote/exec/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/remote/exec/index.ts)_
+_See code: [src/commands/remote/exec/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/remote/exec/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -253,7 +253,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -279,7 +279,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/run/index.ts)_
 
 ## `hereya undeploy`
 
@@ -300,7 +300,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -321,7 +321,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -341,7 +341,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -361,7 +361,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env`
 
@@ -381,7 +381,7 @@ EXAMPLES
   $ hereya workspace env -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -407,7 +407,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -433,5 +433,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.2/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.4.4/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/iac/cdk.d.ts

@@ -5,4 +5,5 @@ export declare class Cdk implements Iac {
     private getEnv;
     private getParameterNames;
     private getStack;
+    private serializedParametersAndContext;
 }

package/dist/iac/cdk.js

@@ -6,15 +6,9 @@ import { load } from '../lib/yaml-utils.js';
 export class Cdk {
     async apply(input) {
         try {
-            const parameterNames = await this.getParameterNames(input.pkgPath);
-            const serializedWorkspaceEnv = Object.entries(input.env)
-                .filter(([key]) => parameterNames.includes(key))
-                .flatMap(([key, value]) => ['--parameters', `${key}=${value}`]);
-            const serializedParameters = Object.entries(input.parameters ?? {})
-                .filter(([key]) => parameterNames.includes(key))
-                .flatMap(([key, value]) => ['--parameters', `${key}=${value}`]);
+            const { serializedContext, serializedParameters, serializedWorkspaceEnv } = await this.serializedParametersAndContext(input);
             runShell('npx', [
-                'cdk', 'deploy', '--require-approval', 'never', ...serializedWorkspaceEnv, ...serializedParameters,
+                'cdk', 'deploy', '--require-approval', 'never', ...serializedWorkspaceEnv, ...serializedParameters, ...serializedContext,
             ], {
                 directory: input.pkgPath,
                 env: { STACK_NAME: input.id },
@@ -29,15 +23,9 @@ export class Cdk {
     async destroy(input) {
         try {
             const env = await this.getEnv(input.id);
-            const parameterNames = await this.getParameterNames(input.pkgPath);
-            const serializedWorkspaceEnv = Object.entries(input.env)
-                .filter(([key]) => parameterNames.includes(key))
-                .flatMap(([key, value]) => ['--parameters', `${key}=${value}`]);
-            const serializedParameters = Object.entries(input.parameters ?? {})
-                .filter(([key]) => parameterNames.includes(key))
-                .flatMap(([key, value]) => ['--parameters', `${key}=${value}`]);
+            const { serializedContext, serializedParameters, serializedWorkspaceEnv } = await this.serializedParametersAndContext(input);
             runShell('npx', [
-                'cdk', 'destroy', '--force', ...serializedWorkspaceEnv, ...serializedParameters,
+                'cdk', 'destroy', '--force', ...serializedWorkspaceEnv, ...serializedParameters, ...serializedContext
             ], {
                 directory: input.pkgPath,
                 env: { STACK_NAME: input.id }
@@ -56,10 +44,15 @@ export class Cdk {
         }
         return env;
     }
-    async getParameterNames(workDir) {
+    async getParameterNames(input) {
+        const workDir = input.pkgPath;
+        const serializedContext = Object.entries({
+            ...input.env,
+            ...input.parameters,
+        }).flatMap(([key, value]) => ['--context', `${key}=${value}`]);
         runShell('npm', ['install'], { directory: workDir });
         const result = runShell('npx', [
-            'cdk', 'synth',
+            'cdk', 'synth', ...serializedContext,
         ], {
             directory: workDir,
             stdio: 'pipe'
@@ -71,13 +64,37 @@ export class Cdk {
     }
     async getStack(stackName) {
         const cfnClient = new CloudFormationClient({});
-        const response = await cfnClient.send(new DescribeStacksCommand({
-            StackName: stackName,
-        }));
-        const stack = response.Stacks?.[0];
+        let stack;
+        try {
+            const response = await cfnClient.send(new DescribeStacksCommand({
+                StackName: stackName,
+            }));
+            stack = response.Stacks?.[0];
+        }
+        catch (error) {
+            if (error.name === 'ValidationError') {
+                return null;
+            }
+            throw error;
+        }
         if (!stack) {
-            throw new Error(`Stack ${stackName} not found`);
+            return null;
         }
         return stack;
     }
+    async serializedParametersAndContext(input) {
+        const parameterNames = await this.getParameterNames(input);
+        const serializedParameters = Object.entries(input.parameters ?? {})
+            .filter(([key]) => parameterNames.includes(key))
+            .flatMap(([key, value]) => ['--parameters', `${key}=${value}`]);
+        const serializedWorkspaceEnv = Object.entries(input.env)
+            .filter(([key]) => parameterNames.includes(key))
+            .flatMap(([key, value]) => ['--parameters', `${key}=${value}`]);
+        const serializedContext = Object.entries({
+            ...input.env,
+            ...input.parameters,
+        }).filter(([key]) => !parameterNames.includes(key))
+            .flatMap(([key, value]) => ['--context', `${key}=${value}`]);
+        return { serializedContext, serializedParameters, serializedWorkspaceEnv };
+    }
 }

package/dist/infrastructure/aws.js

@@ -149,10 +149,19 @@ export class AwsInfrastructure {
     async getEnv(id) {
         const ssmClient = new SSMClient({});
         const ssmParameterName = `/hereya/${id}`;
-        const ssmParameter = await ssmClient.send(new GetParameterCommand({
-            Name: ssmParameterName,
-        }));
-        return JSON.parse(ssmParameter.Parameter?.Value ?? '{}');
+        try {
+            const ssmParameter = await ssmClient.send(new GetParameterCommand({
+                Name: ssmParameterName,
+            }));
+            return JSON.parse(ssmParameter.Parameter?.Value ?? '{}');
+        }
+        catch (error) {
+            if (error.name === "ParameterNotFound") {
+                console.debug(`Parameter "${ssmParameterName}" does not exist.`);
+                return {};
+            }
+            throw error;
+        }
     }
     async getFilesToUpload(rootDir) {
         const ig = ignore.default();

package/oclif.manifest.json

@@ -699,5 +699,5 @@
       ]
     }
   },
-  "version": "0.4.2"
+  "version": "0.4.4"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hereya-cli",
   "description": "Developer's Package Manager for Seamless Infrastructure Integration.",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "author": "Hereya Developers",
   "bin": {
     "hereya": "./bin/run.js"