@agilecustoms/envctl 1.20.2 → 1.21.0

package/dist/client/HttpClient.js

@@ -64,24 +64,22 @@ export class HttpClient {
             throw new Error('Error (network?) making the request:', { cause: error });
         }
         const contentType = response.headers?.get('Content-Type') || '';
+        const body = contentType.includes('application/json') ? await response.json() : await response.text();
         if (response.ok) {
-            if (contentType.includes('application/json')) {
-                return await response.json();
-            }
-            else {
-                return await response.text();
-            }
+            return body;
         }
-        const message = await response.text();
         if (response.status === 404) {
-            throw new NotFoundException(message);
+            throw new NotFoundException(body);
         }
         if (response.status === 422) {
-            throw new BusinessException(message);
+            throw new BusinessException(body);
+        }
+        if (response.status === 426) {
+            throw new KnownException(body.message);
         }
         if (response.status >= 500) {
             logger.info('API Gateway request ID: ' + response.headers.get('x-amzn-requestid'));
         }
-        throw new HttpException(`status: ${response.status}, ` + message);
+        throw new HttpException(`status: ${response.status}, ` + JSON.stringify(body));
     }
 }

package/dist/service/TerraformAdapter.js

@@ -210,7 +210,10 @@ export class TerraformAdapter {
         }
     }
     async apply(env, args) {
-        args = this.tfArgs(env, args);
+        const noPlan = args.every(arg => arg.startsWith('-'));
+        if (noPlan) {
+            args = this.tfArgs(env, args);
+        }
         logger.info('Running: terraform apply ' + args.join(' ') + '\n');
         try {
             await this._apply(args, env.ttl, 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilecustoms/envctl",
-  "version": "1.20.2",
+  "version": "1.21.0",
   "description": "node.js CLI client for manage environments",
   "keywords": [
     "terraform wrapper",
@@ -41,12 +41,14 @@
     "run-version": "  npm run it -- --version",
     "run-configure": "npm run it -- configure",
     "run-logs": "     npm run it -- logs",
+    "-t1-": "",
     "t1-desc": "dev env (fully fledged ~/.envctl/default.json)",
     "t1": "CWD=../tt-core npm run it --",
     "t1-init": "cd ../tt-core && terraform init -upgrade -backend-config=key=t1 -reconfigure",
     "t1-status": "npm run t1 -- status --verbose",
     "t1-apply": " npm run t1 -- apply --auto-approve",
     "t1-delete": "npm run t1 -- delete",
+    "-t2-": "",
     "t2-desc": "ephemeral env in CI (must have ENVCTL_API_KEY_ in env vars)",
     "t2": "CWD=../tt-core CI=true ENVCTL_HOME=non-existing ENVCTL_API_KEY=\"$ENVCTL_API_KEY_\" npm run it --",
     "t2-create": "npm run t2 -- create-ephemeral t2",
@@ -54,12 +56,14 @@
     "t2-plan": "  npm run t2 -- plan -var=env_size=min -var=env=t2 -out=plan",
     "t2-apply": " npm run t2 -- apply plan",
     "t2-delete": "npm run t2 -- delete",
-    "t3-desc": "dev env destroy w/ plan",
+    "-t3-": "",
+    "t3-desc": "dev env destroy",
     "t3": "CWD=../tt-core npm run it --",
     "t3-init": "cd ../tt-core && terraform init -upgrade -backend-config=key=t3 -reconfigure",
-    "t3-apply": " npm run t3 -- apply --auto-approve -var=env_size=min",
-    "t3-plan": "  npm run t3 -- plan -destroy -var=env_size=min -out=plan",
-    "t3-delete": "npm run t3 -- destroy plan",
+    "t3-status": " npm run t3 -- status",
+    "t3-apply": "  npm run t3 -- apply --auto-approve -var=env_size=min",
+    "t3-destroy": "npm run t3 -- destroy -var=env_size=min --auto-approve",
+    "-tt-": "",
     "tt-desc": "deploy TT project from local machine",
     "tt": "CWD=../tt-gitops AWS_PROFILE=ac-tt-dev-deployer npm run it --",
     "run-init": "cd ../tt-gitops && terraform init -upgrade -backend-config=key=laxa1986 -reconfigure",