@agilecustoms/envctl 1.20.3 → 1.22.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/commands/configure.js

@@ -10,7 +10,6 @@ export function configure(program, configService) {
         const profile = await input({ message: 'Profile name', default: 'default', required: true });
         const apiKey = await password({ message: 'API key', mask: true });
         const varKey = await input({ message: 'Terraform variable to auto populate with remote state key (empty to skip)' });
-        const varEphemeral = await input({ message: 'Terraform variable to auto populate with flag "ephemeral" (empty to skip)' });
-        configService.saveConfig(profile, { apiKey, varKey, varEphemeral });
+        configService.saveConfig(profile, { apiKey, varKey });
     }));
 }

package/dist/service/ConfigService.js

@@ -61,9 +61,6 @@ export class ConfigService {
     getVarKey() {
         return this.config?.varKey;
     }
-    getVarEphemeral() {
-        return this.config?.varEphemeral;
-    }
     getHost() {
         return this.config?.host || DEFAULT_HOST;
     }

package/dist/service/EnvService.js

@@ -48,26 +48,10 @@ export class EnvService extends BaseService {
         }
         return env;
     }
-    checkDir(env) {
-        if (env.ephemeral)
-            return;
-        if (env.dir) {
-            const dir = this.cli.getDir();
-            if (dir !== env.dir) {
-                throw new KnownException(`Env ${env.key} was deployed from ${env.dir} - make sure you run this command from the same directory`);
-            }
-        }
-    }
     async plan(tfArgs) {
         const key = this.terraformAdapter.getTerraformBackend().getKey();
-        const env = await this.tryGetEnv(key);
-        if (env) {
-            this.checkDir(env);
-            this.handleDeleteStatuses(env);
-        }
-        const newEnv = env === null;
-        await this.lockTerraform(env, newEnv);
-        await this.terraformAdapter.plan(env ?? { key, ephemeral: false }, tfArgs);
+        await this.lockTerraform(null, true);
+        await this.terraformAdapter.plan(key, tfArgs);
     }
     async createEphemeral(key) {
         const createEnv = { key };
@@ -85,14 +69,14 @@ export class EnvService extends BaseService {
             }
         }
     }
-    handleDeleteStatuses(env) {
-        if (env.status === EnvStatus.Deleting) {
-            throw new KnownException(`Env ${env.key} status is DELETING, please wait.\n
-       If it is DELETING more than 10 minutes, you can try to run 'envctl delete ${env.key} --force' to remove it`);
-        }
-        if (env.status === EnvStatus.DeleteError) {
-            throw new KnownException(`Env ${env.key} status is DELETE_ERROR, most likely lack of permissions.\n
-       Check logs with 'envctl logs', address the issue and re-run 'envctl delete ${env.key}'`);
+    checkDir(env) {
+        if (env.ephemeral)
+            return;
+        if (env.dir) {
+            const dir = this.cli.getDir();
+            if (dir !== env.dir) {
+                throw new KnownException(`Env ${env.key} was deployed from ${env.dir} - make sure you run this command from the same directory`);
+            }
         }
     }
     async apply(tfArgs) {
@@ -108,7 +92,14 @@ export class EnvService extends BaseService {
             return;
         }
         this.checkDir(env);
-        this.handleDeleteStatuses(env);
+        if (env.status === EnvStatus.Deleting) {
+            throw new KnownException(`Env ${env.key} status is DELETING, please wait.\n
+       If it is DELETING more than 10 minutes, you can try to run 'envctl delete ${env.key} --force' to remove it`);
+        }
+        if (env.status === EnvStatus.DeleteError) {
+            throw new KnownException(`Env ${env.key} status is DELETE_ERROR, most likely lack of permissions.\n
+       Check logs with 'envctl logs', address the issue and re-run 'envctl delete ${env.key}'`);
+        }
         const status = env.status;
         if (status === EnvStatus.Init || status === EnvStatus.Active) {
             const newEnv = status === EnvStatus.Init;
@@ -145,7 +136,7 @@ export class EnvService extends BaseService {
             logger.info('Lock env to run destroy');
             await this.envApi.lockForUpdate(env);
         }
-        await this.terraformAdapter.destroy(env, tfArgs, force);
+        await this.terraformAdapter.destroy(key, tfArgs, force);
         await this.envApi.delete(key, force);
         logger.info('Please wait for ~30 sec before you can create env with same name');
     }

package/dist/service/TerraformAdapter.js

@@ -120,7 +120,7 @@ export class TerraformAdapter {
         });
         logger.info(`\nTime EDT: ${edt},  UTC: ${utc}\n`);
     }
-    tfArgs(env, args) {
+    tfArgs(key, args) {
         const varDefs = this.getVarDefs();
         const argVars = this.getArgVars(args);
         const extraArgs = [];
@@ -130,11 +130,7 @@ export class TerraformAdapter {
         const specialFields = {};
         const varKey = this.configService.getVarKey();
         if (varKey) {
-            specialFields[varKey] = env.key;
-        }
-        const varEphemeral = this.configService.getVarEphemeral();
-        if (varEphemeral) {
-            specialFields[varEphemeral] = String(env.ephemeral);
+            specialFields[varKey] = key;
         }
         for (const name of Object.keys(specialFields)) {
             if (varDefs[name] && !argVars[name]) {
@@ -183,8 +179,8 @@ export class TerraformAdapter {
         });
         return result;
     }
-    async plan(env, args) {
-        args = this.tfArgs(env, args);
+    async plan(key, args) {
+        args = this.tfArgs(key, args);
         await this._plan(args, 1);
     }
     async _plan(args, attemptNo) {
@@ -212,7 +208,7 @@ export class TerraformAdapter {
     async apply(env, args) {
         const noPlan = args.every(arg => arg.startsWith('-'));
         if (noPlan) {
-            args = this.tfArgs(env, args);
+            args = this.tfArgs(env.key, args);
         }
         logger.info('Running: terraform apply ' + args.join(' ') + '\n');
         try {
@@ -258,8 +254,8 @@ export class TerraformAdapter {
             throw new KnownException(`terraform apply failed with code ${error.code}:\n${error.message}`, { cause: error });
         }
     }
-    async destroy(env, args, force) {
-        args = this.tfArgs(env, args);
+    async destroy(key, args, force) {
+        args = this.tfArgs(key, args);
         await this._destroy(args, force);
     }
     async _destroy(args, force, attemptNo = 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilecustoms/envctl",
-  "version": "1.20.3",
+  "version": "1.22.0",
   "description": "node.js CLI client for manage environments",
   "keywords": [
     "terraform wrapper",
@@ -41,28 +41,35 @@
     "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",
-    "t2-init": "cd ../tt-core && terraform init -upgrade -backend-config=key=t2 -reconfigure",
-    "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-": "",
-    "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-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",
+    "-d1-": "",
+    "d1-desc": "dev env (fully fledged ~/.envctl/default.json)",
+    "d1": "CWD=../tt-core npm run it --",
+    "d1-init": "cd ../tt-core && terraform init -upgrade -backend-config=key=d1 -reconfigure",
+    "d1-status": "npm run d1 -- status --verbose",
+    "d1-apply": " npm run d1 -- apply --auto-approve",
+    "d1-delete": "npm run d1 -- delete",
+    "-d2-": "",
+    "d2-desc": "dev env destroy",
+    "d2": "CWD=../tt-core npm run it --",
+    "d2-init": "cd ../tt-core && terraform init -upgrade -backend-config=key=d2 -reconfigure",
+    "d2-status": " npm run d2 -- status",
+    "d2-apply": "  npm run d2 -- apply --auto-approve -var=env_size=min",
+    "d2-destroy": "npm run d2 -- destroy -var=env_size=min --auto-approve",
+    "-d3-": "",
+    "d3-desc": "dev env plan apply",
+    "d3": "CWD=../tt-core npm run it --",
+    "d3-init": "cd ../tt-core && terraform init -upgrade -backend-config=key=d3 -reconfigure",
+    "d3-plan": "  npm run d3 -- plan -var=env_size=min -var=env=d3 -out=plan",
+    "d3-apply": " npm run d3 -- apply plan",
+    "d3-delete": "npm run d3 -- delete",
+    "-e1-": "",
+    "e1-desc": "ephemeral env in CI (must have ENVCTL_API_KEY_ in env vars)",
+    "e1": "CWD=../tt-core CI=true ENVCTL_HOME=non-existing ENVCTL_API_KEY=\"$ENVCTL_API_KEY_\" npm run it --",
+    "e1-create": "npm run e1 -- create-ephemeral e1",
+    "e1-init": "cd ../tt-core && terraform init -upgrade -backend-config=key=e1 -reconfigure",
+    "e1-plan": "  npm run e1 -- plan -var=env_size=min -var=env=e1 -out=plan",
+    "e1-apply": " npm run e1 -- apply plan",
+    "e1-delete": "npm run e1 -- delete",
     "-tt-": "",
     "tt-desc": "deploy TT project from local machine",
     "tt": "CWD=../tt-gitops AWS_PROFILE=ac-tt-dev-deployer npm run it --",