@agilecustoms/envctl 0.22.2 → 0.22.4

package/dist/client/EnvApiClient.js

@@ -25,6 +25,10 @@ export class EnvApiClient {
         await this.httpClient.post('/ci/env', env);
         return { ...env, ephemeral: false, status: EnvStatus.Deploying };
     }
+    async setVars(env, vars) {
+        await this.httpClient.post(`/ci/env/${env.key}/vars`, vars);
+        env.vars = { ...env.vars || {}, ...vars };
+    }
     async activate(env) {
         await this.httpClient.post(`/ci/env/${env.key}/activate`);
         env.status = EnvStatus.Active;
@@ -49,8 +53,4 @@ export class EnvApiClient {
         env.status = EnvStatus.Deleting;
         return result.statusText;
     }
-    async setVars(env, vars) {
-        await this.httpClient.post(`/ci/env/${env.key}/vars`, vars);
-        env.vars = { ...env.vars || {}, ...vars };
-    }
 }

package/dist/service/EnvCtl.js

@@ -148,33 +148,28 @@ export class EnvCtl {
     }
     async delete(project, envName, force, cwd) {
         const env = await this.get(project, envName);
-        if (force) {
-            console.log('Force deletion');
-            if (env.status === EnvStatus.Deploying || env.status === EnvStatus.Updating) {
-                console.log(`Env status is ${env.status}, will unlock it`);
-                await this.envApi.activate(env);
+        if (!force) {
+            this.checkStatus(env);
+            if (env.status === EnvStatus.Init) {
+                await this.envApi.delete(env);
+                console.log(`Env ${env.key} is deleted`);
+                return;
             }
-        }
-        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');
+            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) {
                 return;
             }
         }
-        await this.promptUnlock(env);
-        if (env.status !== EnvStatus.Active) {
-            return;
-        }
         console.log('Deleting env');
         const message = await this.envApi.delete(env);
         console.log(message);

package/package.json

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