@agilecustoms/envctl 0.22.0 → 0.22.2

package/dist/service/EnvCtl.js

@@ -148,12 +148,6 @@ export class EnvCtl {
     }
     async delete(project, envName, force, cwd) {
         const env = await this.get(project, envName);
-        this.checkStatus(env);
-        if (env.status === EnvStatus.Init) {
-            await this.envApi.delete(env);
-            console.log(`Env ${env.key} is deleted`);
-            return;
-        }
         if (force) {
             console.log('Force deletion');
             if (env.status === EnvStatus.Deploying || env.status === EnvStatus.Updating) {
@@ -161,25 +155,29 @@ export class EnvCtl {
                 await this.envApi.activate(env);
             }
         }
-        else {
-            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}\n`
-                    + '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) {
+        this.checkStatus(env);
+        if (env.status === EnvStatus.Init) {
+            await this.envApi.delete(env);
+            console.log(`Env ${env.key} is deleted`);
+            return;
+        }
+        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}\n`
+                + 'You\'re deleting env deployed from different dir\n'
+                + 'Do you want to proceed?');
+            if (!answerYes) {
+                console.log('Aborting deletion');
                 return;
             }
-            console.log('Deleting env');
         }
-        await this.envApi.delete(env);
-        console.log(`Env ${env.key} is scheduled for deletion`);
+        await this.promptUnlock(env);
+        if (env.status !== EnvStatus.Active) {
+            return;
+        }
+        console.log('Deleting env');
+        const message = await this.envApi.delete(env);
+        console.log(message);
     }
     async destroy(project, envName, tfArgs, force, cwd) {
         const env = await this.get(project, envName);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "author": "Alex Chekulaev",
   "type": "module",
   "bin": {