@agilecustoms/envctl 0.18.0 → 0.18.2

package/dist/client/ProcessRunner.js

@@ -26,7 +26,7 @@ export class ProcessRunner {
             for (const line of lines) {
                 if (scanner)
                     scanner(line);
-                console.log(`> ${line}`);
+                console.log(line);
             }
             if (buffer.includes('Enter a value:')) {
                 console.log(buffer);
@@ -41,7 +41,7 @@ export class ProcessRunner {
             child.on('close', (code) => {
                 if (scanner)
                     scanner(buffer);
-                console.log(`> ${buffer}`);
+                console.log(buffer);
                 if (code === 0) {
                     if (errorBuffer) {
                         console.warn('Process completed successfully, but there were errors:\n' + errorBuffer);

package/dist/client/TerraformAdapter.js

@@ -48,6 +48,7 @@ export class TerraformAdapter {
             `-var=owner=${env.owner}`,
             `-var=env_size=${env.size}`,
             `-var=env_type=${env.type}`,
+            `-var=ephemeral=${env.ephemeral}`,
             ...tfArgs
         ];
     }

package/dist/commands/delete.js

@@ -8,11 +8,12 @@ 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('--cwd <cwd>', _keys.CWD)
         .action(wrap(handler));
 }
 async function handler(options) {
-    const { project, env, cwd } = options;
+    const { project, env, force, cwd } = options;
     const envName = cliHelper.ensureEnv(env);
-    await envCtl.delete(project, envName, cwd);
+    await envCtl.delete(project, envName, Boolean(force), cwd);
 }

package/dist/service/EnvCtl.js

@@ -21,7 +21,7 @@ export class EnvCtl {
             console.log(`Env ${key} does not exist`);
             return;
         }
-        const kind = this.cliHelper.ensureKind(undefined, cwd);
+        const kind = env.kind ? this.cliHelper.ensureKind(undefined, cwd) : undefined;
         console.log(`Env ${key} status: ${env.status}`);
         if (env.kind && env.kind !== kind) {
             console.warn(`Env ${key} kind (dir-name): ${env.kind} - looks like this env was deployed from a different directory`);
@@ -47,9 +47,6 @@ export class EnvCtl {
         return { envName, owner, key, env };
     }
     checkInput(envName, env, input, cwd) {
-        if (env.ephemeral) {
-            throw new KnownException(`Attempted to convert ephemeral env to non-ephemeral`);
-        }
         if (input.owner && env.owner !== input.owner) {
             throw new KnownException(`Can not change env owner ${env.owner} -> ${input.owner}`);
         }
@@ -87,17 +84,19 @@ export class EnvCtl {
         const { envName, owner, key, env } = await this.tryGetEnv(input);
         if (env == null) {
             const envInput = await this.cliHelper.parseEnvInput(input, envName, owner, cwd);
+            const envTerraform = { ...envInput, ephemeral: false };
             await this.terraformAdapter.init(key, cwd);
-            await this.terraformAdapter.plan(envInput, tfArgs, cwd);
+            await this.terraformAdapter.plan(envTerraform, tfArgs, cwd);
             return;
         }
         const envInput = this.checkInput(envName, env, input, cwd);
+        const envTerraform = { ...envInput, ephemeral: false };
         this.checkStatus(env);
         await this.promptUnlock(env);
         if (env.status !== EnvStatus.Active) {
             throw new KnownException(`Env ${env.key} status is ${env.status}, can not run plan`);
         }
-        await this.terraformAdapter.plan(envInput, tfArgs, cwd);
+        await this.terraformAdapter.plan(envTerraform, tfArgs, cwd);
     }
     async createEphemeral(project, envName, owner, size, type) {
         const key = this.key(project, envName);
@@ -121,7 +120,7 @@ export class EnvCtl {
         }
         this.checkInput(envName, env, input, cwd);
         this.checkStatus(env);
-        if (env.status == EnvStatus.Creating || env.status == EnvStatus.Updating) {
+        if (env.status == EnvStatus.Updating) {
             const answerYes = await this.cliHelper.promptYesNo(`Env status is ${env.status}, likely to be an error from a previous run\n`
                 + 'Do you want to proceed with deployment?');
             if (!answerYes) {
@@ -137,8 +136,8 @@ export class EnvCtl {
     }
     async runDeploy(env, envName, tfArgs, cwd) {
         console.log('Deploying resources');
-        const { owner, size, type } = env;
-        const envTf = { owner, size, type, env: envName };
+        const { owner, size, type, ephemeral } = env;
+        const envTf = { owner, size, type, ephemeral, env: envName };
         try {
             await this.terraformAdapter.apply(envTf, tfArgs, cwd);
         }
@@ -154,24 +153,33 @@ export class EnvCtl {
         console.log('Activating env (to finish creation)');
         await this.envApi.activate(env);
     }
-    async delete(project, envName, cwd) {
+    async delete(project, envName, force, cwd) {
         const env = await this.get(project, envName);
         this.checkStatus(env);
-        const kind = this.cliHelper.ensureKind(undefined, cwd);
-        if (env.kind && env.kind !== kind) {
-            const answerYes = await this.cliHelper.promptYesNo(`Env ${env.key} kind (dir-name): ${env.kind}\n`
-                + 'You\'re deleting env deployed from different dir\n'
-                + 'Do you want to proceed?');
-            if (!answerYes) {
-                console.log('Aborting deletion');
-                return;
+        if (force) {
+            console.log('Force deletion');
+            if (env.status !== EnvStatus.Active) {
+                console.log(`Env status is ${env.status}, will unlock it`);
+                await this.envApi.activate(env);
             }
         }
-        await this.promptUnlock(env);
-        if (env.status !== EnvStatus.Active) {
-            return;
+        else {
+            const kind = this.cliHelper.ensureKind(undefined, cwd);
+            if (env.kind && env.kind !== kind) {
+                const answerYes = await this.cliHelper.promptYesNo(`Env ${env.key} kind (dir-name): ${env.kind}\n`
+                    + 'You\'re deleting env deployed from different dir\n'
+                    + 'Do you want to proceed?');
+                if (!answerYes) {
+                    console.log('Aborting deletion');
+                    return;
+                }
+            }
+            await this.promptUnlock(env);
+            if (env.status !== EnvStatus.Active) {
+                return;
+            }
+            console.log('Deleting env');
         }
-        console.log('Deleting env');
         const statusMessage = await this.envApi.delete(env);
         console.log(statusMessage);
     }
@@ -187,8 +195,8 @@ export class EnvCtl {
             console.log('Lock env to run destroy');
             await this.envApi.lockForUpdate(env);
         }
-        const { owner, size, type } = env;
-        const tfEnv = { owner, size, type, env: envName };
+        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);
         console.log('Unlock env');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "0.18.0",
+  "version": "0.18.2",
   "author": "Alex Chekulaev",
   "type": "module",
   "bin": {
@@ -28,12 +28,15 @@
     "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 --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-create-ephemeral": "tsc --sourceMap true && npm run run -- api-create-ephemeral --env laxa1986 --owner laxa1986 --size min --type dev"
+    "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"
   },
   "dependencies": {
     "@aws-sdk/client-sts": "^3.716.0",