fix some issues

Author: ServerlessLife

src/frameworks/openTofuFramework.ts

@@ -28,6 +28,14 @@ export class OpenTofuFramework extends TerraformFramework {
   protected get stateCommand(): string {
     return 'tofu show --json';
   }
+
+  /**
+   *
+   * @returns Get command to check if OpenTodu is installed
+   */
+  protected get checkInstalledCommand(): string {
+    return 'tofu --version';
+  }
 }
 
 export const openTofuFramework = new OpenTofuFramework();

src/frameworks/terraformFramework.ts

@@ -47,6 +47,21 @@ export class TerraformFramework implements IFramework {
     return 'Terrform';
   }
 
+  /**
+   * Get Terraform state CI command
+   */
+  protected get stateCommand(): string {
+    return 'terraform show --json';
+  }
+
+  /**
+   *
+   * @returns Get command to check if Terraform is installed
+   */
+  protected get checkInstalledCommand(): string {
+    return 'terraform --version';
+  }
+
   /**
    * Can this class handle the current project
    * @returns
@@ -60,9 +75,20 @@ export class TerraformFramework implements IFramework {
       Logger.verbose(
         `[${this.logName}] This is not a Terraform or OpenTofu project. There are no *.tf files in ${path.resolve('.')} folder.`,
       );
+      return false;
+    } else {
+      // check if terraform is installed
+      try {
+        await execAsync(this.checkInstalledCommand);
+        return true;
+      } catch (error: any) {
+        Logger.verbose(
+          `[${this.logName}] This is not a ${this.logName} project. Terraform is not installed.`,
+          { cause: error },
+        );
+        return false;
+      }
     }
-
-    return r;
   }
 
   /**
@@ -242,13 +268,6 @@ export class TerraformFramework implements IFramework {
     return lambdas;
   }
 
-  /**
-   * Get Terraform state CI command
-   */
-  protected get stateCommand(): string {
-    return 'terraform show --json';
-  }
-
   protected async readTerraformState(): Promise<TerraformResource[]> {
     // Is there a better way to get the Terraform state???
 

test/opentofu-basic.test.ts

@@ -19,10 +19,16 @@ const observableMode = process.env.OBSERVABLE_MODE === 'true';
 describe('opentofu-basic', async () => {
   const folder = await getTestProjectFolder('opentofu-basic');
   let lldProcess: ChildProcess | undefined;
+  const args: string[] = [];
 
   beforeAll(async () => {
+    if (process.env.RUN_TEST_FROM_CLI === 'true') {
+      // localy I need to specify it is OpenTofu, because I have also Terraform installed
+      args.push('--framework=opentofu');
+    }
+
     if (process.env.CI === 'true' || process.env.RUN_TEST_FROM_CLI === 'true') {
-      lldProcess = await startDebugger(folder, ['--framework=opentofu']);
+      lldProcess = await startDebugger(folder, args);
     }
   });
 
@@ -137,7 +143,7 @@ describe('opentofu-basic', async () => {
 
   test('remove infra', async () => {
     if (process.env.CI === 'true' || process.env.RUN_TEST_FROM_CLI === 'true') {
-      await removeInfra(lldProcess, folder, ['--framework=opentofu']);
+      await removeInfra(lldProcess, folder, args);
       const lambdaName = await getFunctionName(
         folder,
         'lambda-test-js-commonjs_1_name',