@agilecustoms/envctl 1.17.0 → 1.18.1

package/dist/client/Cli.js

@@ -110,7 +110,7 @@ export class Cli {
             });
         });
     }
-    getKind() {
+    getDir() {
         return path.basename(process.cwd());
     }
     async writeInTmpFile(stream, fileName) {

package/dist/commands/_keys.js

@@ -1,6 +1,5 @@
 export const _keys = {
     FORCE: 'Force deletion without confirmation',
     KEY: 'Environment name/identifier - taken from remote stake key, must be unique for a given customer',
-    KIND: 'Environment kind',
     PROFILE: 'Profile to use'
 };

package/dist/commands/plan.js

@@ -5,7 +5,7 @@ import { wrap } from './_utils.js';
 export function plan(program, configService, envService) {
     program
         .command('plan')
-        .description('High level wrapper for terraform plan. Compliments deploy command: if you plan to deploy env with envctl deploy,'
+        .description('High level wrapper for terraform plan. Compliments apply command: if you plan to deploy env with envctl apply,'
         + ' then it is recommended to do plan with envctl plan to guarantee consistent behavior')
         .option('--profile <profile>', _keys.PROFILE)
         .allowUnknownOption(true)

package/dist/service/ConfigService.js

@@ -2,18 +2,18 @@ import * as fs from 'node:fs';
 import * as os from 'node:os';
 import path from 'path';
 import { KnownException } from '../exceptions.js';
-const CONFIG_DIR = path.join(os.homedir(), '.envctl');
 export const DEFAULT_HOST = 'cli.maintenance.agilecustoms.com';
-var EnvKey;
+export var EnvKey;
 (function (EnvKey) {
     EnvKey["API_KEY"] = "ENVCTL_API_KEY";
+    EnvKey["HOME"] = "ENVCTL_HOME";
     EnvKey["PROFILE"] = "ENVCTL_PROFILE";
 })(EnvKey || (EnvKey = {}));
 function env(key) {
     return process.env[key];
 }
-function isCI() {
-    return !!process.env['CI'];
+function configDir() {
+    return env(EnvKey.HOME) || path.join(os.homedir(), '.envctl');
 }
 export class ConfigService {
     config;
@@ -24,7 +24,7 @@ export class ConfigService {
             throw new Error('load config second time?');
         const customProfile = profile || env(EnvKey.PROFILE);
         profile = customProfile || 'default';
-        const configPath = path.join(CONFIG_DIR, `${profile}.json`);
+        const configPath = path.join(configDir(), `${profile}.json`);
         if (fs.existsSync(configPath)) {
             const data = fs.readFileSync(configPath, 'utf-8');
             this.config = JSON.parse(data);
@@ -37,15 +37,15 @@ export class ConfigService {
     saveConfig(profile, config) {
         const mergedConfig = { ...this.loadConfig(profile, false), ...config };
         const data = JSON.stringify(mergedConfig, null, 2);
-        fs.mkdirSync(CONFIG_DIR, { recursive: true });
-        const configPath = path.join(CONFIG_DIR, `${profile}.json`);
+        fs.mkdirSync(configDir(), { recursive: true });
+        const configPath = path.join(configDir(), `${profile}.json`);
         fs.writeFileSync(configPath, data);
     }
-    init(profile) {
+    init(profile = undefined) {
         this.loadConfig(profile);
         const apiKey = this.getApiKey();
         if (!apiKey) {
-            if (isCI()) {
+            if (!!process.env['CI']) {
                 throw new KnownException('API key is missing, set env variable ' + EnvKey.API_KEY);
             }
             throw new KnownException('API key is missing, call \'envctl configure\' or set env variable ' + EnvKey.API_KEY);

package/dist/service/EnvService.js

@@ -27,10 +27,10 @@ export class EnvService extends BaseService {
         if (env.status !== EnvStatus.Deleting && env.status !== EnvStatus.DeleteError) {
             logger.info(`Expires at ${toLocalTime(env.ttl)}`);
         }
-        if (env.kind) {
-            const kind = this.cli.getKind();
-            if (env.kind !== kind) {
-                logger.warn(`Env ${key} kind (dir-name): ${env.kind} - looks like this env was deployed from a different directory`);
+        if (env.dir) {
+            const dir = this.cli.getDir();
+            if (env.dir !== dir) {
+                logger.warn(`Env ${key} was deployed from ${env.dir}`);
             }
         }
     }
@@ -45,13 +45,13 @@ export class EnvService extends BaseService {
         }
         return env;
     }
-    checkKind(env) {
+    checkDir(env) {
         if (env.ephemeral)
             return;
-        if (env.kind) {
-            const kind = this.cli.getKind();
-            if (kind !== env.kind) {
-                throw new KnownException(`Env ${env.key} kind (dir-name): ${env.kind} - make sure you run this command from the same directory`);
+        if (env.dir) {
+            const dir = this.cli.getDir();
+            if (dir !== env.dir) {
+                throw new KnownException(`Env ${env.key} was deployed from ${env.dir} - make sure you run this command from the same directory`);
             }
         }
     }
@@ -59,7 +59,7 @@ export class EnvService extends BaseService {
         const key = this.terraformAdapter.getTerraformBackend().getKey();
         const env = await this.tryGetEnv(key);
         if (env) {
-            this.checkKind(env);
+            this.checkDir(env);
             this.handleDeleteStatuses(env);
         }
         const newEnv = env === null;
@@ -116,9 +116,8 @@ export class EnvService extends BaseService {
         const key = this.terraformAdapter.getTerraformBackend().getKey();
         let env = await this.tryGetEnv(key);
         if (env === null) {
-            const kind = this.cli.getKind();
-            logger.info(`Inferred kind from directory name: ${kind}`);
-            const createEnv = { key, kind };
+            const dir = this.cli.getDir();
+            const createEnv = { key, dir };
             await this.lockTerraform(createEnv, true);
             tfArgs = await this.ensurePlan({ key, ephemeral: false }, tfArgs);
             logger.info('Creating env metadata');
@@ -126,7 +125,7 @@ export class EnvService extends BaseService {
             await this.runApply(env, tfArgs);
             return;
         }
-        this.checkKind(env);
+        this.checkDir(env);
         this.handleDeleteStatuses(env);
         const status = env.status;
         if (status === EnvStatus.Deploying || status === EnvStatus.Updating) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilecustoms/envctl",
-  "version": "1.17.0",
+  "version": "1.18.1",
   "description": "node.js CLI client for manage environments",
   "keywords": [
     "terraform wrapper",