@agilecustoms/envctl 0.32.9 → 0.34.0

package/dist/container.js

@@ -13,5 +13,5 @@ const httpClient = new HttpClient(awsCredsHelper);
 const envApiClient = new EnvApiClient(httpClient);
 const processRunner = new ProcessRunner();
 const terraformAdapter = new TerraformAdapter(processRunner, cliHelper, backends);
-const envCtl = new EnvCtl(cliHelper, envApiClient, terraformAdapter, configService);
+const envCtl = new EnvCtl(cliHelper, envApiClient, terraformAdapter);
 export { awsCredsHelper, configService, envCtl };

package/dist/service/ConfigService.js

@@ -1,7 +1,6 @@
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import path from 'path';
-import { KnownException } from '../exceptions.js';
 const CONFIG_PATH = path.join(os.homedir(), '.envctl', 'config.json');
 export class ConfigService {
     config;
@@ -23,11 +22,11 @@ export class ConfigService {
         }
         return this.config;
     }
-    getUserName() {
-        const userName = this.loadConfig()?.userName;
-        if (!userName) {
-            throw new KnownException('please first set userName via calling \'envctl configure\'');
+    getApiKey() {
+        const apiKey = this.loadConfig()?.apiKey;
+        if (!apiKey) {
+            return 'api-key';
         }
-        return userName;
+        return apiKey;
     }
 }

package/dist/service/EnvCtl.js

@@ -4,12 +4,10 @@ export class EnvCtl {
     cliHelper;
     envApi;
     terraformAdapter;
-    configService;
-    constructor(cliHelper, envApi, terraformAdapter, configService) {
+    constructor(cliHelper, envApi, terraformAdapter) {
         this.cliHelper = cliHelper;
         this.envApi = envApi;
         this.terraformAdapter = terraformAdapter;
-        this.configService = configService;
     }
     getKey(key, cwd) {
         if (!key) {
@@ -59,10 +57,6 @@ export class EnvCtl {
     checkInput(env, cwd) {
         if (env.ephemeral)
             return;
-        const userName = this.configService.getUserName();
-        if (env.owner !== userName) {
-            throw new KnownException(`Can not change env owner ${env.owner} -> ${userName}`);
-        }
         if (env.kind) {
             const kind = this.cliHelper.getKind(cwd);
             if (kind !== env.kind) {
@@ -81,7 +75,6 @@ export class EnvCtl {
     }
     async plan(tfArgs, cwd) {
         const key = this.terraformAdapter.getTerraformBackend(cwd).getKey();
-        const userName = this.configService.getUserName();
         const env = await this.tryGetEnv(key);
         let vars = undefined;
         if (env) {
@@ -93,7 +86,7 @@ export class EnvCtl {
             }
             vars = env.vars;
         }
-        const envTerraform = { key, ephemeral: false, owner: userName, args: tfArgs, vars };
+        const envTerraform = { key, ephemeral: false, args: tfArgs, vars };
         await this.terraformAdapter.plan(envTerraform, cwd);
     }
     async createEphemeral(key) {
@@ -116,8 +109,7 @@ export class EnvCtl {
         if (env === null) {
             const kind = this.cliHelper.getKind(cwd);
             console.log(`Inferred kind from directory name: ${kind}`);
-            const userName = this.configService.getUserName();
-            const createEnv = { key, owner: userName, kind };
+            const createEnv = { key, kind };
             await this.lockTerraform(createEnv, cwd);
             console.log('Creating env metadata');
             env = await this.envApi.create(createEnv);
@@ -137,7 +129,7 @@ export class EnvCtl {
                     return;
                 }
             }
-            if (env.status === EnvStatus.Active) {
+            else if (env.status === EnvStatus.Active) {
                 console.log('Env status is ACTIVE\nWill lock for update and run terraform apply (to update resources)');
                 await this.envApi.lockForUpdate(env);
             }
@@ -147,7 +139,7 @@ export class EnvCtl {
     async runDeploy(env, key, tfArgs, cwd) {
         console.log('Deploying resources');
         const { ephemeral, vars } = env;
-        const envTerraform = { key, ephemeral, owner: env.owner || 'system', args: tfArgs, vars };
+        const envTerraform = { key, ephemeral, args: tfArgs, vars };
         const onDemandVars = {};
         try {
             await this.terraformAdapter.apply(envTerraform, onDemandVars, cwd);
@@ -214,8 +206,8 @@ export class EnvCtl {
             console.log('Lock env to run destroy');
             await this.envApi.lockForUpdate(env);
         }
-        const { ephemeral, owner, vars } = env;
-        const envTerraform = { key, ephemeral, owner: owner || 'system', args: tfArgs, vars };
+        const { ephemeral, vars } = env;
+        const envTerraform = { key, ephemeral, args: tfArgs, vars };
         console.log('Destroying env resources');
         await this.terraformAdapter.destroy(envTerraform, force, cwd);
         console.log('Unlock env');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "0.32.9",
+  "version": "0.34.0",
   "author": "Alex Chekulaev",
   "type": "module",
   "bin": {