@agilecustoms/envctl 0.7.0 → 0.8.0

package/dist/client/TerraformAdapter.js

@@ -42,7 +42,6 @@ export class TerraformAdapter {
     }
     async deploy(envAttrs, tfArgs, cwd, attemptNo = 1) {
         const args = [
-            `-var=project=${envAttrs.project}`,
             `-var=env=${envAttrs.env}`,
             `-var=owner=${envAttrs.owner}`,
             `-var=env_size=${envAttrs.size}`,

package/dist/commands/deploy.js

@@ -9,14 +9,15 @@ export function deploy(program) {
         .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)')
         .requiredOption('--owner <owner>', 'Environment owner (GH username)')
         .requiredOption('--size <size>', 'Environment size: min, small, full')
-        .requiredOption('--type <type>', 'Environment type: dev, prod')
+        .option('--type <type>', 'Environment type: dev, prod', 'dev')
+        .option('--kind <kind>', 'Environment kind: complete project (default) or some slice such as tt-core + tt-web')
         .option('--cwd <cwd>', 'Working directory (default: current directory)')
         .allowUnknownOption(true)
         .argument('[args...]')
         .action(wrap(handler));
 }
 async function handler(tfArgs, options) {
-    const { project, env, owner, size, type } = options;
-    const envAttributes = { project, env, owner, size, type };
+    const { project, env, owner, size, type, kind } = options;
+    const envAttributes = { project, env, owner, size, type, kind };
     await envCtl.deploy(envAttributes, tfArgs, options.cwd);
 }

package/dist/service/EnvCtl.js

@@ -16,8 +16,8 @@ export class EnvCtl {
             console.log('First run terraform init to download providers, this doesn\'t create any resources in AWS even S3 object');
             await this.terraformAdapter.init(key, cwd);
             console.log('Creating env tracking record in DynamoDB');
-            const { owner, size, type } = envDto;
-            const createEnv = { key, ephemeral: false, owner, size, type };
+            const { owner, size, type, kind } = envDto;
+            const createEnv = { key, ephemeral: false, owner, size, type, kind };
             await this.envApi.create(createEnv);
             return await this.runDeploy(key, envDto, tfArgs, cwd);
         }
@@ -33,6 +33,9 @@ export class EnvCtl {
         if (env.type !== envDto.type) {
             throw new KnownException(`Can not change env type ${env.type} -> ${envDto.type}`);
         }
+        if (env.kind !== envDto.kind) {
+            throw new KnownException(`Can not change env kind ${env.kind} -> ${envDto.kind}`);
+        }
         if (env.status === 'CREATING') {
             const answerYes = await promptYesNo('Env status is CREATING, likely to error in previous run\nDo you want to proceed with deployment? (y/n) ');
             if (answerYes) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "0.7.0",
+  "version": "0.8.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-core --env alexc --owner laxa1986 --size min --type dev --cwd ../tt-core",
-    "run-delete": "tsc --sourceMap true && AWS_PROFILE=ac-tt-dev-deployer npm run run -- delete --project tt-core --env alexc"
+    "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"
   },
   "dependencies": {
     "@aws-sdk/client-sts": "^3.716.0",