@agilecustoms/envctl 1.10.3 → 1.10.4

package/dist/client/EnvApiClient.js

@@ -1,6 +1,7 @@
 import { BusinessException, KnownException, NotFoundException } from '../exceptions.js';
 import { logger } from '../logger.js';
 import { EnvStatus } from '../model/index.js';
+import { toLocalTime } from '../util.js';
 import { HttpClient, toUrl } from './HttpClient.js';
 export class EnvApiClient {
     httpClient;
@@ -45,6 +46,7 @@ export class EnvApiClient {
             }
             throw error;
         }
+        logger.debug(`Env ${env.key} created with TTL ${toLocalTime(result.ttl)}`);
         return { ...env, ephemeral: false, status: EnvStatus.Deploying, ttl: result.ttl };
     }
     async activate(env) {

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: complete project (default) or some slice such as tt-core + tt-web',
-    OWNER: 'Environment owner (GH username)'
+    KIND: 'Environment kind: complete project (default) or some slice such as tt-core + tt-web'
 };

package/dist/service/EnvService.js

@@ -3,6 +3,7 @@ import { EnvApiClient } from '../client/index.js';
 import { KnownException } from '../exceptions.js';
 import { logger } from '../logger.js';
 import { EnvStatus } from '../model/index.js';
+import { toLocalTime } from '../util.js';
 import { BaseService } from './BaseService.js';
 export const PLAN_FILE = '.terraform/envctl.plan';
 export class EnvService extends BaseService {
@@ -23,16 +24,7 @@ export class EnvService extends BaseService {
         }
         logger.info(`Env ${key} status: ${env.status}`);
         if (env.status !== EnvStatus.Deleting && env.status !== EnvStatus.DeleteError) {
-            const date = new Date(env.ttl * 1000);
-            const formattedDate = date.toLocaleString(undefined, {
-                month: 'short',
-                day: '2-digit',
-                hour: '2-digit',
-                minute: '2-digit',
-                second: '2-digit',
-                hour12: false,
-            });
-            logger.info(`Expires at ${formattedDate}`);
+            logger.info(`Expires at ${toLocalTime(env.ttl)}`);
         }
         if (env.kind) {
             const kind = this.cli.getKind();
@@ -71,7 +63,7 @@ export class EnvService extends BaseService {
         }
         const newEnv = env === null;
         await this.lockTerraform(env, newEnv);
-        await this.terraformAdapter.plan(env, tfArgs);
+        await this.terraformAdapter.plan(env ?? { key }, tfArgs);
     }
     async createEphemeral(key) {
         const createEnv = { key };
@@ -127,7 +119,7 @@ export class EnvService extends BaseService {
             logger.info(`Inferred kind from directory name: ${kind}`);
             const createEnv = { key, kind };
             await this.lockTerraform(createEnv, true);
-            tfArgs = await this.ensurePlan(env, tfArgs);
+            tfArgs = await this.ensurePlan({ key, ephemeral: false }, tfArgs);
             logger.info('Creating env metadata');
             env = await this.envApi.create(createEnv);
             await this.runDeploy(env, tfArgs);

package/dist/service/TerraformAdapter.js

@@ -120,7 +120,7 @@ export class TerraformAdapter {
         const argVars = this.getArgVars(args);
         const specialFields = { ...env, env: env.key };
         const extraArgs = [];
-        for (const name of ['env', 'owner', 'ephemeral']) {
+        for (const name of ['env', 'ephemeral']) {
             if (varDefs[name] && !argVars[name]) {
                 extraArgs.push('-var=' + name + '=' + specialFields[name]);
             }
@@ -192,9 +192,7 @@ export class TerraformAdapter {
         return newVars;
     }
     async plan(env, args, onDemandVars = {}) {
-        if (env) {
-            args = this.tfArgs(env, args);
-        }
+        args = this.tfArgs(env, args);
         await this._plan(args, onDemandVars, 1);
     }
     async _plan(args, onDemandVars, attemptNo) {

package/dist/util.js

@@ -0,0 +1,11 @@
+export function toLocalTime(ttl) {
+    const date = new Date(ttl * 1000);
+    return date.toLocaleString(undefined, {
+        month: 'short',
+        day: '2-digit',
+        hour: '2-digit',
+        minute: '2-digit',
+        second: '2-digit',
+        hour12: false,
+    });
+}

package/package.json

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