@agilecustoms/envctl 1.11.4 → 1.13.0

package/dist/client/HttpClient.js

@@ -1,5 +1,6 @@
 import { BusinessException, HttpException, NotFoundException } from '../exceptions.js';
 import { logger } from '../logger.js';
+import { ConfigService } from '../service/index.js';
 const HOST = 'cli.maintenance.agilecustoms.com';
 export function toUrl(path) {
     return `https://${HOST}/env-api${path}`;
@@ -7,9 +8,11 @@ export function toUrl(path) {
 export class HttpClient {
     version;
     commandId;
-    constructor(version, commandId) {
+    configService;
+    constructor(version, commandId, configService) {
         this.version = version;
         this.commandId = commandId;
+        this.configService = configService;
     }
     async post(path, body, options = {}) {
         options.method = 'POST';
@@ -28,13 +31,14 @@ export class HttpClient {
         const headers = new Headers(options.headers);
         headers.set('x-command-id', this.commandId);
         headers.set('x-client-version', this.version);
-        const req = {
-            ...options,
-            method: options.method ?? 'GET',
-            headers,
-        };
-        const reqJson = JSON.stringify({ ...req, headers: Object.fromEntries(headers.entries()) });
-        logger.debug(`--> ${req.method} ${url} ${reqJson}`);
+        const apiKey = this.configService.getApiKey();
+        if (apiKey) {
+            headers.set('Authorization', apiKey);
+        }
+        options.method = options.method || 'GET';
+        options.headers = headers;
+        const reqJson = JSON.stringify({ ...options, headers: Object.fromEntries(headers.entries()) });
+        logger.debug(`--> ${options.method} ${url} ${reqJson}`);
         let response;
         try {
             response = await fetch(url, options);

package/dist/commands/configure.js

@@ -10,12 +10,12 @@ export function configure(program, configService) {
         const answers = await inquirer.prompt([
             {
                 type: 'input',
-                name: 'userName',
-                message: 'userName is required to deploy any env\n'
+                name: 'apiKey',
+                message: 'apiKey is required to deploy any env\n'
                     + '(prefer GitHub username)\n'
-                    + 'userName:',
+                    + 'apiKey:',
             },
         ]);
-        configService.saveConfig({ userName: answers.userName });
+        configService.saveConfig({ apiKey: answers.apiKey });
     }));
 }

package/dist/commands/createEphemeral.js

@@ -1,13 +1,14 @@
 import { Command } from 'commander';
-import { EnvService } from '../service/index.js';
+import { ConfigService, EnvService } from '../service/index.js';
 import { _keys } from './_keys.js';
 import { wrap } from './_utils.js';
-export function createEphemeral(program, envService) {
+export function createEphemeral(program, configService, envService) {
     program
         .command('create-ephemeral')
         .description('Create bare env w/o resources. Used in CI as first step just to pre-generate token for extension')
         .requiredOption('--key <key>', _keys.KEY)
         .action(wrap(async (options) => {
+        configService.checkApiKey();
         const { key } = options;
         const token = await envService.createEphemeral(key);
         console.log(token);

package/dist/commands/delete.js

@@ -1,14 +1,15 @@
 import { Command } from 'commander';
-import { EnvService } from '../service/index.js';
+import { ConfigService, EnvService } from '../service/index.js';
 import { _keys } from './_keys.js';
 import { wrap } from './_utils.js';
-export function deleteIt(program, envService) {
+export function deleteIt(program, configService, envService) {
     program
         .command('delete')
         .description('Delete a development environment')
         .option('--key <key>', _keys.KEY)
         .option('--force', _keys.FORCE)
         .action(wrap(async (options) => {
+        configService.checkApiKey();
         const { key, force } = options;
         await envService.delete(Boolean(force), key);
     }));

package/dist/commands/deploy.js

@@ -1,13 +1,14 @@
 import { Command } from 'commander';
-import { EnvService } from '../service/index.js';
+import { ConfigService, EnvService } from '../service/index.js';
 import { wrap } from './_utils.js';
-export function deploy(program, envService) {
+export function deploy(program, configService, envService) {
     program
         .command('deploy')
         .description('Create new or update existing environment')
         .allowUnknownOption(true)
         .argument('[args...]')
         .action(wrap(async (tfArgs) => {
+        configService.checkApiKey();
         await envService.deploy(tfArgs);
     }));
 }

package/dist/commands/destroy.js

@@ -1,8 +1,8 @@
 import { Command } from 'commander';
-import { EnvService } from '../service/index.js';
+import { ConfigService, EnvService } from '../service/index.js';
 import { _keys } from './_keys.js';
 import { wrap } from './_utils.js';
-export function destroy(program, envService) {
+export function destroy(program, configService, envService) {
     program
         .command('destroy')
         .description('Destroy environment resources. This is thin wrapper for terraform destroy.'
@@ -13,6 +13,7 @@ export function destroy(program, envService) {
         .allowUnknownOption(true)
         .argument('[args...]')
         .action(wrap(async (tfArgs, options) => {
+        configService.checkApiKey();
         const { force } = options;
         await envService.destroy(tfArgs, Boolean(force));
     }));

package/dist/commands/logs.js

@@ -1,12 +1,14 @@
 import { Command } from 'commander';
+import { ConfigService } from '../service/index.js';
 import { _keys } from './_keys.js';
 import { wrap } from './_utils.js';
-export function logs(program, logService) {
+export function logs(program, configService, logService) {
     program
         .command('logs')
         .description('Get most recent env destroy logs')
         .option('--key <key>', _keys.KEY)
         .action(wrap(async (options) => {
+        configService.checkApiKey();
         const { key } = options;
         await logService.getLogs(key);
     }));

package/dist/commands/status.js

@@ -1,13 +1,14 @@
 import { Command } from 'commander';
-import { EnvService } from '../service/index.js';
+import { ConfigService, EnvService } from '../service/index.js';
 import { _keys } from './_keys.js';
 import { wrap } from './_utils.js';
-export function status(program, envService) {
+export function status(program, configService, envService) {
     program
         .command('status')
         .description('Get env status')
         .option('--key <key>', _keys.KEY)
         .action(wrap(async (options) => {
+        configService.checkApiKey();
         const { key } = options;
         await envService.status(key);
     }));

package/dist/container.js

@@ -10,7 +10,7 @@ export function buildContainer(appVersion) {
     const configService = new ConfigService();
     const backends = [new S3Backend()];
     const commandId = randomUUID();
-    const httpClient = new HttpClient(appVersion, commandId);
+    const httpClient = new HttpClient(appVersion, commandId, configService);
     const envApiClient = new EnvApiClient(httpClient);
     const localStateService = new LocalStateService();
     const nonInteractive = !process.stdout.isTTY || process.env.CI === 'true';

package/dist/index.js

@@ -18,11 +18,11 @@ program
     .version(pkg.version)
     .option('--verbose', 'Verbose output (w/ debug logs)');
 configure(program, configService);
-createEphemeral(program, envService);
-deleteIt(program, envService);
-deploy(program, envService);
-destroy(program, envService);
-logs(program, logService);
+createEphemeral(program, configService, envService);
+deleteIt(program, configService, envService);
+deploy(program, configService, envService);
+destroy(program, configService, envService);
+logs(program, configService, logService);
 plan(program, envService);
-status(program, envService);
+status(program, configService, envService);
 program.parse(process.argv);

package/dist/service/ConfigService.js

@@ -1,7 +1,19 @@
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import path from 'path';
-const CONFIG_PATH = path.join(os.homedir(), '.envctl', 'config.json');
+import { KnownException } from '../exceptions.js';
+const CONFIG_PATH = path.join(os.homedir(), '.envctl', 'default.json');
+var EnvKey;
+(function (EnvKey) {
+    EnvKey["ENV_API_KEY"] = "ENVCTL_API_KEY";
+    EnvKey["ENV_MAP_KEY_TO"] = "ENVCTL_MAP_KEY_TO";
+})(EnvKey || (EnvKey = {}));
+function env(key) {
+    return process.env[key];
+}
+function isCI() {
+    return !!process.env['CI'];
+}
 export class ConfigService {
     config;
     constructor() {
@@ -15,18 +27,27 @@ export class ConfigService {
     loadConfig() {
         if (this.config)
             return this.config;
-        this.config = {};
         if (fs.existsSync(CONFIG_PATH)) {
             const data = fs.readFileSync(CONFIG_PATH, 'utf-8');
             this.config = JSON.parse(data);
+            return this.config;
         }
-        return this.config;
+        return null;
     }
     getApiKey() {
-        const apiKey = this.loadConfig()?.apiKey;
+        let apiKey = env(EnvKey.ENV_API_KEY);
         if (!apiKey) {
-            return 'api-key';
+            apiKey = this.loadConfig()?.apiKey;
         }
         return apiKey;
     }
+    checkApiKey() {
+        const apiKey = this.getApiKey();
+        if (!apiKey) {
+            if (isCI()) {
+                throw new KnownException('API key is missing, set env variable ' + EnvKey.ENV_API_KEY);
+            }
+            throw new KnownException('API key is missing, call \'envctl configure\' or set env variable ' + EnvKey.ENV_API_KEY);
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilecustoms/envctl",
-  "version": "1.11.4",
+  "version": "1.13.0",
   "description": "node.js CLI client for manage environments",
   "keywords": [
     "terraform wrapper",
@@ -77,7 +77,7 @@
     "eslint": "^9.22.0",
     "eslint-plugin-import": "^2.31.0",
     "husky": "^9.1.7",
-    "typescript": "^5.7.2",
+    "typescript": "^6.0.0",
     "typescript-eslint": "^8.8.1",
     "vitest": "^4.0.0"
   }