fix: install wrapper after version/cache steps (#357)

- Extract version detection into getInstalledVersion function
- Move wrapper installation after version detection and caching
- Ensures version output is captured before wrapper intercepts stdout
- Prevents caching wrapped binary, which caused issues on cache hits
- Add test to verify tflint-version output with wrapper enabled

Fixes #356

Author: bendrucker

.github/workflows/test.yml

@@ -164,6 +164,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Use Action
+        id: setup-tflint
         uses: ./
         with:
           tflint_version: ${{ matrix.tflint_version }}
@@ -180,6 +181,14 @@ jobs:
           else
             echo "TFLint Exit Code captured."
           fi
+      - name: Verify Version Output
+        run: |
+          if [[ -z "${{ steps.setup-tflint.outputs.tflint-version }}" ]]; then
+            echo "TFLint version output not captured."
+            exit 1
+          else
+            echo "TFLint version captured: ${{ steps.setup-tflint.outputs.tflint-version }}"
+          fi
 
   integration-cache:
     name: 'Integration test: cache'

dist/index.js

@@ -89055,6 +89055,30 @@ async function downloadCLI(url, checksums, version) {
   return pathToCLI;
 }
 
+async function getInstalledVersion() {
+  try {
+    let stdout = '';
+    await exec.exec('tflint', ['--version'], {
+      listeners: {
+        stdout: (data) => {
+          stdout += data.toString();
+        },
+      },
+    });
+
+    const firstLine = stdout.split('\n')[0];
+    const match = firstLine.match(/TFLint version (.+)/);
+    if (match) {
+      const installedVersion = match[1];
+      core.setOutput('tflint-version', installedVersion);
+    } else {
+      core.warning('Unable to parse tflint version from output');
+    }
+  } catch (error) {
+    core.warning(`Failed to get tflint version: ${error.message}`);
+  }
+}
+
 async function installWrapper(pathToCLI) {
   // Move the original tflint binary to a new location
   await io.mv(external_path_.join(pathToCLI, 'tflint'), external_path_.join(pathToCLI, 'tflint-bin'));
@@ -89096,11 +89120,6 @@ async function run() {
 
       pathToCLI = await downloadCLI(url, checksums, version);
 
-      if (wrapper) {
-        await installWrapper(pathToCLI);
-      }
-
-      // Cache the tool for future runs
       core.info('Adding to the tool cache...');
       pathToCLI = await tool_cache.cacheDir(pathToCLI, 'tflint', normalizedVersion, arch);
       core.info(`Successfully cached TFLint to ${pathToCLI}`);
@@ -89111,27 +89130,11 @@ async function run() {
     const matchersPath = __nccwpck_require__.ab + "matchers.json";
     core.info(`##[add-matcher]${matchersPath}`);
 
-    // Get and output actual installed version
-    try {
-      let stdout = '';
-      await exec.exec('tflint', ['--version'], {
-        listeners: {
-          stdout: (data) => {
-            stdout += data.toString();
-          },
-        },
-      });
+    await getInstalledVersion();
 
-      const firstLine = stdout.split('\n')[0];
-      const match = firstLine.match(/TFLint version (.+)/);
-      if (match) {
-        const installedVersion = match[1];
-        core.setOutput('tflint-version', installedVersion);
-      } else {
-        core.warning('Unable to parse tflint version from output');
-      }
-    } catch (error) {
-      core.warning(`Failed to get tflint version: ${error.message}`);
+    // Must happen after version detection and caching, which depend on the real binary
+    if (wrapper) {
+      await installWrapper(pathToCLI);
     }
 
     return version;

src/setup-tflint.js

@@ -104,6 +104,30 @@ async function downloadCLI(url, checksums, version) {
   return pathToCLI;
 }
 
+async function getInstalledVersion() {
+  try {
+    let stdout = '';
+    await exec.exec('tflint', ['--version'], {
+      listeners: {
+        stdout: (data) => {
+          stdout += data.toString();
+        },
+      },
+    });
+
+    const firstLine = stdout.split('\n')[0];
+    const match = firstLine.match(/TFLint version (.+)/);
+    if (match) {
+      const installedVersion = match[1];
+      core.setOutput('tflint-version', installedVersion);
+    } else {
+      core.warning('Unable to parse tflint version from output');
+    }
+  } catch (error) {
+    core.warning(`Failed to get tflint version: ${error.message}`);
+  }
+}
+
 async function installWrapper(pathToCLI) {
   // Move the original tflint binary to a new location
   await io.mv(path.join(pathToCLI, 'tflint'), path.join(pathToCLI, 'tflint-bin'));
@@ -145,11 +169,6 @@ async function run() {
 
       pathToCLI = await downloadCLI(url, checksums, version);
 
-      if (wrapper) {
-        await installWrapper(pathToCLI);
-      }
-
-      // Cache the tool for future runs
       core.info('Adding to the tool cache...');
       pathToCLI = await tc.cacheDir(pathToCLI, 'tflint', normalizedVersion, arch);
       core.info(`Successfully cached TFLint to ${pathToCLI}`);
@@ -160,27 +179,11 @@ async function run() {
     const matchersPath = path.join(__dirname, '..', '.github', 'matchers.json');
     core.info(`##[add-matcher]${matchersPath}`);
 
-    // Get and output actual installed version
-    try {
-      let stdout = '';
-      await exec.exec('tflint', ['--version'], {
-        listeners: {
-          stdout: (data) => {
-            stdout += data.toString();
-          },
-        },
-      });
-
-      const firstLine = stdout.split('\n')[0];
-      const match = firstLine.match(/TFLint version (.+)/);
-      if (match) {
-        const installedVersion = match[1];
-        core.setOutput('tflint-version', installedVersion);
-      } else {
-        core.warning('Unable to parse tflint version from output');
-      }
-    } catch (error) {
-      core.warning(`Failed to get tflint version: ${error.message}`);
+    await getInstalledVersion();
+
+    // Must happen after version detection and caching, which depend on the real binary
+    if (wrapper) {
+      await installWrapper(pathToCLI);
     }
 
     return version;