@agilecustoms/envctl 1.4.1 → 1.6.0

package/dist/client/TerraformAdapter.js

@@ -212,7 +212,7 @@ export class TerraformAdapter {
                 tfVarName = '';
             }
         }
-        console.log('Running: terraform plan -auto-approve', ...args, '\n');
+        console.log('Running: terraform plan', ...args, '\n');
         try {
             await this.cli.run('terraform', ['plan', ...args], out_scanner, in_scanner);
         }
@@ -234,7 +234,7 @@ export class TerraformAdapter {
         }
     }
     async apply(args, attemptNo = 1) {
-        console.log('Running: terraform apply ', ...args, '\n');
+        console.log('Running: terraform apply', ...args, '\n');
         this.printTime();
         try {
             await this.cli.run('terraform', ['apply', ...args]);

package/dist/service/EnvService.js

@@ -66,10 +66,9 @@ export class EnvService extends BaseService {
         const env = await this.tryGetEnv(key);
         if (env) {
             this.checkKind(env);
-            if (env.status === EnvStatus.Deleting) {
-                throw new KnownException(`Env ${env.key} status is DELETING, please wait`);
-            }
+            this.handleDeleteStatuses(env);
         }
+        await this.lockTerraform(env, env === null);
         await this.terraformAdapter.plan(env, tfArgs);
     }
     async createEphemeral(key) {
@@ -79,11 +78,13 @@ export class EnvService extends BaseService {
     async lockTerraform(env, newEnv = false) {
         console.log('Lock providers');
         const res = await this.terraformAdapter.lock(newEnv);
-        if (res.lockFile) {
-            env.lockFile = res.lockFile;
-        }
-        if (res.stateFile) {
-            env.stateFile = res.stateFile;
+        if (env !== null) {
+            if (res.lockFile) {
+                env.lockFile = res.lockFile;
+            }
+            if (res.stateFile) {
+                env.stateFile = res.stateFile;
+            }
         }
     }
     async ensurePlan(env, args) {
@@ -106,6 +107,16 @@ export class EnvService extends BaseService {
         }
         return applyArgs;
     }
+    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}'`);
+        }
+    }
     async deploy(tfArgs) {
         const key = this.terraformAdapter.getTerraformBackend().getKey();
         let env = await this.tryGetEnv(key);
@@ -121,10 +132,8 @@ export class EnvService extends BaseService {
             return;
         }
         this.checkKind(env);
+        this.handleDeleteStatuses(env);
         const status = env.status;
-        if (status === EnvStatus.Deleting) {
-            throw new KnownException(`Env ${env.key} status is DELETING, please wait`);
-        }
         if (status === EnvStatus.Deploying || status === EnvStatus.Updating) {
             const answerYes = await this.cli.promptYesNo(`Env status is ${status}, likely due to an error from a previous run\n
           Do you want to proceed with deployment?`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "1.4.1",
+  "version": "1.6.0",
   "author": "Alex Chekulaev",
   "type": "module",
   "engines": {
@@ -32,11 +32,10 @@
     "run-configure": "npm run run -- configure",
     "~": "",
     "run-core-init": "  cd ../tt-core && terraform init -upgrade -backend-config=key=laxa1986 -reconfigure",
-    "run-core-tfplan": "cd ../tt-core && terraform plan -out=.terraform/plan",
     "run-core-status": " npm run run -- status  --cwd ../tt-core",
-    "run-core-plan": "   npm run run -- plan    --cwd ../tt-core",
+    "run-core-plan": "   npm run run -- plan    --cwd ../tt-core -out=.terraform/plan",
+    "run-core-deployp": "npm run run -- deploy  --cwd ../tt-core .terraform/plan",
     "run-core-deploy": " npm run run -- deploy  --cwd ../tt-core -var=\"env_size=min\"",
-    "run-core-deployp": "npm run run -- deploy .terraform/plan --cwd ../tt-core",
     "run-core-delete": " npm run run -- delete  --cwd ../tt-core",
     "run-core-destroy": "npm run run -- destroy --cwd ../tt-core",
     "run-core-logs": "   npm run run -- logs    --cwd ../tt-core",