@agilecustoms/envctl 1.10.5 → 1.11.1

package/dist/container.js

@@ -13,7 +13,8 @@ export function buildContainer(appVersion) {
     const httpClient = new HttpClient(appVersion, commandId);
     const envApiClient = new EnvApiClient(httpClient);
     const localStateService = new LocalStateService();
-    const terraformAdapter = new TerraformAdapter(Date.now, cli, localStateService, backends);
+    const nonInteractive = !process.stdout.isTTY || process.env.CI === 'true';
+    const terraformAdapter = new TerraformAdapter(Date.now, cli, localStateService, backends, nonInteractive);
     const envService = new EnvService(cli, envApiClient, terraformAdapter);
     const logService = new LogService(cli, envApiClient, terraformAdapter);
     return { configService, envService, logService };

package/dist/service/EnvService.js

@@ -63,7 +63,7 @@ export class EnvService extends BaseService {
         }
         const newEnv = env === null;
         await this.lockTerraform(env, newEnv);
-        await this.terraformAdapter.plan(env ?? { key }, tfArgs);
+        await this.terraformAdapter.plan(env ?? { key, ephemeral: false }, tfArgs);
     }
     async createEphemeral(key) {
         const createEnv = { key };

package/dist/service/TerraformAdapter.js

@@ -19,12 +19,14 @@ export class TerraformAdapter {
     now;
     cli;
     localStateService;
+    nonInteractive;
     backends;
     backend = undefined;
-    constructor(now, cli, localStateService, backends) {
+    constructor(now, cli, localStateService, backends, nonInteractive) {
         this.now = now;
         this.cli = cli;
         this.localStateService = localStateService;
+        this.nonInteractive = nonInteractive;
         this.backends = backends.reduce((acc, backend) => {
             acc.set(backend.getType(), backend);
             return acc;
@@ -118,7 +120,7 @@ export class TerraformAdapter {
     tfArgs(env, args, vars = []) {
         const varDefs = this.getVarDefs();
         const argVars = this.getArgVars(args);
-        const specialFields = { ...env, env: env.key };
+        const specialFields = { env: env.key, ephemeral: env.ephemeral };
         const extraArgs = [];
         for (const name of ['env', 'ephemeral']) {
             if (varDefs[name] && !argVars[name]) {
@@ -130,6 +132,9 @@ export class TerraformAdapter {
                 extraArgs.push('-var=' + key + '=' + value);
             }
         });
+        if (this.nonInteractive && !args.some(arg => arg.startsWith('-input'))) {
+            extraArgs.push('-input=false');
+        }
         return [...extraArgs, ...args];
     }
     getVarDefs() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilecustoms/envctl",
-  "version": "1.10.5",
+  "version": "1.11.1",
   "description": "node.js CLI client for manage environments",
   "keywords": [
     "terraform wrapper",
@@ -45,17 +45,17 @@
     "run-core-status": " CWD=../tt-core npm run it -- status --verbose",
     "run-core-plan": "   CWD=../tt-core npm run it -- plan -out=.terraform/plan",
     "run-core-deployp": "CWD=../tt-core npm run it -- deploy .terraform/plan",
-    "run-core-deploy": " CWD=../tt-core npm run it -- deploy -var=\"env_size=min\"",
+    "run-core-deploy": " CWD=../tt-core npm run it -- deploy",
     "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=\"env_size=min\" -var-file=versions.tfvars",
+    "run-plan": "   AWS_PROFILE=ac-tt-dev-deployer  CWD=../tt-gitops npm run it -- plan -var-file=versions.tfvars",
     "run-deploy": " AWS_PROFILE=ac-tt-dev-deployer  CWD=../tt-gitops npm run it -- deploy -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=\"env_size=min\" -var-file=versions.tfvars",
+    "run-destroy": "AWS_PROFILE=ac-tt-dev-destroyer CWD=../tt-gitops npm run it -- destroy -var-file=versions.tfvars",
     "-": "",
     "run-ephemeral-create": " npm run it -- create-ephemeral --key test",
     "run-ephemeral-init": "cd ../tt-gitops && terraform init -upgrade -backend-config=key=test -reconfigure",