@agilecustoms/envctl 0.31.0 → 0.32.1

package/dist/backend/S3Backend.js

@@ -12,6 +12,15 @@ export class S3Backend extends TerraformBackend {
         return key;
     }
     validateAndGetStateFileContent() {
+        const allowedKeys = ['bucket', 'dynamodb_table', 'key', 'region', 'use_lockfile'];
+        const nonEmptyKeys = Object.keys(this.config).filter(key => this.config[key] !== null);
+        const invalidKeys = nonEmptyKeys.filter(key => !allowedKeys.includes(key));
+        if (invalidKeys.length > 0) {
+            throw new KnownException(`Terraform local state file ${this.stateFilePath}\n`
+                + `backend config contains not allowed keys: ${invalidKeys.join(', ')}\n`
+                + `Allowed keys are: ${allowedKeys.join(', ')}\n`
+                + `Contact support if you think your backend config is valid`);
+        }
         return this.stateFileContent;
     }
 }

package/dist/backend/TerraformBackend.js

@@ -1,7 +1,9 @@
 export class TerraformBackend {
+    stateFilePath = '';
     stateFileContent = '';
     config = {};
-    setState(stateFileContent, config) {
+    setState(stateFilePath, stateFileContent, config) {
+        this.stateFilePath = stateFilePath;
         this.stateFileContent = stateFileContent;
         this.config = config;
     }

package/dist/client/CliHelper.js

@@ -12,9 +12,7 @@ export class CliHelper {
         return answer;
     }
     getKind(cwd) {
-        const kind = getDirName(cwd);
-        console.log(`Inferred kind from directory name: ${kind}`);
-        return kind;
+        return getDirName(cwd);
     }
 }
 function getDirName(cwd) {

package/dist/client/TerraformAdapter.js

@@ -63,7 +63,7 @@ export class TerraformAdapter {
             const supportedBackends = Array.from(this.backends.keys()).join(',');
             throw new KnownException(`Unsupported terraform backend type: ${type}. Supported types: ${supportedBackends}`);
         }
-        backend.setState(stateFileContent, backendJson.config);
+        backend.setState(statePath, stateFileContent, backendJson.config);
         this.backend = backend;
         return backend;
     }

package/dist/service/EnvCtl.js

@@ -105,8 +105,9 @@ export class EnvCtl {
         return await this.envApi.createEphemeral(createEnv);
     }
     async lockTerraform(env, cwd) {
-        await this.terraformAdapter.lockProviders(cwd);
+        console.log('validate terraform.tfstate file');
         env.stateFile = this.terraformAdapter.getTerraformBackend(cwd).validateAndGetStateFileContent();
+        await this.terraformAdapter.lockProviders(cwd);
         env.lockFile = this.terraformAdapter.getLockFile(cwd);
     }
     async deploy(tfArgs, cwd) {
@@ -114,10 +115,11 @@ export class EnvCtl {
         let env = await this.tryGetEnv(key);
         if (env === null) {
             const kind = this.cliHelper.getKind(cwd);
-            console.log('Creating env metadata');
+            console.log(`Inferred kind from directory name: ${kind}`);
             const userName = this.configService.getUserName();
             const createEnv = { key, owner: userName, kind };
             await this.lockTerraform(createEnv, cwd);
+            console.log('Creating env metadata');
             env = await this.envApi.create(createEnv);
         }
         else {

package/package.json

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