@agilecustoms/envctl 0.18.2 → 0.19.1

package/dist/client/ProcessRunner.js

@@ -18,16 +18,17 @@ export class ProcessRunner {
         const child = spawn(command, args, spawnOptions);
         child.stdout.setEncoding('utf8');
         child.stderr.setEncoding('utf8');
+        function processLine(line) {
+            if (scanner)
+                scanner(line);
+            console.log(line);
+        }
         let buffer = '';
         child.stdout.on('data', (data) => {
             buffer += data;
             const lines = buffer.split('\n');
             buffer = lines.pop() || '';
-            for (const line of lines) {
-                if (scanner)
-                    scanner(line);
-                console.log(line);
-            }
+            lines.forEach(processLine);
             if (buffer.includes('Enter a value:')) {
                 console.log(buffer);
                 buffer = '';
@@ -39,9 +40,7 @@ export class ProcessRunner {
         });
         return new Promise((resolve, reject) => {
             child.on('close', (code) => {
-                if (scanner)
-                    scanner(buffer);
-                console.log(buffer);
+                processLine(buffer);
                 if (code === 0) {
                     if (errorBuffer) {
                         console.warn('Process completed successfully, but there were errors:\n' + errorBuffer);

package/dist/client/TerraformAdapter.js

@@ -103,7 +103,7 @@ export class TerraformAdapter {
             throw new KnownException(`terraform apply failed with code ${error.code}:\n${error.message}`, { cause: error });
         }
     }
-    async destroy(env, tfArgs, cwd, attemptNo = 1) {
+    async destroy(env, tfArgs, force, cwd, attemptNo = 1) {
         let wrongDir = false;
         const scanner = (line) => {
             if (line.includes('Either you have not created any objects yet or the existing objects were')) {
@@ -121,9 +121,14 @@ export class TerraformAdapter {
             }
             const lockId = this.lockId(error, attemptNo);
             if (lockId) {
-                await this.promptUnlock(lockId, cwd);
+                if (force) {
+                    await this.forceUnlock(lockId, cwd);
+                }
+                else {
+                    await this.promptUnlock(lockId, cwd);
+                }
                 console.info('State unlocked, retrying terraform destroy');
-                return this.destroy(env, tfArgs, cwd, attemptNo + 1);
+                return this.destroy(env, tfArgs, force, cwd, attemptNo + 1);
             }
             throw new KnownException(`terraform destroy failed with code ${error.code}:\n${error.message}`, { cause: error });
         }
@@ -147,6 +152,9 @@ export class TerraformAdapter {
         if (!answerYes) {
             throw new AbortedException();
         }
+        await this.forceUnlock(id, cwd);
+    }
+    async forceUnlock(id, cwd) {
         console.log('Force unlocking state');
         await this.processRunner.run('terraform', ['force-unlock', '-force', id], cwd);
     }

package/dist/commands/_keys.js

@@ -1,6 +1,7 @@
 export const _keys = {
     CWD: 'Working directory (default: current directory)',
     ENV: 'Environment name (can be git hash). {project}-{env} give env key used to store env state (s3 key in case of AWS)',
+    FORCE: 'Force deletion without confirmation',
     KIND: 'Environment kind: complete project (default) or some slice such as tt-core + tt-web',
     OWNER: 'Environment owner (GH username)',
     PROJECT: 'Project code (like tt). Used when multiple projects deployed in same AWS account',

package/dist/commands/delete.js

@@ -8,7 +8,7 @@ export function deleteIt(program) {
         .description('Delete a development environment')
         .option('--project <project>', _keys.PROJECT)
         .option('--env <env>', _keys.ENV)
-        .option('--force', 'Force deletion without confirmation')
+        .option('--force', _keys.FORCE)
         .option('--cwd <cwd>', _keys.CWD)
         .action(wrap(handler));
 }

package/dist/commands/destroy.js

@@ -10,13 +10,14 @@ export function destroy(program) {
         + ' Main use case - test deletion process, basically that you have enough permissions to delete resources')
         .option('--project <project>', _keys.PROJECT)
         .option('--env <env>', _keys.ENV)
+        .option('--force', _keys.FORCE)
         .option('--cwd <cwd>', _keys.CWD)
         .allowUnknownOption(true)
         .argument('[args...]')
         .action(wrap(handler));
 }
 async function handler(tfArgs, options) {
-    const { project, env, cwd } = options;
+    const { project, env, force, cwd } = options;
     const envName = cliHelper.ensureEnv(env);
-    await envCtl.destroy(project, envName, tfArgs, cwd);
+    await envCtl.destroy(project, envName, tfArgs, Boolean(force), cwd);
 }

package/dist/service/EnvCtl.js

@@ -183,14 +183,16 @@ export class EnvCtl {
         const statusMessage = await this.envApi.delete(env);
         console.log(statusMessage);
     }
-    async destroy(project, envName, tfArgs, cwd) {
+    async destroy(project, envName, tfArgs, force, cwd) {
         const env = await this.get(project, envName);
-        const kind = this.cliHelper.ensureKind(undefined, cwd);
-        if (env.kind && env.kind !== kind) {
-            throw new KnownException(`Env ${env.key} kind (dir-name): ${env.kind} - make sure you run destroy from the same directory`);
-        }
         this.checkStatus(env);
-        await this.promptUnlock(env, [EnvStatus.Creating]);
+        if (!force) {
+            const kind = this.cliHelper.ensureKind(undefined, cwd);
+            if (env.kind && env.kind !== kind) {
+                throw new KnownException(`Env ${env.key} kind (dir-name): ${env.kind} - make sure you run destroy from the same directory`);
+            }
+            await this.promptUnlock(env, [EnvStatus.Creating]);
+        }
         if (env.status === EnvStatus.Active) {
             console.log('Lock env to run destroy');
             await this.envApi.lockForUpdate(env);
@@ -198,13 +200,13 @@ export class EnvCtl {
         const { owner, size, type, ephemeral } = env;
         const tfEnv = { owner, size, type, ephemeral, env: envName };
         console.log('Destroying env resources');
-        await this.terraformAdapter.destroy(tfEnv, tfArgs, cwd);
+        await this.terraformAdapter.destroy(tfEnv, tfArgs, force, cwd);
         console.log('Unlock env');
         await this.envApi.activate(env);
         console.log('Schedule env metadata deletion');
         const statusMessage = await this.envApi.delete(env);
         console.log(statusMessage);
-        console.log('Please wait for ~1 min before you can create env with same name');
+        console.log('Please wait for ~15 sec before you can create env with same name');
     }
     async get(project, envName) {
         const key = this.key(project, envName);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "0.18.2",
+  "version": "0.19.1",
   "author": "Alex Chekulaev",
   "type": "module",
   "bin": {
@@ -25,18 +25,20 @@
     "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 --size min --cwd ../tt-core",
-    "run-deploy": "tsc --sourceMap true && npm run run -- deploy --size min --cwd ../tt-core",
-    "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-api-status": "tsc --sourceMap true && npm run run -- status --env laxa1986",
-    "run-api-create-ephemeral": "tsc --sourceMap true && npm run run -- api-create-ephemeral --env laxa1986 --owner laxa1986 --size min --type dev",
-    "run-api-init": "tsc --sourceMap true && npm run run -- init --env laxa1986 --cwd ../tt-gitops",
-    "run-api-deploy": "tsc --sourceMap true && npm run run -- deploy --env laxa1986 -var-file=versions.tfvars --cwd ../tt-gitops",
-    "run-api-delete": "tsc --sourceMap true && npm run run -- delete --force --cwd ../tt-gitops"
+    "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 --size min",
+    "run-deploy": "     tsc --sourceMap true && npm run run -- deploy  --cwd ../tt-core --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-api-create-ephemeral": "tsc --sourceMap true && npm run run -- api-create-ephemeral --env test --owner laxa1986 --size min --type dev",
+    "run-api-status": " tsc --sourceMap true && npm run run -- status  --env test",
+    "run-api-init": "   tsc --sourceMap true && npm run run -- init    --env test --cwd ../tt-gitops",
+    "run-api-deploy": " tsc --sourceMap true && npm run run -- deploy  --env test --cwd ../tt-gitops -var-file=versions.tfvars",
+    "run-api-delete": " tsc --sourceMap true && npm run run -- delete  --env test --cwd ../tt-gitops --force",
+    "run-api-destroy": "tsc --sourceMap true && npm run run -- destroy --env test --cwd ../tt-gitops --force -var-file=versions.tfvars"
   },
   "dependencies": {
     "@aws-sdk/client-sts": "^3.716.0",