@agilecustoms/envctl 1.4.0 → 1.5.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

@@ -3,6 +3,7 @@ import { EnvApiClient, TerraformAdapter } from '../client/index.js';
 import { KnownException } from '../exceptions.js';
 import { EnvStatus } from '../model/index.js';
 import { BaseService } from './BaseService.js';
+export const PLAN_FILE = '.terraform/envctl.plan';
 export class EnvService extends BaseService {
     cli;
     envApi;
@@ -69,6 +70,7 @@ export class EnvService extends BaseService {
                 throw new KnownException(`Env ${env.key} status is DELETING, please wait`);
             }
         }
+        await this.lockTerraform(env, env === null);
         await this.terraformAdapter.plan(env, tfArgs);
     }
     async createEphemeral(key) {
@@ -78,20 +80,34 @@ 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) {
         if (args.length > 0 && !args[0].startsWith('-')) {
             return args;
         }
-        const planFile = '.terraform/envctl.plan';
-        await this.terraformAdapter.plan(env, [`-out=${planFile}`, ...args]);
-        return [planFile, ...args].filter(arg => !arg.startsWith('-var'));
+        await this.terraformAdapter.plan(env, [`-out=${PLAN_FILE}`, ...args]);
+        const PLAN_ARGS = ['-var', '-target', '-replace', '-refresh'];
+        const applyArgs = [PLAN_FILE];
+        for (let i = 0; i < args.length; i++) {
+            const arg = args[i];
+            if (arg === '-var' || arg === '-var-file') {
+                i++;
+                continue;
+            }
+            if (PLAN_ARGS.some(planArg => arg.startsWith(planArg))) {
+                continue;
+            }
+            applyArgs.push(arg);
+        }
+        return applyArgs;
     }
     async deploy(tfArgs) {
         const key = this.terraformAdapter.getTerraformBackend().getKey();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "1.4.0",
+  "version": "1.5.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",