@agilecustoms/envctl 0.14.5 → 0.15.0

package/dist/client/CliHelper.js

@@ -43,11 +43,19 @@ export class CliHelper {
         }
         return owner;
     }
+    ensureKind(kind, cwd) {
+        if (kind) {
+            return kind;
+        }
+        kind = getDirName(cwd);
+        console.log(`Inferred kind from directory name: ${kind}`);
+        return kind;
+    }
     async parseEnvInput(input, envName, owner, cwd) {
         owner = this.ensureOwner(owner);
         const { size } = input;
         let { type, kind } = input;
-        kind = ensureKind(kind, cwd);
+        kind = this.ensureKind(kind, cwd);
         let envSize;
         if (size) {
             envSize = ensureEnumValue(EnvSize, size, 'size');
@@ -87,14 +95,6 @@ export class CliHelper {
         };
     }
 }
-function ensureKind(kind, cwd) {
-    if (kind) {
-        return kind;
-    }
-    kind = getDirName(cwd);
-    console.log(`Inferred kind from directory name: ${kind}`);
-    return kind;
-}
 function getDirName(cwd) {
     cwd = resolveCwd(cwd);
     return path.basename(cwd);

package/dist/commands/delete.js

@@ -8,10 +8,11 @@ export function deleteIt(program) {
         .description('Delete a development environment')
         .option('--project <project>', _keys.PROJECT)
         .option('--env <env>', _keys.ENV)
+        .option('--cwd <cwd>', _keys.CWD)
         .action(wrap(handler));
 }
 async function handler(options) {
-    const { project, env } = options;
+    const { project, env, cwd } = options;
     const envName = cliHelper.ensureEnv(env);
-    await envCtl.delete(project, envName);
+    await envCtl.delete(project, envName, cwd);
 }

package/dist/commands/status.js

@@ -8,10 +8,11 @@ export function status(program) {
         .description('Get env status')
         .option('--project <project>', _keys.PROJECT)
         .option('--env <env>', _keys.ENV)
+        .option('--cwd <cwd>', _keys.CWD)
         .action(wrap(handler));
 }
 async function handler(options) {
-    const { project, env } = options;
+    const { project, env, cwd } = options;
     const envName = cliHelper.ensureEnv(env);
-    await envCtl.status(project, envName);
+    await envCtl.status(project, envName, cwd);
 }

package/dist/service/EnvCtl.js

@@ -12,7 +12,7 @@ export class EnvCtl {
     key(project, env) {
         return project ? `${project}-${env}` : env;
     }
-    async status(project, envName) {
+    async status(project, envName, cwd) {
         const key = this.key(project, envName);
         console.log(`Retrieve env ${key}`);
         const env = await this.envApi.get(key);
@@ -20,7 +20,11 @@ export class EnvCtl {
             console.log(`Env ${key} does not exist`);
             return;
         }
+        const kind = this.cliHelper.ensureKind(undefined, cwd);
         console.log(`Env ${key} status: ${env.status}`);
+        if (env.kind && env.kind !== kind) {
+            console.warn(`Env ${key} kind (dir-name): ${env.kind} - looks like this env was deployed from a different directory`);
+        }
     }
     async tryGetEnv(input) {
         let envName = input.env;
@@ -41,7 +45,7 @@ export class EnvCtl {
         }
         return { envName, owner, key, env };
     }
-    checkInput(envName, env, input) {
+    checkInput(envName, env, input, cwd) {
         if (env.ephemeral) {
             throw new KnownException(`Attempted to convert ephemeral env to non-ephemeral`);
         }
@@ -54,10 +58,11 @@ export class EnvCtl {
         if (input.type && env.type !== input.type) {
             throw new KnownException(`Can not change env type ${env.type} -> ${input.type}`);
         }
-        if (input.kind && env.kind !== input.kind) {
-            throw new KnownException(`Can not change env kind ${env.kind} -> ${input.kind}`);
+        const kind = this.cliHelper.ensureKind(input.kind, cwd);
+        if ((input.kind || env.kind) && kind !== env.kind) {
+            throw new KnownException(`Can not change env kind ${env.kind} -> ${kind}`);
         }
-        const { owner, size, type, kind } = env;
+        const { owner, size, type } = env;
         return {
             project: input.project, env: envName,
             owner, size, type, kind,
@@ -81,7 +86,7 @@ export class EnvCtl {
             await this.terraformAdapter.plan(envInput, tfArgs, cwd);
             return;
         }
-        const envInput = this.checkInput(envName, env, input);
+        const envInput = this.checkInput(envName, env, input, cwd);
         this.checkStatus(env);
         await this.promptUnlock(env);
         if (env.status !== EnvStatus.Active) {
@@ -128,9 +133,18 @@ export class EnvCtl {
         console.log('Unlock env after db evolution');
         await this.envApi.activate(env);
     }
-    async delete(project, envName) {
+    async delete(project, envName, cwd) {
         const env = await this.get(project, envName);
         this.checkStatus(env);
+        const kind = this.cliHelper.ensureKind(undefined, cwd);
+        if (env.kind && env.kind !== kind) {
+            const answerYes = await this.cliHelper.promptYesNo(`Env ${env.key} kind (dir-name): ${env.kind} - you're deleting env deployed from different dir\n`
+                + 'Do you want to proceed?');
+            if (!answerYes) {
+                console.log('Aborting deletion');
+                return;
+            }
+        }
         await this.promptUnlock(env);
         if (env.status !== EnvStatus.Active) {
             throw new KnownException(`Env ${env.key} status is ${env.status}, can not delete`);
@@ -141,6 +155,10 @@ export class EnvCtl {
     }
     async destroy(project, envName, tfArgs, cwd) {
         const env = await this.get(project, envName);
+        const kind = this.cliHelper.ensureKind(undefined, cwd);
+        if (env.kind && env.kind !== kind) {
+            throw new KnownException(`Env ${env.key} kind (dir-name): ${env.kind} - make sure you run destroy from the same directory`);
+        }
         this.checkStatus(env);
         await this.promptUnlock(env, [EnvStatus.Creating]);
         if (env.status === EnvStatus.Active) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "0.14.5",
+  "version": "0.15.0",
   "author": "Alex Chekulaev",
   "type": "module",
   "bin": {
@@ -27,10 +27,10 @@
     "run": "node dist/index.js",
     "run-version": "tsc --sourceMap true && npm run run -- --version",
     "run-configure": "tsc --sourceMap true && npm run run -- configure",
-    "run-status": "tsc --sourceMap true && npm run run -- status",
+    "run-status": "tsc --sourceMap true && npm run run -- status --cwd ../tt-core",
     "run-plan": "tsc --sourceMap true && npm run run -- plan --size min --cwd ../tt-core",
     "run-deploy": "tsc --sourceMap true && npm run run -- deploy --size min --cwd ../tt-core",
-    "run-delete": "tsc --sourceMap true && npm run run -- delete",
+    "run-delete": "tsc --sourceMap true && npm run run -- delete --cwd ../tt-web",
     "run-destroy": "tsc --sourceMap true && npm run run -- destroy --cwd ../tt-core"
   },
   "dependencies": {