@agilecustoms/envctl 0.27.1 → 0.27.3

package/dist/commands/createEphemeral.js

@@ -6,11 +6,11 @@ export function createEphemeral(program) {
     program
         .command('create-ephemeral')
         .description('Create bare env w/o resources. Used in CI as first step just to pre-generate token for extension')
-        .option('--cwd <cwd>', _keys.CWD)
+        .requiredOption('--key <key>', _keys.KEY)
         .action(wrap(handler));
 }
 async function handler(options) {
-    const { cwd } = options;
-    const token = await envCtl.createEphemeral(cwd);
+    const { key } = options;
+    const token = await envCtl.createEphemeral(key);
     console.log(token);
 }

package/dist/service/EnvCtl.js

@@ -45,9 +45,10 @@ export class EnvCtl {
         }
         return env;
     }
-    checkInput(env, owner, cwd) {
+    checkInput(env, cwd) {
         if (env.ephemeral)
             return;
+        const owner = this.configService.getOwner();
         if (env.owner !== owner) {
             throw new KnownException(`Can not change env owner ${env.owner} -> ${owner}`);
         }
@@ -71,25 +72,20 @@ export class EnvCtl {
         const key = this.terraformAdapter.getKey(cwd);
         const owner = this.configService.getOwner();
         const env = await this.tryGetEnv(key);
-        if (env == null) {
-            const vars = undefined;
-            await this.runPlan(key, owner, tfArgs, vars, cwd);
-            return;
-        }
-        this.checkInput(env, owner, cwd);
-        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`);
+        let vars = undefined;
+        if (env) {
+            this.checkInput(env, cwd);
+            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`);
+            }
+            vars = env.vars;
         }
-        await this.runPlan(key, owner, tfArgs, env.vars, cwd);
-    }
-    async runPlan(key, owner, args, vars, cwd) {
-        const envTerraform = { key, ephemeral: false, owner, args, vars };
+        const envTerraform = { key, ephemeral: false, owner, args: tfArgs, vars };
         await this.terraformAdapter.plan(envTerraform, cwd);
     }
-    async createEphemeral(cwd) {
-        const key = this.terraformAdapter.getKey(cwd);
+    async createEphemeral(key) {
         const env = await this.envApi.get(key);
         if (env !== null) {
             throw new KnownException(`Env ${key} already exists`);
@@ -99,31 +95,32 @@ export class EnvCtl {
     }
     async deploy(tfArgs, cwd) {
         const key = this.terraformAdapter.getKey(cwd);
-        const owner = this.configService.getOwner();
-        const env = await this.tryGetEnv(key);
+        let env = await this.tryGetEnv(key);
         if (env === null) {
             const kind = this.cliHelper.getKind(cwd);
             console.log('Creating env metadata');
+            const owner = this.configService.getOwner();
             const createEnv = { key, owner, kind };
-            const newEnv = await this.envApi.create(createEnv);
-            return await this.runDeploy(newEnv, key, tfArgs, cwd);
+            env = await this.envApi.create(createEnv);
         }
-        this.checkInput(env, owner, cwd);
-        this.checkStatus(env);
-        if (env.status === EnvStatus.Init) {
-            await this.envApi.lockForUpdate(env);
-        }
-        else if (env.status == EnvStatus.Updating) {
-            const answerYes = await this.cliHelper.promptYesNo(`Env status is ${env.status},
+        else {
+            this.checkInput(env, cwd);
+            this.checkStatus(env);
+            if (env.status === EnvStatus.Init) {
+                await this.envApi.lockForUpdate(env);
+            }
+            else 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\nDo you want to proceed with deployment?`);
-            if (!answerYes) {
-                console.log('Aborting deployment');
-                return;
+                if (!answerYes) {
+                    console.log('Aborting deployment');
+                    return;
+                }
+            }
+            if (env.status === EnvStatus.Active) {
+                console.log('Env status is ACTIVE\nWill lock for update and run terraform apply (to update resources)');
+                await this.envApi.lockForUpdate(env);
             }
-        }
-        if (env.status === EnvStatus.Active) {
-            console.log('Env status is ACTIVE\nWill lock for update and run terraform apply (to update resources)');
-            await this.envApi.lockForUpdate(env);
         }
         await this.runDeploy(env, key, tfArgs, cwd);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "0.27.1",
+  "version": "0.27.3",
   "author": "Alex Chekulaev",
   "type": "module",
   "bin": {
@@ -36,8 +36,8 @@
     "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 --key test",
     "run-ephemeral-init": "cd ../tt-gitops && terraform init -upgrade -backend-config=key=test -reconfigure",
-    "run-ephemeral-create": " tsc --sourceMap true && npm run run -- create-ephemeral --cwd ../tt-gitops",
     "run-ephemeral-status": " tsc --sourceMap true && npm run run -- status --key test",
     "run-ephemeral-deploy": " tsc --sourceMap true && npm run run -- deploy  --cwd ../tt-gitops -var-file=versions.tfvars",
     "run-ephemeral-delete": " tsc --sourceMap true && npm run run -- delete  --cwd ../tt-gitops --force",