@agilecustoms/envctl 0.35.2 → 0.36.0

package/dist/client/EnvApiClient.js

@@ -58,4 +58,17 @@ export class EnvApiClient {
         env.status = EnvStatus.Deleting;
         console.log(result.statusText);
     }
+    async getLogs(key) {
+        let result;
+        try {
+            result = await this.httpClient.fetch(`/ci/env/${key}/logs`);
+        }
+        catch (error) {
+            if (error instanceof NotFoundException) {
+                throw new KnownException(`Environment ${key} is not found`);
+            }
+            throw error;
+        }
+        return result.url;
+    }
 }

package/dist/client/TerraformAdapter.js

@@ -33,6 +33,13 @@ export class TerraformAdapter {
             throw new KnownException(`Failed to read terraform lock file: ${lockPath}`, { cause: err });
         }
     }
+    getKey(key, cwd) {
+        if (!key) {
+            console.log('Key is not provided, inferring from state file');
+            key = this.getTerraformBackend(cwd).getKey();
+        }
+        return key;
+    }
     getTerraformBackend(cwd) {
         if (this.backend) {
             return this.backend;

package/dist/commands/createEphemeral.js

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import { envCtl } from '../container.js';
+import { envService } from '../container.js';
 import { _keys } from './_keys.js';
 import { wrap } from './_utils.js';
 export function createEphemeral(program) {
@@ -11,6 +11,6 @@ export function createEphemeral(program) {
 }
 async function handler(options) {
     const { key } = options;
-    const token = await envCtl.createEphemeral(key);
+    const token = await envService.createEphemeral(key);
     console.log(token);
 }

package/dist/commands/delete.js

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import { envCtl } from '../container.js';
+import { envService } from '../container.js';
 import { _keys } from './_keys.js';
 import { wrap } from './_utils.js';
 export function deleteIt(program) {
@@ -13,5 +13,5 @@ export function deleteIt(program) {
 }
 async function handler(options) {
     const { key, force, cwd } = options;
-    await envCtl.delete(Boolean(force), key, cwd);
+    await envService.delete(Boolean(force), key, cwd);
 }

package/dist/commands/deploy.js

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import { awsCredsHelper, envCtl } from '../container.js';
+import { awsCredsHelper, envService } from '../container.js';
 import { _keys } from './_keys.js';
 import { wrap } from './_utils.js';
 export function deploy(program) {
@@ -14,5 +14,5 @@ export function deploy(program) {
 async function handler(tfArgs, options) {
     await awsCredsHelper.ensureCredentials();
     const { cwd } = options;
-    await envCtl.deploy(tfArgs, cwd);
+    await envService.deploy(tfArgs, cwd);
 }

package/dist/commands/destroy.js

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import { envCtl } from '../container.js';
+import { envService } from '../container.js';
 import { _keys } from './_keys.js';
 import { wrap } from './_utils.js';
 export function destroy(program) {
@@ -17,5 +17,5 @@ export function destroy(program) {
 }
 async function handler(tfArgs, options) {
     const { force, cwd } = options;
-    await envCtl.destroy(tfArgs, Boolean(force), cwd);
+    await envService.destroy(tfArgs, Boolean(force), cwd);
 }

package/dist/commands/index.js

@@ -3,5 +3,6 @@ export { createEphemeral } from './createEphemeral.js';
 export { deleteIt } from './delete.js';
 export { deploy } from './deploy.js';
 export { destroy } from './destroy.js';
+export { logs } from './logs.js';
 export { plan } from './plan.js';
 export { status } from './status.js';

package/dist/commands/logs.js

@@ -0,0 +1,16 @@
+import { Command } from 'commander';
+import { logService } from '../container.js';
+import { _keys } from './_keys.js';
+import { wrap } from './_utils.js';
+export function logs(program) {
+    program
+        .command('logs')
+        .description('Get most recent env destroy logs')
+        .option('--key <key>', _keys.KEY)
+        .option('--cwd <cwd>', _keys.CWD)
+        .action(wrap(handler));
+}
+async function handler(options) {
+    const { key, cwd } = options;
+    await logService.getLogs(key, cwd);
+}

package/dist/commands/plan.js

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import { awsCredsHelper, envCtl } from '../container.js';
+import { awsCredsHelper, envService } from '../container.js';
 import { _keys } from './_keys.js';
 import { wrap } from './_utils.js';
 export function plan(program) {
@@ -15,5 +15,5 @@ export function plan(program) {
 async function handler(tfArgs, options) {
     await awsCredsHelper.ensureCredentials();
     const { cwd } = options;
-    await envCtl.plan(tfArgs, cwd);
+    await envService.plan(tfArgs, cwd);
 }

package/dist/commands/status.js

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import { envCtl } from '../container.js';
+import { envService } from '../container.js';
 import { _keys } from './_keys.js';
 import { wrap } from './_utils.js';
 export function status(program) {
@@ -12,5 +12,5 @@ export function status(program) {
 }
 async function handler(options) {
     const { key, cwd } = options;
-    await envCtl.status(key, cwd);
+    await envService.status(key, cwd);
 }

package/dist/container.js

@@ -2,7 +2,8 @@ import { S3Backend } from './backend/S3Backend.js';
 import { AwsCredsHelper } from './client/AwsCredsHelper.js';
 import { CliHelper, EnvApiClient, HttpClient, TerraformAdapter } from './client/index.js';
 import { ProcessRunner } from './client/ProcessRunner.js';
-import { ConfigService, EnvCtl } from './service/index.js';
+import { ConfigService, EnvService } from './service/index.js';
+import { LogService } from './service/LogService.js';
 const cliHelper = new CliHelper();
 const configService = new ConfigService();
 const awsCredsHelper = new AwsCredsHelper();
@@ -13,5 +14,6 @@ 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);
-export { awsCredsHelper, configService, envCtl };
+const envService = new EnvService(cliHelper, envApiClient, terraformAdapter);
+const logService = new LogService(envApiClient, terraformAdapter);
+export { awsCredsHelper, configService, envService, logService };

package/dist/index.js

@@ -2,7 +2,7 @@
 import { createRequire } from 'module';
 import { Command } from 'commander';
 import updateNotifier from 'update-notifier';
-import { configure, createEphemeral, deleteIt, deploy, destroy, plan, status } from './commands/index.js';
+import { configure, createEphemeral, deleteIt, deploy, destroy, logs, plan, status } from './commands/index.js';
 const require = createRequire(import.meta.url);
 const pkg = require('../package.json');
 updateNotifier({ pkg, updateCheckInterval: 0 }).notify();
@@ -16,6 +16,7 @@ createEphemeral(program);
 deleteIt(program);
 deploy(program);
 destroy(program);
+logs(program);
 plan(program);
 status(program);
 program.parse(process.argv);

package/dist/service/{EnvCtl.js → EnvService.js}

@@ -1,6 +1,6 @@
 import { KnownException } from '../exceptions.js';
 import { EnvStatus, } from '../model/index.js';
-export class EnvCtl {
+export class EnvService {
     cliHelper;
     envApi;
     terraformAdapter;
@@ -9,15 +9,8 @@ export class EnvCtl {
         this.envApi = envApi;
         this.terraformAdapter = terraformAdapter;
     }
-    getKey(key, cwd) {
-        if (!key) {
-            console.log('Key is not provided, inferring from state file');
-            key = this.terraformAdapter.getTerraformBackend(cwd).getKey();
-        }
-        return key;
-    }
     async status(key, cwd) {
-        key = this.getKey(key, cwd);
+        key = this.terraformAdapter.getKey(key, cwd);
         console.log(`Retrieve env ${key}`);
         const env = await this.envApi.get(key);
         if (env === null) {
@@ -25,17 +18,18 @@ export class EnvCtl {
             return;
         }
         console.log(`Env ${key} status: ${env.status}`);
-        const verb = env.status === EnvStatus.Deleting ? 'Scheduled for deletion' : 'Expires';
-        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,
-        });
-        console.log(`${verb} at ${formattedDate}`);
+        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,
+            });
+            console.log(`Expires at ${formattedDate}`);
+        }
         if (env.kind) {
             const kind = this.cliHelper.getKind(cwd);
             if (env.kind !== kind) {
@@ -149,7 +143,7 @@ export class EnvCtl {
         await this.envApi.activate(env);
     }
     async delete(force, key, cwd) {
-        key = this.getKey(key, cwd);
+        key = this.terraformAdapter.getKey(key, cwd);
         const env = await this.get(key);
         if (env.status === EnvStatus.Init) {
             await this.envApi.delete(env);

package/dist/service/LogService.js

@@ -0,0 +1,34 @@
+import { createWriteStream } from 'node:fs';
+import { mkdir } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { basename, join } from 'node:path';
+import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
+import { TerraformAdapter } from '../client/index.js';
+import { KnownException } from '../exceptions.js';
+export class LogService {
+    envApi;
+    terraformAdapter;
+    constructor(envApi, terraformAdapter) {
+        this.envApi = envApi;
+        this.terraformAdapter = terraformAdapter;
+    }
+    async getLogs(key, cwd) {
+        key = this.terraformAdapter.getKey(key, cwd);
+        const url = await this.envApi.getLogs(key);
+        console.log(`Downloading logs from: ${url}`);
+        const outDir = join(tmpdir(), 'envctl');
+        await mkdir(outDir, { recursive: true });
+        const urlPath = new URL(url).pathname;
+        const gzName = basename(urlPath);
+        const outName = gzName.slice(0, -3);
+        const outPath = join(outDir, outName);
+        const res = await fetch(url);
+        if (!res.ok) {
+            const msg = await res.text();
+            throw new KnownException(`Failed to download logs: ${res.status} ${res.statusText}${msg ? ` - ${msg}` : ''}`);
+        }
+        await pipeline(Readable.fromWeb(res.body), createWriteStream(outPath, { flags: 'w' }));
+        console.log(`Logs saved to: ${outPath}`);
+    }
+}

package/dist/service/index.js

@@ -1,2 +1,2 @@
-export { EnvCtl } from './EnvCtl.js';
+export { EnvService } from './EnvService.js';
 export { ConfigService } from './ConfigService.js';

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "0.35.2",
+  "version": "0.36.0",
   "author": "Alex Chekulaev",
   "type": "module",
+  "engines": {
+    "node": ">=22.0.0"
+  },
   "bin": {
     "envctl": "dist/index.js"
   },
@@ -35,6 +38,7 @@
     "run-core-deploy": " tsc --sourceMap true && npm run run -- deploy  --cwd ../tt-core -var=\"env_size=min\"",
     "run-core-delete": " tsc --sourceMap true && npm run run -- delete  --cwd ../tt-core",
     "run-core-destroy": "tsc --sourceMap true && npm run run -- destroy --cwd ../tt-core",
+    "run-core-logs": "tsc --sourceMap true && npm run run -- logs    --cwd ../tt-core",
     "*": "",
     "run-init": "cd ../tt-gitops && terraform init -upgrade -backend-config=key=laxa1986 -reconfigure",
     "run-status": " tsc --sourceMap true &&                                 npm run run -- status  --cwd ../tt-gitops",