@agilecustoms/envctl 1.18.2 → 1.19.0

package/dist/service/EnvService.js

@@ -6,7 +6,6 @@ import { logger } from '../logger.js';
 import { EnvStatus } from '../model/index.js';
 import { toLocalTime } from '../util.js';
 import { BaseService } from './BaseService.js';
-export const PLAN_FILE = '.terraform/envctl.plan';
 export class EnvService extends BaseService {
     cli;
     envApi;
@@ -82,26 +81,6 @@ export class EnvService extends BaseService {
             }
         }
     }
-    async ensurePlan(env, args) {
-        if (args.length > 0 && !args[0].startsWith('-')) {
-            return args;
-        }
-        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;
-    }
     handleDeleteStatuses(env) {
         if (env.status === EnvStatus.Deleting) {
             throw new KnownException(`Env ${env.key} status is DELETING, please wait.\n
@@ -119,7 +98,6 @@ export class EnvService extends BaseService {
             const dir = this.cli.getDir();
             const createEnv = { key, dir };
             await this.lockTerraform(createEnv, true);
-            tfArgs = await this.ensurePlan({ key, ephemeral: false }, tfArgs);
             logger.info('Creating env metadata');
             env = await this.envApi.create(createEnv);
             await this.runApply(env, tfArgs);
@@ -140,7 +118,6 @@ export class EnvService extends BaseService {
         if (status === EnvStatus.Init || status === EnvStatus.Active) {
             logger.info(`Env status is ${status}`);
             await this.lockTerraform(env);
-            tfArgs = await this.ensurePlan(env, tfArgs);
             if (env.status == EnvStatus.Active) {
                 logger.info('Will lock for update and run terraform apply (to update resources)');
             }
@@ -148,12 +125,11 @@ export class EnvService extends BaseService {
             await this.runApply(env, tfArgs);
             return;
         }
-        tfArgs = await this.ensurePlan(env, tfArgs);
         await this.runApply(env, tfArgs);
     }
     async runApply(env, tfArgs) {
         logger.info('Deploying resources');
-        await this.terraformAdapter.apply(tfArgs, env.ttl);
+        await this.terraformAdapter.apply(env, tfArgs);
         logger.info('Activating env (to finish creation)');
         await this.envApi.activate(env);
     }

package/dist/service/TerraformAdapter.js

@@ -120,7 +120,7 @@ export class TerraformAdapter {
         });
         logger.info(`\nTime EDT: ${edt},  UTC: ${utc}\n`);
     }
-    tfArgs(env, args, vars = []) {
+    tfArgs(env, args) {
         const varDefs = this.getVarDefs();
         const argVars = this.getArgVars(args);
         const extraArgs = [];
@@ -141,11 +141,6 @@ export class TerraformAdapter {
                 extraArgs.push('-var=' + name + '=' + specialFields[name]);
             }
         }
-        Object.entries(vars || {}).forEach(([key, value]) => {
-            if (varDefs[key] && !argVars[key]) {
-                extraArgs.push('-var=' + key + '=' + value);
-            }
-        });
         return [...extraArgs, ...args];
     }
     getVarDefs() {
@@ -214,10 +209,11 @@ export class TerraformAdapter {
             throw new KnownException(`terraform plan failed with code ${error.code}:\n${error.message}`, { cause: error });
         }
     }
-    async apply(args, ttl) {
+    async apply(env, args) {
+        args = this.tfArgs(env, args);
         logger.info('Running: terraform apply ' + args.join(' ') + '\n');
         try {
-            await this._apply(args, ttl, 1);
+            await this._apply(args, env.ttl, 1);
         }
         catch (error) {
             if (error instanceof TimeoutException) {
@@ -237,8 +233,9 @@ export class TerraformAdapter {
             throw new KnownException('TTL expired before terraform apply could start');
         }
         logger.debug('timeout(ms): ' + timeoutMs);
+        logger.info('Running: terraform apply ' + args.join(' ') + '\n');
         try {
-            await this.cli.run('terraform', ['apply', ...args], { timeoutMs });
+            await this.cli.run('terraform', ['apply', ...args], { timeoutMs, interactive: true });
             this.printTime();
         }
         catch (error) {
@@ -269,9 +266,9 @@ export class TerraformAdapter {
                 wrongDir = true;
             }
         };
-        logger.info('Running: terraform destroy -auto-approve ' + args.join(' ') + '\n');
+        logger.info('Running: terraform destroy ' + args.join(' ') + '\n');
         try {
-            await this.cli.run('terraform', ['destroy', '-auto-approve', ...args], { outScanner, interactive: true });
+            await this.cli.run('terraform', ['destroy', ...args], { outScanner, interactive: true });
         }
         catch (error) {
             if (!(error instanceof ProcessException)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilecustoms/envctl",
-  "version": "1.18.2",
+  "version": "1.19.0",
   "description": "node.js CLI client for manage environments",
   "keywords": [
     "terraform wrapper",
@@ -46,13 +46,14 @@
     "run-core-plan": "   CWD=../tt-core npm run it -- plan -out=.terraform/plan",
     "run-core-applyp": " CWD=../tt-core npm run it -- apply .terraform/plan",
     "run-core-apply": "  CWD=../tt-core npm run it -- apply",
+    "run-core-applya": " CWD=../tt-core npm run it -- apply --auto-approve",
     "run-core-delete": " CWD=../tt-core npm run it -- delete",
     "run-core-destroy": "CWD=../tt-core npm run it -- destroy",
     "run-core-logs": "   CWD=../tt-core npm run it -- logs",
     "*": "",
     "run-init": "cd ../tt-gitops && terraform init -upgrade -backend-config=key=laxa1986 -reconfigure",
     "run-status": "                                 CWD=../tt-gitops npm run it -- status",
-    "run-plan": "   AWS_PROFILE=ac-tt-dev-deployer  CWD=../tt-gitops npm run it -- plan -var-file=versions.tfvars",
+    "run-plan": "  AWS_PROFILE=ac-tt-dev-deployer   CWD=../tt-gitops npm run it -- plan -var-file=versions.tfvars",
     "run-apply": " AWS_PROFILE=ac-tt-dev-deployer   CWD=../tt-gitops npm run it -- apply -var-file=versions.tfvars",
     "run-delete": "                                 CWD=../tt-gitops npm run it -- delete",
     "run-destroy": "AWS_PROFILE=ac-tt-dev-destroyer CWD=../tt-gitops npm run it -- destroy -var-file=versions.tfvars",