@agilecustoms/envctl 1.25.2 → 1.27.0

package/dist/client/EnvApiClient.js

@@ -1,4 +1,4 @@
-import { BusinessException, KnownException, NotFoundException } from '../exceptions.js';
+import { KnownException, NotFoundException, UnauthorizedException } from '../exceptions.js';
 import { logger } from '../logger.js';
 import { EnvStatus } from '../model/index.js';
 import { format, toDate } from '../util.js';
@@ -14,7 +14,7 @@ export class EnvApiClient {
     async get(key) {
         logger.info(`Retrieve environment ${key}`);
         try {
-            return await this.httpClient.fetch(`/ci/env/${key}`);
+            return await this.httpClient.fetch(`/env/${key}`);
         }
         catch (error) {
             if (error instanceof NotFoundException) {
@@ -29,37 +29,20 @@ export class EnvApiClient {
             result = await this.httpClient.post('/ci/env-ephemeral', env);
         }
         catch (error) {
-            if (error instanceof BusinessException) {
-                throw new KnownException(`Failed to create ephemeral environment: ${error.message}`);
+            if (error instanceof UnauthorizedException) {
+                throw new KnownException(`Developers are no authorized to create ephemeral environment\nPlease create dedicated CI user (with its own API key) per each pipeline`);
             }
             throw error;
         }
         return this.httpClient.getUrl(`/public/env/${env.key}/extend?token=${result.token}`);
     }
     async create(env) {
-        let result;
-        try {
-            result = await this.httpClient.post('/ci/env', env);
-        }
-        catch (error) {
-            if (error instanceof BusinessException) {
-                throw new KnownException(`Failed to create environment: ${error.message}`);
-            }
-            throw error;
-        }
+        const result = await this.httpClient.post('/env', env);
         logger.debug(`Environment ${env.key} created, will expire at ${format(toDate(result.ttl))}`);
         return { ...env, ephemeral: false, status: EnvStatus.Deploying, ttl: result.ttl };
     }
     async activate(env) {
-        try {
-            await this.httpClient.post(`/ci/env/${env.key}/activate`);
-        }
-        catch (error) {
-            if (error instanceof BusinessException) {
-                throw new KnownException(`Failed to activate environment ${env.key}: ${error.message}`);
-            }
-            throw error;
-        }
+        await this.httpClient.post(`/env/${env.key}/activate`);
         env.status = EnvStatus.Active;
     }
     async lockForUpdate(env) {
@@ -68,23 +51,14 @@ export class EnvApiClient {
             stateFile: env.stateFile,
             lockFile: env.lockFile
         };
-        let result;
-        try {
-            result = await this.httpClient.post(`/ci/env/${env.key}/lock-for-update`, body);
-        }
-        catch (error) {
-            if (error instanceof BusinessException) {
-                throw new KnownException(`Failed to lock environment ${env.key} for update: ${error.message}`);
-            }
-            throw error;
-        }
+        const result = await this.httpClient.post(`/env/${env.key}/lock-for-update`, body);
         env.status = result.status;
     }
     async delete(key, force = false) {
         logger.info('Sending delete command');
         let result;
         try {
-            result = await this.httpClient.fetch(`/ci/env/${key}?force=${force}`, {
+            result = await this.httpClient.fetch(`/env/${key}?force=${force}`, {
                 method: 'DELETE'
             });
         }
@@ -99,7 +73,7 @@ export class EnvApiClient {
     async getLogs(key) {
         let result;
         try {
-            result = await this.httpClient.fetch(`/ci/env/${key}/logs`);
+            result = await this.httpClient.fetch(`/env/${key}/logs`);
         }
         catch (error) {
             if (error instanceof NotFoundException) {

package/dist/client/HttpClient.js

@@ -1,4 +1,4 @@
-import { BusinessException, HttpException, KnownException, NotFoundException } from '../exceptions.js';
+import { HttpException, KnownException, NotFoundException, UnauthorizedException } from '../exceptions.js';
 import { logger } from '../logger.js';
 import { DEFAULT_HOST } from '../service/ConfigService.js';
 import { ConfigService } from '../service/index.js';
@@ -63,6 +63,7 @@ export class HttpClient {
             }
             throw new Error('Error (network?) making the request:', { cause: error });
         }
+        logger.debug(`response status: ${response.status}, text: ${response.statusText}`);
         const contentType = response.headers?.get('Content-Type') || '';
         let body = await response.text();
         if (contentType.includes('application/json')) {
@@ -79,11 +80,17 @@ export class HttpClient {
         if (response.ok) {
             return body;
         }
+        if (response.status === 401) {
+            throw new KnownException('API key is not recognized');
+        }
+        if (response.status === 403) {
+            throw new UnauthorizedException(JSON.stringify(body));
+        }
         if (response.status === 404) {
             throw new NotFoundException(body);
         }
         if (response.status === 422) {
-            throw new BusinessException(body.message);
+            throw new KnownException(body.message);
         }
         if (response.status === 426) {
             throw new KnownException(body.message);

package/dist/exceptions.js

@@ -16,10 +16,10 @@ export class HttpException extends Error {
         this.name = 'HttpException';
     }
 }
-export class BusinessException extends HttpException {
+export class UnauthorizedException extends HttpException {
     constructor(message) {
         super(message);
-        this.name = 'BusinessException';
+        this.name = 'UnauthorizedException';
     }
 }
 export class NotFoundException extends HttpException {

package/dist/service/EnvService.js

@@ -34,7 +34,7 @@ export class EnvService extends BaseService {
     }
     async init(tfArgs) {
         await this.terraformAdapter.init(tfArgs);
-        await this.terraformAdapter.lockProviders();
+        await this.terraformAdapter.lockProviders(tfArgs);
     }
     async plan(tfArgs) {
         this.terraformAdapter.validateAndGetStateFile();

package/dist/service/TerraformAdapter.js

@@ -136,11 +136,30 @@ export class TerraformAdapter {
         const config = this.localStateService.load();
         this.localStateService.save(config);
     }
-    async lockProviders() {
+    getVars(args) {
+        const result = [];
+        for (let i = 0; i < args.length; i++) {
+            const arg = args[i];
+            if (arg.startsWith('-var=') || arg.startsWith('-var-file=')) {
+                result.push(arg);
+                continue;
+            }
+            if (arg === '-var' || arg === '-var-file') {
+                result.push(arg);
+                if (i + 1 < args.length && !args[i + 1].startsWith('-')) {
+                    result.push(args[i + 1]);
+                    i++;
+                }
+            }
+        }
+        return result;
+    }
+    async lockProviders(args) {
         const linuxArm64 = process.platform === 'linux' && process.arch === 'arm64';
         if (!linuxArm64) {
             logger.info('Lock providers');
-            await this.cli.run('terraform', ['providers', 'lock', '-platform=linux_arm64']);
+            const vars = this.getVars(args);
+            await this.cli.run('terraform', ['providers', 'lock', '-platform=linux_arm64', ...vars]);
         }
         const fileContent = this.getLockFile();
         const config = this.localStateService.load();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilecustoms/envctl",
-  "version": "1.25.2",
+  "version": "1.27.0",
   "description": "node.js CLI client for manage environments",
   "keywords": [
     "terraform wrapper",
@@ -74,7 +74,7 @@
     "-e1-": "",
     "e1-desc": "ephemeral env in CI (must have ENVCTL_API_KEY_ in env vars)",
     "e1": "CWD=../tt-core CI=true ENVCTL_HOME=non-existing ENVCTL_API_KEY=\"$ENVCTL_API_KEY_\" npm run it --",
-    "e1-create": "npm run e1 -- create-ephemeral e1",
+    "e1-create": "npm run e1 -- create-ephemeral e1 --verbose",
     "e1-init": "  npm run e1 -- init -reconfigure -upgrade -backend-config=key=e1",
     "e1-plan": "  npm run e1 -- plan -var=env_size=min -var=env=e1 -out=plan",
     "e1-apply": " npm run e1 -- apply plan",
@@ -82,7 +82,7 @@
     "-tt-": "",
     "tt-desc": "deploy TT project from local machine",
     "tt": "CWD=../tt-gitops AWS_PROFILE=ac-tt-dev-deployer npm run it --",
-    "run-init": "   npm run tt -- init -reconfigure -upgrade -backend-config=key=laxa1986",
+    "run-init": "   npm run tt -- init -reconfigure -upgrade -backend-config=key=laxa1986 -var-file=versions.tfvars",
     "run-status": " npm run tt -- status",
     "run-apply": "  npm run tt -- apply --auto-approve -var=env_size=min -var-file=versions.tfvars",
     "run-delete": " npm run tt -- delete"