@agilecustoms/envctl 1.19.2 → 1.20.1

package/dist/commands/plan.js

@@ -12,7 +12,7 @@ export function plan(program, configService, envService) {
         .argument('[args...]')
         .action(wrap(async (tfArgs, options) => {
         const { profile } = options;
-        configService.init(profile);
+        configService.init(profile, false);
         await envService.plan(tfArgs);
     }));
 }

package/dist/container.js

@@ -6,8 +6,8 @@ import { ConfigService, EnvService, TerraformAdapter } from './service/index.js'
 import { LocalStateService } from './service/LocalStateService.js';
 import { LogService } from './service/LogService.js';
 export function buildContainer(appVersion) {
-    const cli = new Cli();
     const configService = new ConfigService();
+    const cli = new Cli();
     const backends = [new S3Backend()];
     const commandId = randomUUID();
     const httpClient = new HttpClient(appVersion, commandId, configService);
@@ -15,7 +15,7 @@ export function buildContainer(appVersion) {
     const localStateService = new LocalStateService();
     const nonInteractive = !process.stdout.isTTY || process.env.CI === 'true';
     const terraformAdapter = new TerraformAdapter(Date.now, configService, cli, localStateService, backends, nonInteractive);
-    const envService = new EnvService(cli, envApiClient, terraformAdapter);
+    const envService = new EnvService(configService, cli, envApiClient, terraformAdapter);
     const logService = new LogService(cli, envApiClient, terraformAdapter);
     return { configService, envService, logService };
 }

package/dist/service/ConfigService.js

@@ -41,10 +41,10 @@ export class ConfigService {
         const configPath = path.join(configDir(), `${profile}.json`);
         fs.writeFileSync(configPath, data);
     }
-    init(profile = undefined) {
+    init(profile = undefined, requireApiKey = true) {
         this.loadConfig(profile);
         const apiKey = this.getApiKey();
-        if (!apiKey) {
+        if (!apiKey && requireApiKey) {
             if (!!process.env['CI']) {
                 throw new KnownException('API key is missing, set env variable ' + EnvKey.API_KEY);
             }

package/dist/service/EnvService.js

@@ -6,10 +6,12 @@ import { EnvStatus } from '../model/index.js';
 import { toLocalTime } from '../util.js';
 import { BaseService } from './BaseService.js';
 export class EnvService extends BaseService {
+    configService;
     cli;
     envApi;
-    constructor(cli, envApi, terraformAdapter) {
+    constructor(configService, cli, envApi, terraformAdapter) {
         super(terraformAdapter);
+        this.configService = configService;
         this.cli = cli;
         this.envApi = envApi;
     }
@@ -33,10 +35,13 @@ export class EnvService extends BaseService {
         }
     }
     async tryGetEnv(key) {
+        if (this.configService.getApiKey() === undefined) {
+            return null;
+        }
         logger.info(`Check if env ${key} already exists`);
         const env = await this.envApi.get(key);
         if (env) {
-            logger.info(`Found ${key} env`);
+            logger.info(`Env ${key} status: ${env.status}`);
         }
         else {
             logger.info(`Env ${key} does not exist`);
@@ -68,7 +73,7 @@ export class EnvService extends BaseService {
         const createEnv = { key };
         return await this.envApi.createEphemeral(createEnv);
     }
-    async lockTerraform(env, newEnv = false) {
+    async lockTerraform(env, newEnv) {
         logger.info('Lock providers');
         const res = await this.terraformAdapter.lock(newEnv);
         if (env !== null) {
@@ -106,11 +111,9 @@ export class EnvService extends BaseService {
         this.handleDeleteStatuses(env);
         const status = env.status;
         if (status === EnvStatus.Init || status === EnvStatus.Active) {
-            logger.info(`Env status is ${status}`);
-            await this.lockTerraform(env);
-            if (env.status == EnvStatus.Active) {
-                logger.info('Will lock for update and run terraform apply (to update resources)');
-            }
+            const newEnv = status === EnvStatus.Init;
+            await this.lockTerraform(env, newEnv);
+            logger.info('Will lock for update and run terraform apply (to update resources)');
             await this.envApi.lockForUpdate(env);
             await this.runApply(env, tfArgs);
             return;

package/package.json

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