@agilecustoms/envctl 0.27.0 → 0.27.1

package/dist/backend/S3Backend.js

@@ -0,0 +1,8 @@
+export class S3Backend {
+    getType() {
+        return 's3';
+    }
+    getKey(config) {
+        return config['key'];
+    }
+}

package/dist/backend/TerraformBackend.js

@@ -0,0 +1 @@
+export {};

package/dist/client/TerraformAdapter.js

@@ -10,9 +10,14 @@ const RETRYABLE_ERRORS = [
 export class TerraformAdapter {
     processRunner;
     cliHelper;
-    constructor(processRunner, cliHelper) {
+    backends;
+    constructor(processRunner, cliHelper, backends) {
         this.processRunner = processRunner;
         this.cliHelper = cliHelper;
+        this.backends = backends.reduce((acc, backend) => {
+            acc.set(backend.getType(), backend);
+            return acc;
+        }, new Map());
     }
     getKey(cwd) {
         const dir = cwd ?? process.cwd();
@@ -34,13 +39,15 @@ export class TerraformAdapter {
         catch (err) {
             throw new KnownException(`Failed to parse terraform state file: ${statePath}`, { cause: err });
         }
-        const backend = tfstate.backend;
-        const type = backend?.type;
-        if (type !== 's3') {
-            throw new KnownException(`Unsupported terraform backend type: ${type}. Only 's3' is supported for key inference`);
+        const backendJson = tfstate.backend;
+        const type = backendJson?.type;
+        const backend = this.backends.get(type);
+        if (backend === undefined) {
+            const supportedBackends = Array.from(this.backends.keys()).join(',');
+            throw new KnownException(`Unsupported terraform backend type: ${type}. Supported types: ${supportedBackends}`);
         }
-        const config = backend?.config;
-        const key = config?.key;
+        const config = backendJson?.config;
+        const key = backend.getKey(config);
         if (!key) {
             throw new KnownException(`Terraform backend config does not contain 'key' attribute`);
         }

package/dist/commands/createEphemeral.js

@@ -6,12 +6,11 @@ export function createEphemeral(program) {
     program
         .command('create-ephemeral')
         .description('Create bare env w/o resources. Used in CI as first step just to pre-generate token for extension')
-        .requiredOption('--key <key>', _keys.KEY)
-        .option('--owner <owner>', _keys.OWNER)
+        .option('--cwd <cwd>', _keys.CWD)
         .action(wrap(handler));
 }
 async function handler(options) {
-    const { key, owner } = options;
-    const token = await envCtl.createEphemeral(key, owner);
+    const { cwd } = options;
+    const token = await envCtl.createEphemeral(cwd);
     console.log(token);
 }

package/dist/container.js

@@ -1,13 +1,17 @@
+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';
 const cliHelper = new CliHelper();
+const configService = new ConfigService();
 const awsCredsHelper = new AwsCredsHelper();
+const backends = [
+    new S3Backend()
+];
 const httpClient = new HttpClient(awsCredsHelper);
 const envApiClient = new EnvApiClient(httpClient);
 const processRunner = new ProcessRunner();
-const terraformAdapter = new TerraformAdapter(processRunner, cliHelper);
-const configService = new ConfigService();
+const terraformAdapter = new TerraformAdapter(processRunner, cliHelper, backends);
 const envCtl = new EnvCtl(cliHelper, envApiClient, terraformAdapter, configService);
-export { awsCredsHelper, cliHelper, configService, envCtl };
+export { awsCredsHelper, configService, envCtl };

package/dist/service/EnvCtl.js

@@ -46,6 +46,8 @@ export class EnvCtl {
         return env;
     }
     checkInput(env, owner, cwd) {
+        if (env.ephemeral)
+            return;
         if (env.owner !== owner) {
             throw new KnownException(`Can not change env owner ${env.owner} -> ${owner}`);
         }
@@ -86,12 +88,13 @@ export class EnvCtl {
         const envTerraform = { key, ephemeral: false, owner, args, vars };
         await this.terraformAdapter.plan(envTerraform, cwd);
     }
-    async createEphemeral(key, owner) {
+    async createEphemeral(cwd) {
+        const key = this.terraformAdapter.getKey(cwd);
         const env = await this.envApi.get(key);
         if (env !== null) {
             throw new KnownException(`Env ${key} already exists`);
         }
-        const createEnv = { key, owner };
+        const createEnv = { key };
         return await this.envApi.createEphemeral(createEnv);
     }
     async deploy(tfArgs, cwd) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agilecustoms/envctl",
   "description": "node.js CLI client for manage environments",
-  "version": "0.27.0",
+  "version": "0.27.1",
   "author": "Alex Chekulaev",
   "type": "module",
   "bin": {
@@ -29,15 +29,15 @@
     "run-version": "  tsc --sourceMap true && npm run run -- --version",
     "run-configure": "tsc --sourceMap true && npm run run -- configure",
     "~": "",
-    "run-init": "cd ../tt-core && terraform init -backend-config=key=laxa1986 -upgrade",
+    "run-init": "cd ../tt-core && terraform init -upgrade -backend-config=key=laxa1986",
     "run-status": " tsc --sourceMap true && npm run run -- status  --cwd ../tt-core",
     "run-plan": "   tsc --sourceMap true && npm run run -- plan    --cwd ../tt-core",
     "run-deploy": " tsc --sourceMap true && npm run run -- deploy  --cwd ../tt-core -var=\"env_size=min\"",
     "run-delete": " tsc --sourceMap true && npm run run -- delete  --cwd ../tt-core",
     "run-destroy": "tsc --sourceMap true && npm run run -- destroy --cwd ../tt-core",
     "-": "",
-    "run-ephemeral-init": "cd ../tt-gitops && terraform init -backend-config=key=test",
-    "run-ephemeral-create": " tsc --sourceMap true && npm run run -- create-ephemeral",
+    "run-ephemeral-init": "cd ../tt-gitops && terraform init -upgrade -backend-config=key=test -reconfigure",
+    "run-ephemeral-create": " tsc --sourceMap true && npm run run -- create-ephemeral --cwd ../tt-gitops",
     "run-ephemeral-status": " tsc --sourceMap true && npm run run -- status --key test",
     "run-ephemeral-deploy": " tsc --sourceMap true && npm run run -- deploy  --cwd ../tt-gitops -var-file=versions.tfvars",
     "run-ephemeral-delete": " tsc --sourceMap true && npm run run -- delete  --cwd ../tt-gitops --force",