@agilecustoms/envctl 0.21.2 → 0.22.1

package/dist/client/ProcessRunner.js

@@ -4,7 +4,7 @@ import * as readline from 'readline';
 import { fileURLToPath } from 'url';
 import { ProcessException } from '../exceptions.js';
 export class ProcessRunner {
-    async runScript(script, args, cwd, scanner) {
+    async runScript(script, args = [], cwd, scanner) {
         const __dirname = path.dirname(fileURLToPath(import.meta.url));
         const scriptPath = path.join(__dirname, `../../scripts/${script}`);
         await this.run(scriptPath, args, cwd, scanner);
@@ -55,7 +55,9 @@ export class ProcessRunner {
         return new Promise((resolve, reject) => {
             child.on('close', (code) => {
                 rl.close();
-                processLine(buffer);
+                if (buffer !== '') {
+                    processLine(buffer);
+                }
                 if (code === 0) {
                     if (errorBuffer) {
                         console.warn('Process completed successfully, but there were errors:\n' + errorBuffer);

package/dist/client/TerraformAdapter.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { AbortedException, KnownException, ProcessException, TerraformInitRequired } from '../exceptions.js';
+import { AbortedException, KnownException, ProcessException } from '../exceptions.js';
 const MAX_ATTEMPTS = 2;
 const RETRYABLE_ERRORS = [
     'ConcurrentModificationException',
@@ -21,7 +21,12 @@ export class TerraformAdapter {
         });
         console.log(`\nTime EST: ${est},  UTC: ${utc}\n`);
     }
-    async init(key, cwd) {
+    async init(key, cwd, upgrade = false) {
+        let accAlias = '';
+        const accAliasScanner = (line) => {
+            accAlias = line;
+        };
+        await this.processRunner.runScript('get-acc-alias.sh', [], cwd, accAliasScanner);
         console.log('Run terraform init to download providers, this doesn\'t create any resources in AWS even S3 object');
         let emptyDir = false;
         const scanner = (line) => {
@@ -29,13 +34,29 @@ export class TerraformAdapter {
                 emptyDir = true;
             }
         };
+        const bucket = `agilecustoms-${accAlias}-tf-state`;
+        const args = [
+            'init',
+            '-reconfigure',
+            `-backend-config=bucket=${bucket}`,
+            `-backend-config=key=${key}`
+        ];
+        if (upgrade) {
+            args.push('-upgrade');
+        }
         this.printTime();
         try {
-            await this.processRunner.runScript('terraform-init.sh', [key], cwd, scanner);
+            await this.processRunner.run('terraform', args, cwd, scanner);
             this.printTime();
         }
         catch (error) {
             if (error instanceof ProcessException) {
+                if (!upgrade && error.message.includes('Failed to query available provider packages')) {
+                    args.push('-upgrade');
+                    await this.processRunner.run('terraform', args, cwd);
+                    this.printTime();
+                    return;
+                }
                 throw new KnownException(`terraform init failed with code ${error.code}:\n${error.message}`, { cause: error });
             }
             throw error;
@@ -174,9 +195,6 @@ export class TerraformAdapter {
             if (!(error instanceof ProcessException)) {
                 throw error;
             }
-            if (error.message.includes('Backend initialization required')) {
-                throw new TerraformInitRequired();
-            }
             if (attemptNo < MAX_ATTEMPTS && RETRYABLE_ERRORS.some(err => error.message.includes(err))) {
                 console.warn(`Retrying terraform apply due to error: ${error.message}`);
                 return this.apply(env, onDemandVars, cwd, attemptNo + 1);

package/dist/exceptions.js

@@ -42,9 +42,3 @@ export class ProcessException extends Error {
         this.name = 'ProcessException';
     }
 }
-export class TerraformInitRequired extends Error {
-    constructor() {
-        super();
-        this.name = 'TerraformInitRequired';
-    }
-}

package/dist/service/EnvCtl.js

@@ -1,4 +1,4 @@
-import { KnownException, TerraformInitRequired } from '../exceptions.js';
+import { KnownException } from '../exceptions.js';
 import { EnvStatus, } from '../model/index.js';
 export class EnvCtl {
     cliHelper;
@@ -65,15 +65,13 @@ export class EnvCtl {
     }
     async init(project, envName, cwd) {
         const key = this.key(project, envName);
-        await this.terraformAdapter.init(key, cwd);
+        await this.terraformAdapter.init(key, cwd, true);
     }
     async plan(input, tfArgs, cwd) {
         const { envName, anOwner, key, env } = await this.tryGetEnv(input);
         if (env == null) {
             const owner = this.cliHelper.ensureOwner(anOwner);
-            await this.terraformAdapter.init(key, cwd);
-            const envTerraform = { envName, ephemeral: false, owner, args: tfArgs };
-            await this.terraformAdapter.plan(envTerraform, cwd);
+            await this.runPlan(key, envName, owner, tfArgs, undefined, cwd);
             return;
         }
         this.checkInput(env, input, cwd);
@@ -83,7 +81,11 @@ export class EnvCtl {
         if (env.status !== EnvStatus.Active) {
             throw new KnownException(`Env ${env.key} status is ${env.status}, can not run plan`);
         }
-        const envTerraform = { envName, ephemeral: false, owner, args: tfArgs, vars: env.vars };
+        await this.runPlan(key, envName, owner, tfArgs, env.vars, cwd);
+    }
+    async runPlan(key, envName, owner, args, vars, cwd) {
+        const envTerraform = { envName, ephemeral: false, owner, args, vars };
+        await this.terraformAdapter.init(key, cwd);
         await this.terraformAdapter.plan(envTerraform, cwd);
     }
     async createEphemeral(project, envName, owner) {
@@ -125,6 +127,7 @@ export class EnvCtl {
         await this.runDeploy(env, envName, tfArgs, cwd);
     }
     async runDeploy(env, envName, tfArgs, cwd) {
+        await this.terraformAdapter.init(env.key, cwd);
         console.log('Deploying resources');
         const { ephemeral, vars } = env;
         const envTerraform = { envName, ephemeral, owner: env.owner || 'system', args: tfArgs, vars };
@@ -132,15 +135,6 @@ export class EnvCtl {
         try {
             await this.terraformAdapter.apply(envTerraform, onDemandVars, cwd);
         }
-        catch (error) {
-            if (error instanceof TerraformInitRequired) {
-                await this.terraformAdapter.init(env.key, cwd);
-                await this.terraformAdapter.apply(envTerraform, onDemandVars, cwd);
-            }
-            else {
-                throw error;
-            }
-        }
         finally {
             if (!ephemeral) {
                 const newVars = this.terraformAdapter.getNewVars(envTerraform, onDemandVars, cwd);
@@ -184,8 +178,8 @@ export class EnvCtl {
             }
             console.log('Deleting env');
         }
-        await this.envApi.delete(env);
-        console.log(`Env ${env.key} is scheduled for deletion`);
+        const message = await this.envApi.delete(env);
+        console.log(message);
     }
     async destroy(project, envName, tfArgs, force, cwd) {
         const env = await this.get(project, envName);
@@ -211,6 +205,7 @@ export class EnvCtl {
         const { ephemeral, owner, vars } = env;
         const envTerraform = { envName, ephemeral, owner: owner || 'system', args: tfArgs, vars };
         console.log('Destroying env resources');
+        await this.terraformAdapter.init(env.key, cwd);
         await this.terraformAdapter.destroy(envTerraform, force, cwd);
         console.log('Unlock env');
         await this.envApi.activate(env);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "0.21.2",
+  "version": "0.22.1",
   "author": "Alex Chekulaev",
   "type": "module",
   "bin": {
@@ -25,13 +25,15 @@
     "test": "vitest run --coverage",
     "build": "tsc",
     "run": "node dist/index.js",
-    "run-version": "    tsc --sourceMap true && npm run run -- --version",
-    "run-configure": "  tsc --sourceMap true && npm run run -- configure",
-    "run-status": "     tsc --sourceMap true && npm run run -- status  --cwd ../tt-core",
-    "run-plan": "       tsc --sourceMap true && npm run run -- plan    --cwd ../tt-core",
-    "run-deploy": "     tsc --sourceMap true && npm run run -- deploy  --cwd ../tt-core -var=\"env_size=min\"",
-    "run-delete": "     tsc --sourceMap true && npm run run -- delete  --cwd ../tt-core",
-    "run-destroy": "    tsc --sourceMap true && npm run run -- destroy --cwd ../tt-core",
+    "run-version": "  tsc --sourceMap true && npm run run -- --version",
+    "run-configure": "tsc --sourceMap true && npm run run -- configure",
+    "~": "",
+    "run-status": " tsc --sourceMap true && npm run run -- status  --cwd ../tt-core",
+    "run-init": "   tsc --sourceMap true && npm run run -- init    --cwd ../tt-core",
+    "run-plan": "   tsc --sourceMap true && npm run run -- plan    --cwd ../tt-core",
+    "run-deploy": " tsc --sourceMap true && npm run run -- deploy  --cwd ../tt-core -var=\"env_size=min\"",
+    "run-delete": " tsc --sourceMap true && npm run run -- delete  --cwd ../tt-core",
+    "run-destroy": "tsc --sourceMap true && npm run run -- destroy --cwd ../tt-core",
     "-": "",
     "run-ephemeral-create": " tsc --sourceMap true && npm run run -- create-ephemeral --env test",
     "run-ephemeral-status": " tsc --sourceMap true && npm run run -- status  --env test",

package/scripts/get-acc-alias.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# TF state is stored in S3 in format: {company}-{acc-alias}-tf-state/{key}
+# (for non ephemeral environments the {key} typically has form of {project-code}-{env-name} like tt-dev)
+# Retrieve AWS account information
+acc_id=$(aws sts get-caller-identity --query "Account" --output text)
+aws organizations list-tags-for-resource --resource-id "$acc_id" --query "Tags[?Key=='Alias'].Value" --output text

package/scripts/terraform-init.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-KEY="${1:?}"
-
-# TF state is stored in S3 in format: {company}-{acc-alias}-tf-state/{key}
-# (for non ephemeral environments the {key} typically has form of {project-code}-{env-name} like tt-dev)
-# Retrieve AWS account information
-acc_id=$(aws sts get-caller-identity --query "Account" --output text)
-acc_alias=$(aws organizations list-tags-for-resource --resource-id "$acc_id" --query "Tags[?Key=='Alias'].Value" --output text)
-state_prefix="agilecustoms-$acc_alias" # like "agilecustoms-tt-dev"
-
-# -upgrade - get latest version of providers (mainly hashicorp/aws)
-# -reconfigure - discard local state, use (or create) remote
-#                added to allow deploy multiple envs from local machine (on CI no local state survive between runs)
-terraform init -upgrade -reconfigure \
- -backend-config="bucket=$state_prefix-tf-state" \
- -backend-config="key=$KEY"