@agilecustoms/envctl 0.16.1 → 0.18.0

package/dist/client/AwsCredsHelper.js

@@ -4,11 +4,13 @@ import { KnownException } from '../exceptions.js';
 export class AwsCredsHelper {
     creds;
     async ensureCredentials() {
-        await this.getCredentials();
+        await this.getCredentials(true);
     }
-    async getCredentials() {
+    async getCredentials(printLogs = false) {
         if (!this.creds) {
-            console.log('Fetching AWS credentials...');
+            if (printLogs) {
+                console.log('Fetching AWS credentials...');
+            }
             this.creds = await this._getCredentials();
         }
         return this.creds;

package/dist/commands/apiCreateEphemeral.js

@@ -0,0 +1,20 @@
+import { Command } from 'commander';
+import { envCtl } from '../container.js';
+import { _keys } from './_keys.js';
+import { wrap } from './_utils.js';
+export function apiCreateEphemeral(program) {
+    program
+        .command('api-create-ephemeral')
+        .description('Create bare env w/o resources. Used in CI as first step just to pre-generate token for extension')
+        .option('--project <project>', _keys.PROJECT)
+        .requiredOption('--env <env>', _keys.ENV)
+        .requiredOption('--owner <owner>', _keys.OWNER)
+        .requiredOption('--size <size>', _keys.SIZE)
+        .requiredOption('--type <type>', _keys.TYPE)
+        .action(wrap(handler));
+}
+async function handler(options) {
+    const { project, env, owner, size, type } = options;
+    const token = await envCtl.createEphemeral(project, env, owner, size, type);
+    console.log(token);
+}

package/dist/commands/index.js

@@ -1,6 +1,8 @@
+export { apiCreateEphemeral } from './apiCreateEphemeral.js';
 export { configure } from './configure.js';
 export { deleteIt } from './delete.js';
 export { deploy } from './deploy.js';
 export { destroy } from './destroy.js';
+export { init } from './init.js';
 export { plan } from './plan.js';
 export { status } from './status.js';

package/dist/commands/init.js

@@ -0,0 +1,18 @@
+import { Command } from 'commander';
+import { cliHelper, envCtl } from '../container.js';
+import { _keys } from './_keys.js';
+import { wrap } from './_utils.js';
+export function init(program) {
+    program
+        .command('init')
+        .description('Terraform init wrapper')
+        .option('--project <project>', _keys.PROJECT)
+        .option('--env <env>', _keys.ENV)
+        .option('--cwd <cwd>', _keys.CWD)
+        .action(wrap(handler));
+}
+async function handler(options) {
+    const { project, env, cwd } = options;
+    const envName = cliHelper.ensureEnv(env);
+    await envCtl.init(project, envName, cwd);
+}

package/dist/index.js

@@ -2,7 +2,7 @@
 import { createRequire } from 'module';
 import { Command } from 'commander';
 import updateNotifier from 'update-notifier';
-import { configure, deleteIt, deploy, destroy, plan, status } from './commands/index.js';
+import { apiCreateEphemeral, configure, deleteIt, deploy, destroy, init, plan, status } from './commands/index.js';
 const require = createRequire(import.meta.url);
 const pkg = require('../package.json');
 updateNotifier({ pkg, updateCheckInterval: 0 }).notify();
@@ -11,10 +11,12 @@ program
     .name('envctl')
     .description('CLI to manage environments')
     .version(pkg.version);
+apiCreateEphemeral(program);
 configure(program);
 deleteIt(program);
 deploy(program);
 destroy(program);
+init(program);
 plan(program);
 status(program);
 program.parse(process.argv);

package/dist/service/EnvCtl.js

@@ -1,4 +1,5 @@
 import { KnownException, TerraformInitRequired } from '../exceptions.js';
+import { EnvType, EnvSize } from '../model/index.js';
 import { EnvSizeAvgTime, EnvStatus } from '../model/index.js';
 export class EnvCtl {
     cliHelper;
@@ -78,6 +79,10 @@ export class EnvCtl {
         }
         throw new KnownException(`Env status is ${env.status}, can not run this command`);
     }
+    async init(project, envName, cwd) {
+        const key = this.key(project, envName);
+        await this.terraformAdapter.init(key, cwd);
+    }
     async plan(input, tfArgs, cwd) {
         const { envName, owner, key, env } = await this.tryGetEnv(input);
         if (env == null) {
@@ -94,6 +99,16 @@ export class EnvCtl {
         }
         await this.terraformAdapter.plan(envInput, tfArgs, cwd);
     }
+    async createEphemeral(project, envName, owner, size, type) {
+        const key = this.key(project, envName);
+        const env = await this.envApi.get(key);
+        if (env !== null) {
+            throw new KnownException(`Env ${key} already exists`);
+        }
+        const createEnv = { key, ephemeral: true, owner, size, type };
+        const newEnv = await this.envApi.create(createEnv);
+        return newEnv.token;
+    }
     async deploy(input, tfArgs, cwd) {
         const { envName, owner, key, env } = await this.tryGetEnv(input);
         if (env === null) {
@@ -138,10 +153,6 @@ export class EnvCtl {
         }
         console.log('Activating env (to finish creation)');
         await this.envApi.activate(env);
-        console.log('Lock env to run db evolution');
-        await this.envApi.lockForUpdate(env);
-        console.log('Unlock env after db evolution');
-        await this.envApi.activate(env);
     }
     async delete(project, envName, cwd) {
         const env = await this.get(project, envName);
@@ -158,7 +169,7 @@ export class EnvCtl {
         }
         await this.promptUnlock(env);
         if (env.status !== EnvStatus.Active) {
-            throw new KnownException(`Env ${env.key} status is ${env.status}, can not delete`);
+            return;
         }
         console.log('Deleting env');
         const statusMessage = await this.envApi.delete(env);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "0.16.1",
+  "version": "0.18.0",
   "author": "Alex Chekulaev",
   "type": "module",
   "bin": {
@@ -28,10 +28,12 @@
     "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-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"
   },
   "dependencies": {
     "@aws-sdk/client-sts": "^3.716.0",