@agilecustoms/envctl 0.29.0 → 0.30.1

package/dist/client/EnvApiClient.js

@@ -34,7 +34,11 @@ export class EnvApiClient {
         env.status = EnvStatus.Active;
     }
     async lockForUpdate(env) {
-        const { status } = await this.httpClient.post(`/ci/env/${env.key}/lock-for-update`);
+        const body = {
+            stateFile: env.stateFile,
+            lockFile: env.lockFile
+        };
+        const { status } = await this.httpClient.post(`/ci/env/${env.key}/lock-for-update`, body);
         env.status = status;
     }
     async delete(env) {

package/dist/client/TerraformAdapter.js

@@ -19,7 +19,7 @@ export class TerraformAdapter {
             return acc;
         }, new Map());
     }
-    getKey(cwd) {
+    getStateFile(cwd) {
         const dir = cwd ?? process.cwd();
         const statePath = path.join(dir, '.terraform', 'terraform.tfstate');
         if (!fs.existsSync(statePath)) {
@@ -32,12 +32,29 @@ export class TerraformAdapter {
         catch (err) {
             throw new KnownException(`Failed to read terraform state file: ${statePath}`, { cause: err });
         }
+        return content;
+    }
+    getLockFile(cwd) {
+        const dir = cwd ?? process.cwd();
+        const lockPath = path.join(dir, '.terraform.lock.hcl');
+        if (!fs.existsSync(lockPath)) {
+            throw new KnownException(`Terraform lock file not found at: ${lockPath}`);
+        }
+        try {
+            return fs.readFileSync(lockPath, 'utf8');
+        }
+        catch (err) {
+            throw new KnownException(`Failed to read terraform lock file: ${lockPath}`, { cause: err });
+        }
+    }
+    getKey(cwd) {
+        const stateFile = this.getStateFile(cwd);
         let tfstate;
         try {
-            tfstate = JSON.parse(content);
+            tfstate = JSON.parse(stateFile);
         }
         catch (err) {
-            throw new KnownException(`Failed to parse terraform state file: ${statePath}`, { cause: err });
+            throw new KnownException(`Failed to parse terraform state file: .terraform/terraform.tfstate`, { cause: err });
         }
         const backendJson = tfstate.backend;
         const type = backendJson?.type;

package/dist/service/EnvCtl.js

@@ -104,6 +104,11 @@ export class EnvCtl {
         const createEnv = { key };
         return await this.envApi.createEphemeral(createEnv);
     }
+    async lockTerraform(env, cwd) {
+        await this.terraformAdapter.lockProviders(cwd);
+        env.stateFile = this.terraformAdapter.getStateFile(cwd);
+        env.lockFile = this.terraformAdapter.getLockFile(cwd);
+    }
     async deploy(tfArgs, cwd) {
         const key = this.terraformAdapter.getKey(cwd);
         let env = await this.tryGetEnv(key);
@@ -111,14 +116,14 @@ export class EnvCtl {
             const kind = this.cliHelper.getKind(cwd);
             console.log('Creating env metadata');
             const userName = this.configService.getUserName();
-            await this.terraformAdapter.lockProviders(cwd);
             const createEnv = { key, owner: userName, kind };
+            await this.lockTerraform(createEnv, cwd);
             env = await this.envApi.create(createEnv);
         }
         else {
             this.checkInput(env, cwd);
             this.checkStatus(env);
-            await this.terraformAdapter.lockProviders(cwd);
+            await this.lockTerraform(env, cwd);
             if (env.status === EnvStatus.Init) {
                 await this.envApi.lockForUpdate(env);
             }
@@ -181,7 +186,7 @@ export class EnvCtl {
                 return;
             }
         }
-        console.log('Deleting env');
+        console.log('Sending delete command');
         const message = await this.envApi.delete(env);
         console.log(message);
     }
@@ -223,6 +228,7 @@ export class EnvCtl {
         if (!env) {
             throw new KnownException(`Environment ${key} does not exist`);
         }
+        console.log(`Env ${key} status: ${env.status}`);
         return env;
     }
     async promptUnlock(env, statuses = [EnvStatus.Deploying, EnvStatus.Updating]) {

package/package.json

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