@codacy/tools-hadolint-2 0.24.0 → 0.25.0

package/dist/index.js

@@ -1015,22 +1015,32 @@ var PLATFORM_MAP = {
   // suffix is added at the download/resolve sites via exeName.
   "win32-x64": "Windows-x86_64"
 };
-async function getVersionFromBinary(binaryPath) {
+async function probeVersion(binaryPath) {
   try {
-    const { stdout, exitCode } = await (0, import_tooling.spawnTool)(binaryPath, ["--version"], {
+    const { stdout, stderr, exitCode } = await (0, import_tooling.spawnTool)(binaryPath, ["--version"], {
       cwd: process.cwd()
     });
-    if (exitCode !== 0) return null;
     const match = stdout.match(/(\d+\.\d+\.\d+)/);
-    return match ? match[1] : null;
+    if (exitCode === 0 && match) return { version: match[1] };
+    const output = `${stderr}
+${stdout}`.trim().slice(0, 500);
+    return { failure: `exit ${exitCode}${output ? `: ${output}` : " with no output"}` };
+  } catch (err) {
+    return { failure: err instanceof Error ? err.message : String(err) };
+  }
+}
+async function fileExists(filePath) {
+  try {
+    await import_promises.default.access(filePath);
+    return true;
   } catch {
-    return null;
+    return false;
   }
 }
 async function resolveBinaryPath(ctx) {
   const codacyBin = import_path.default.join(ctx.toolInstallDir, (0, import_tooling.exeName)(BINARY));
-  const version = await getVersionFromBinary(codacyBin);
-  if (version) return codacyBin;
+  const probe = await probeVersion(codacyBin);
+  if ("version" in probe) return codacyBin;
   return BINARY;
 }
 var adapter = {
@@ -1052,9 +1062,10 @@ var adapter = {
    */
   async checkAvailability(ctx) {
     ctx.logger.debug("Checking availability", { toolId: TOOL_ID });
-    const codacyBin = import_path.default.join(ctx.toolInstallDir, BINARY);
-    const codacyVersion = await getVersionFromBinary(codacyBin);
-    if (codacyVersion) {
+    const codacyBin = import_path.default.join(ctx.toolInstallDir, (0, import_tooling.exeName)(BINARY));
+    const codacyProbe = await probeVersion(codacyBin);
+    if ("version" in codacyProbe) {
+      const codacyVersion = codacyProbe.version;
       ctx.logger.debug("Found codacy-managed binary", {
         toolId: TOOL_ID,
         version: codacyVersion,
@@ -1067,8 +1078,9 @@ var adapter = {
         installation: "codacy"
       };
     }
-    const globalVersion = await getVersionFromBinary(BINARY);
-    if (globalVersion) {
+    const globalProbe = await probeVersion(BINARY);
+    if ("version" in globalProbe) {
+      const globalVersion = globalProbe.version;
       ctx.logger.debug("Found global binary", { toolId: TOOL_ID, version: globalVersion });
       return {
         available: true,
@@ -1076,13 +1088,11 @@ var adapter = {
         installation: "global"
       };
     }
-    ctx.logger.debug("Binary not found", {
-      toolId: TOOL_ID,
-      reason: "not in PATH or Codacy install directory"
-    });
+    const reason = await fileExists(codacyBin) ? `hadolint at ${codacyBin} did not run (\`--version\` failed: ${codacyProbe.failure})` : "hadolint binary not found in PATH or Codacy install directory";
+    ctx.logger.debug("Binary not available", { toolId: TOOL_ID, reason });
     return {
       available: false,
-      reason: "hadolint binary not found in PATH or Codacy install directory",
+      reason,
       installHint: "brew install hadolint   # macOS\ncodacy-analysis analyze . --install-dependencies  # auto-install"
     };
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codacy/tools-hadolint-2",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "description": "Hadolint adapter — CLI-mode Dockerfile linter",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
     "dist"
   ],
   "dependencies": {
-    "@codacy/tooling": "0.24.0"
+    "@codacy/tooling": "0.25.0"
   },
   "license": "MIT",
   "author": "Codacy <support@codacy.com> (https://www.codacy.com)",