@agilecustoms/envctl 1.24.0 → 1.25.0

package/dist/service/EnvService.js

@@ -51,6 +51,7 @@ export class EnvService extends BaseService {
     async plan(tfArgs) {
         this.terraformAdapter.validateAndGetStateFile();
         const key = this.terraformAdapter.getKey();
+        this.terraformAdapter.getLockFile();
         await this.terraformAdapter.plan(key, tfArgs);
     }
     async createEphemeral(key) {

package/dist/service/TerraformAdapter.js

@@ -108,22 +108,27 @@ export class TerraformAdapter {
         config.stateHash = fileHash;
         return { stateFile: fileContent, stateUpdated };
     }
-    getLockFile() {
+    _getLockFile() {
         const lockPath = path.join(process.cwd(), '.terraform.lock.hcl');
         if (!fs.existsSync(lockPath)) {
             throw new KnownException(`Terraform lock file not found at: ${lockPath}`);
         }
-        let fileContent;
         try {
-            fileContent = fs.readFileSync(lockPath, 'utf8');
+            return fs.readFileSync(lockPath, 'utf8');
         }
         catch (cause) {
             throw new KnownException(`Failed to read terraform lock file: ${lockPath}`, { cause });
         }
+    }
+    getLockFile() {
+        const fileContent = this._getLockFile();
         const config = this.localStateService.load();
         const fileHash = hash(fileContent);
+        if (fileHash !== config.lockFileHash) {
+            throw new KnownException(`Make sure you're using envctl init instead of terraform init`);
+        }
         const lockUpdated = config.lockHash !== fileHash;
-        config.stateHash = fileHash;
+        config.lockHash = fileHash;
         return { lockFile: fileContent, lockUpdated };
     }
     saveHashes() {
@@ -136,6 +141,10 @@ export class TerraformAdapter {
             logger.info('Lock providers');
             await this.cli.run('terraform', ['providers', 'lock', '-platform=linux_arm64']);
         }
+        const fileContent = this._getLockFile();
+        const config = this.localStateService.load();
+        config.lockFileHash = hash(fileContent);
+        this.localStateService.save(config);
     }
     printTime() {
         const now = new Date();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilecustoms/envctl",
-  "version": "1.24.0",
+  "version": "1.25.0",
   "description": "node.js CLI client for manage environments",
   "keywords": [
     "terraform wrapper",
@@ -64,12 +64,13 @@
     "d3-apply": " npm run d3 -- apply plan",
     "d3-delete": "npm run d3 -- delete",
     "-d4-": "",
-    "d4-desc": "terraform plan and then envctl apply",
+    "d4-desc": "terraform init and then envctl apply",
     "d4": "CWD=../tt-core npm run it --",
-    "d4-init": "cd ../tt-core && rm .terraform.lock.hcl && terraform init -reconfigure -upgrade -backend-config=key=d4",
-    "d4-plan": "cd ../tt-core && terraform plan -var=env_size=min -var=env=d4 -out=plan",
-    "d4-apply": " npm run d4 -- apply plan",
+    "d4-init": "cd ../tt-core && rm .terraform.lock.hcl && rm .terraform/envctl.json && terraform init -reconfigure -upgrade -backend-config=key=d4",
+    "d4-init1": " npm run d4 -- init -reconfigure -upgrade -backend-config=key=d4",
+    "d4-apply": " npm run d4 -- apply -auto-approve -var=env_size=min",
     "d4-delete": "npm run d4 -- delete",
+    "d4-status": "npm run d4 -- status",
     "-e1-": "",
     "e1-desc": "ephemeral env in CI (must have ENVCTL_API_KEY_ in env vars)",
     "e1": "CWD=../tt-core CI=true ENVCTL_HOME=non-existing ENVCTL_API_KEY=\"$ENVCTL_API_KEY_\" npm run it --",