Merge pull request #19 from marcofranssen/improvements

Small improvements and cleanups
marcofranssen · Oct 7, 2022 · cfacca9 · cfacca9
2 parents 2792333 + c3d05be
commit cfacca9
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 33 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/lib/krew.ts b/lib/krew.ts
@@ -2,7 +2,7 @@ import { platform, arch, homedir } from "os";
 import * as core from "@actions/core";
 import * as tc from "@actions/tool-cache";
 import { mapOS, mapArch, download } from "./utils";
-import { exec, spawn } from "child_process";
+import { exec } from "child_process";
 
 export async function setupKrew() {
   const osPlatform = platform();
@@ -39,7 +39,7 @@ function installKrew(cachedPath: string, binary: string): Promise<string> {
         return reject(e);
       }
 
-      exec("kubectl krew version", (e, stdout) => {
+      exec(`${cachedPath}/${binary} krew version`, (e, stdout) => {
         if (e) {
           return resolve("latest");
         }

diff --git a/lib/setup-kubectl.ts b/lib/setup-kubectl.ts
@@ -8,37 +8,47 @@ import { mapOS, mapArch, download } from "./utils";
 import { setupKrew } from "./krew";
 
 export async function setupKubectl() {
-  const kubectlVersion = await getVersion(core.getInput("kubectlVersion"));
-
-  core.debug(`Installing kubectl ${kubectlVersion}…`);
-
-  const osPlatform = platform();
-  const osArch = arch();
-  const p = mapOS(osPlatform);
-  const a = mapArch(osArch);
-
-  const downloadURL = `https://storage.googleapis.com/kubernetes-release/release/${kubectlVersion}/bin/${p}/${a}/kubectl`;
-  const checksumURL = `https://storage.googleapis.com/kubernetes-release/release/${kubectlVersion}/bin/${p}/${a}/kubectl.sha256`;
-
-  let cachedPath = tc.find("kubectl", kubectlVersion, osArch)
-
-  if (cachedPath) {
-    core.info(`Found kubectl ${kubectlVersion} in toolcache @ ${cachedPath}`);
-  } else {
-    core.info(`Attempting to download kubectl ${kubectlVersion}…`);
-    const pathToCLI = await download(downloadURL, checksumURL);
-    const dir = `${dirname(pathToCLI)}/kubectl-${kubectlVersion}`
-    await mkdir(dir, { recursive: true })
-    await rename(pathToCLI, `${dir}/kubectl`)
-    await chmod(`${dir}/kubectl`, 0o755)
-    cachedPath = await tc.cacheDir(`${dir}`, "kubectl", kubectlVersion, osArch)
-  }
+  try {
+    const kubectlVersion = await getVersion(core.getInput("kubectlVersion"));
+
+    core.debug(`Installing kubectl ${kubectlVersion}…`);
+
+    const osPlatform = platform();
+    const osArch = arch();
+    const p = mapOS(osPlatform);
+    const a = mapArch(osArch);
+
+    const downloadURL = `https://storage.googleapis.com/kubernetes-release/release/${kubectlVersion}/bin/${p}/${a}/kubectl`;
+    const checksumURL = `https://storage.googleapis.com/kubernetes-release/release/${kubectlVersion}/bin/${p}/${a}/kubectl.sha256`;
+
+    let cachedPath = tc.find("kubectl", kubectlVersion, osArch);
+
+    if (cachedPath) {
+      core.info(`Found kubectl ${kubectlVersion} in toolcache @ ${cachedPath}`);
+    } else {
+      core.info(`Attempting to download kubectl ${kubectlVersion}…`);
+      const pathToCLI = await download(downloadURL, checksumURL);
+      const dir = `${dirname(pathToCLI)}/kubectl-${kubectlVersion}`;
+      await mkdir(dir, { recursive: true });
+      await rename(pathToCLI, `${dir}/kubectl`);
+      await chmod(`${dir}/kubectl`, 0o755);
+      cachedPath = await tc.cacheDir(
+        `${dir}`,
+        "kubectl",
+        kubectlVersion,
+        osArch
+      );
+    }
 
-  core.addPath(cachedPath);
-  core.setOutput("kubectl-version", kubectlVersion);
+    core.addPath(cachedPath);
+    core.setOutput("kubectl-version", kubectlVersion);
 
-  if (core.getInput("enablePlugins")) {
-    await setupKrew();
+    if (core.getInput("enablePlugins")) {
+      await setupKrew();
+    }
+  } catch (e) {
+    core.error(e as Error);
+    throw e;
   }
 }