@agilecustoms/envctl 1.15.0 → 1.15.1

package/dist/client/Cli.js

@@ -14,15 +14,15 @@ export const NO_TIMEOUT = 0;
 export class Cli {
     constructor() {
     }
-    async run(command, args, timeoutMs = NO_TIMEOUT, out_scanner, in_scanner) {
-        const needsInteractive = !!in_scanner;
-        const spawnOptions = {
-            stdio: [needsInteractive ? 'pipe' : 'ignore', 'pipe', 'pipe'],
-        };
+    async run(command, args, options = {}) {
+        const timeoutMs = options.timeoutMs ?? NO_TIMEOUT;
+        const interactive = options.interactive ?? !!options.inScanner;
+        const stdio = [interactive ? 'pipe' : 'ignore', 'pipe', 'pipe'];
+        const spawnOptions = { stdio };
         const child = spawn(command, args, spawnOptions);
         child.stdout.setEncoding('utf8');
         child.stderr.setEncoding('utf8');
-        const rl = needsInteractive
+        const rl = interactive
             ? readline.createInterface({
                 input: process.stdin,
                 output: process.stdout,
@@ -53,13 +53,13 @@ export class Cli {
         on('SIGTERM');
         on('SIGHUP');
         rl?.on('line', (line) => {
-            in_scanner?.(line);
+            options.inScanner?.(line);
             if (child.stdin.writable) {
                 child.stdin.write(line + '\n');
             }
         });
         function processLine(line) {
-            out_scanner?.(line);
+            options.outScanner?.(line);
             console.log(line);
         }
         let buffer = '';

package/dist/service/TerraformAdapter.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import { createHash } from 'node:crypto';
 import path from 'path';
 import { confirm } from '@inquirer/prompts';
-import { NO_TIMEOUT } from '../client/Cli.js';
+import {} from '../client/Cli.js';
 import { AbortedException, KnownException, ProcessException, TimeoutException } from '../exceptions.js';
 import { logger } from '../logger.js';
 import { LocalStateService } from './LocalStateService.js';
@@ -188,32 +188,14 @@ export class TerraformAdapter {
         });
         return result;
     }
-    async plan(env, args, onDemandVars = {}) {
+    async plan(env, args) {
         args = this.tfArgs(env, args);
-        await this._plan(args, onDemandVars, 1);
+        await this._plan(args, 1);
     }
-    async _plan(args, onDemandVars, attemptNo) {
-        let inputTfVariable = false;
-        let tfVarName = '';
-        function out_scanner(line) {
-            inputTfVariable = false;
-            const match = line.match(/var\.([a-zA-Z_0-9]+)/);
-            if (match) {
-                tfVarName = match[1];
-            }
-            else if (line.includes('Enter a value:')) {
-                inputTfVariable = true;
-            }
-        }
-        function in_scanner(line) {
-            if (inputTfVariable && tfVarName) {
-                onDemandVars[tfVarName] = line;
-                tfVarName = '';
-            }
-        }
+    async _plan(args, attemptNo) {
         logger.info('Running: terraform plan ' + args.join(' ') + '\n');
         try {
-            await this.cli.run('terraform', ['plan', ...args], NO_TIMEOUT, out_scanner, in_scanner);
+            await this.cli.run('terraform', ['plan', ...args], { interactive: true });
         }
         catch (error) {
             if (!(error instanceof ProcessException)) {
@@ -221,13 +203,13 @@ export class TerraformAdapter {
             }
             if (attemptNo < MAX_ATTEMPTS && RETRYABLE_ERRORS.some(err => error.message.includes(err))) {
                 logger.warn(`Retrying terraform plan due to error: ${error.message}`);
-                return this._plan(args, onDemandVars, attemptNo + 1);
+                return this._plan(args, attemptNo + 1);
             }
             const lockId = this.lockId(error, attemptNo);
             if (lockId) {
                 await this.promptUnlock(lockId);
                 logger.info('State unlocked, retrying terraform plan');
-                return this._plan(args, onDemandVars, attemptNo + 1);
+                return this._plan(args, attemptNo + 1);
             }
             throw new KnownException(`terraform plan failed with code ${error.code}:\n${error.message}`, { cause: error });
         }
@@ -250,13 +232,13 @@ export class TerraformAdapter {
         this.printTime();
         const nowUtcSeconds = Math.floor(this.now() / 1000);
         const gracePeriod = 10;
-        const timeout = (ttl - nowUtcSeconds - gracePeriod) * 1000;
-        if (timeout <= 0) {
+        const timeoutMs = (ttl - nowUtcSeconds - gracePeriod) * 1000;
+        if (timeoutMs <= 0) {
             throw new KnownException('TTL expired before terraform apply could start');
         }
-        logger.debug('timeout(ms): ' + timeout);
+        logger.debug('timeout(ms): ' + timeoutMs);
         try {
-            await this.cli.run('terraform', ['apply', ...args], timeout);
+            await this.cli.run('terraform', ['apply', ...args], { timeoutMs });
             this.printTime();
         }
         catch (error) {
@@ -282,14 +264,14 @@ export class TerraformAdapter {
     }
     async _destroy(args, force, attemptNo = 1) {
         let wrongDir = false;
-        const scanner = (line) => {
+        const outScanner = (line) => {
             if (line.includes('Either you have not created any objects yet or the existing objects were')) {
                 wrongDir = true;
             }
         };
-        logger.info('Running: terraform destroy -auto-approve' + args.join(' ') + '\n');
+        logger.info('Running: terraform destroy -auto-approve ' + args.join(' ') + '\n');
         try {
-            await this.cli.run('terraform', ['destroy', '-auto-approve', ...args], NO_TIMEOUT, scanner);
+            await this.cli.run('terraform', ['destroy', '-auto-approve', ...args], { outScanner, interactive: true });
         }
         catch (error) {
             if (!(error instanceof ProcessException)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilecustoms/envctl",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "node.js CLI client for manage environments",
   "keywords": [
     "terraform wrapper",