@agilecustoms/envctl 0.8.0 → 0.9.0

package/dist/commands/delete.js

@@ -5,10 +5,11 @@ export function deleteIt(program) {
     program
         .command('delete')
         .description('Delete a development environment')
-        .requiredOption('--project <project>', 'Project name: can be project code (like tt when deploy whole project), or {code}-{microservice} if you want to deploy a single microservice')
         .requiredOption('--env <env>', 'Environment name (can be git hash). {project}-{env} give env key used to store env state (s3 key in case of AWS)')
+        .option('--project <project>', 'Project code (like tt). Used when multiple projects deployed in same AWS account')
         .action(wrap(handler));
 }
 async function handler(options) {
-    await envCtl.delete(options.project, options.env);
+    let { env, project } = options;
+    await envCtl.delete(env, project);
 }

package/dist/commands/deploy.js

@@ -1,12 +1,12 @@
 import { Command } from 'commander';
 import { envCtl } from '../container.js';
-import { wrap } from './utils.js';
+import { ensureKind, wrap } from './utils.js';
 export function deploy(program) {
     program
         .command('deploy')
         .description('Create new or update existing dev environment')
-        .requiredOption('--project <project>', 'Project name: can be project code (like tt when deploy whole project), or {code}-{microservice} if you want to deploy a single microservice')
-        .requiredOption('--env <env>', 'Environment name (can be git hash). {project}-{env} give env key used to store env state (s3 key in case of AWS)')
+        .option('--project <project>', 'Project code (like tt). Used when multiple projects deployed in same AWS account')
+        .option('--env <env>', 'Environment name (can be git hash). {project}-{env} give env key used to store env state (s3 key in case of AWS)')
         .requiredOption('--owner <owner>', 'Environment owner (GH username)')
         .requiredOption('--size <size>', 'Environment size: min, small, full')
         .option('--type <type>', 'Environment type: dev, prod', 'dev')
@@ -17,7 +17,12 @@ export function deploy(program) {
         .action(wrap(handler));
 }
 async function handler(tfArgs, options) {
-    const { project, env, owner, size, type, kind } = options;
+    let { project, env, owner, size, type, kind, cwd } = options;
+    if (!env) {
+        console.log(`Env name not provided, default to owner name ${owner}`);
+        env = owner;
+    }
+    kind = ensureKind(kind, cwd);
     const envAttributes = { project, env, owner, size, type, kind };
     await envCtl.deploy(envAttributes, tfArgs, options.cwd);
 }

package/dist/commands/utils.js

@@ -1,3 +1,4 @@
+import path from 'path';
 import { stdin as input, stdout as output } from 'process';
 import { createInterface } from 'readline/promises';
 import { BusinessException, ExitException, KnownException } from '../exceptions.js';
@@ -31,3 +32,24 @@ export async function promptYesNo(question) {
     const answer = await prompt(question);
     return answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes';
 }
+export function ensureKind(kind, cwd) {
+    if (kind) {
+        return kind;
+    }
+    kind = getDirName(cwd);
+    console.log(`Inferred kind from directory name: ${kind}`);
+    return kind;
+}
+function getDirName(cwd) {
+    cwd = resolveCwd(cwd);
+    return path.basename(cwd);
+}
+function resolveCwd(cwd) {
+    if (!cwd) {
+        return process.cwd();
+    }
+    if (path.isAbsolute(cwd)) {
+        return cwd;
+    }
+    return path.resolve(process.cwd(), cwd);
+}

package/dist/service/EnvCtl.js

@@ -8,7 +8,7 @@ export class EnvCtl {
         this.terraformAdapter = terraformAdapter;
     }
     async deploy(envDto, tfArgs, cwd) {
-        const key = `${envDto.project}-${envDto.env}`;
+        const key = envDto.project ? `${envDto.project}-${envDto.env}` : envDto.env;
         console.log(`Check if env ${key} already exists`);
         const env = await this.envApi.get(key);
         if (env === null) {
@@ -53,6 +53,10 @@ export class EnvCtl {
             await this.envApi.lockForUpdate(key);
             await this.runDeploy(key, envDto, tfArgs, cwd);
         }
+        else if (env.status === 'DELETING') {
+            const time = env.size === 'min' ? 2 : 5;
+            throw new KnownException(`Env status is DELETING, please wait (~${time} min)`);
+        }
     }
     async runDeploy(key, envAttrs, tfArgs, cwd) {
         console.log('Deploying resources');
@@ -64,8 +68,8 @@ export class EnvCtl {
         console.log('Unlock env after db evolution');
         await this.envApi.activate(key);
     }
-    async delete(project, envName) {
-        const key = `${project}-${envName}`;
+    async delete(envName, project) {
+        const key = project ? `${project}-${envName}` : envName;
         console.log(`Retrieve env`);
         const env = await this.envApi.get(key);
         if (env === null) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "author": "Alex Chekulaev",
   "type": "module",
   "bin": {
@@ -26,8 +26,8 @@
     "build": "tsc",
     "run": "node dist/index.js",
     "run-version": "tsc --sourceMap true && npm run run -- --version",
-    "run-deploy": "tsc --sourceMap true && AWS_PROFILE=ac-tt-dev-deployer npm run run -- deploy --project tt --env laxa1986 --owner laxa1986 --size min --kind tt-core --cwd ../tt-core",
-    "run-delete": "tsc --sourceMap true && AWS_PROFILE=ac-tt-dev-deployer npm run run -- delete --project tt --env laxa1986"
+    "run-deploy": "tsc --sourceMap true && npm run run -- deploy --owner laxa1986 --size min --cwd ../tt-core",
+    "run-delete": "tsc --sourceMap true && npm run run -- delete --env laxa1986"
   },
   "dependencies": {
     "@aws-sdk/client-sts": "^3.716.0",