Do not leave deno-bundle.js after failed helm deno push

Author: Nitive

e2e-tests/e2e.test.ts

@@ -494,6 +494,36 @@ Deno.test({
   },
 })
 
+Deno.test({
+  name: "should clean deno-bundle.js if push wasn't successful",
+  ignore: !runAllTests,
+  async fn() {
+    const chartPath = path.join(chartsBin, "one-service")
+    const denoBundlePath = path.join(chartPath, "deno-bundle.js")
+
+    try {
+      const { status, stdout, stderr } = await runHelmDeno([
+        "push",
+        chartPath,
+        "http://127.0.0.1:1",
+      ])
+
+      if (status.success) {
+        assertEquals(status.success, false, "should not successfully push")
+      }
+
+      const isDenoBundleExists = await fs.exists(denoBundlePath)
+      assertEquals(
+        isDenoBundleExists,
+        false,
+        "should not have left temporary file deno-bundle.js"
+      )
+    } finally {
+      await removeIfExists(denoBundlePath)
+    }
+  },
+})
+
 Deno.test({
   name: "should use deno-bundle.js if `--deno-bundle require` have been passed",
   async fn() {

src/helm/execute.ts

@@ -1,4 +1,7 @@
-export async function helmExecute(args: readonly string[]): Promise<void> {
+export async function helmExecute(
+  args: readonly string[],
+  { autoExitOnError = false }: { autoExitOnError?: boolean } = {}
+): Promise<{ exitCode?: number }> {
   const helm = Deno.env.get("HELM_BIN") as string
   const cmd = Deno.run({
     cmd: [helm, ...args],
@@ -8,6 +11,11 @@ export async function helmExecute(args: readonly string[]): Promise<void> {
 
   const status = await cmd.status()
   if (!status.success) {
-    Deno.exit(status.code)
+    if (autoExitOnError) {
+      Deno.exit(status.code)
+    }
+    return { exitCode: status.code }
   }
+
+  return {}
 }

src/index.ts

@@ -94,18 +94,30 @@ async function main() {
   )
 
   if (command.length === 1 && command[0] === "push") {
+    let helmExecuteResult: { exitCode?: number } = {}
     try {
+      console.log("bundleChart")
       await bundleChart(chartLocation, options)
-      await helmExecute(["push", chartLocation, ...helmRestArgs])
+      console.log("helmExecute")
+      helmExecuteResult = await helmExecute([
+        "push",
+        chartLocation,
+        ...helmRestArgs,
+      ])
     } finally {
       await cleanupBundle(chartLocation)
     }
+
+    if (helmExecuteResult.exitCode) {
+      Deno.exit(helmExecuteResult.exitCode)
+    }
+
     return
   }
 
   const lastCommand = command[command.length - 1]
   if (command.length === 0 || !supportedCommands.includes(lastCommand)) {
-    await helmExecute(args)
+    await helmExecute(args, { autoExitOnError: true })
     return
   }
 
@@ -150,7 +162,7 @@ async function main() {
       ...helmRestArgs,
     ]
     debug(`Executing: ${helmExecuteArgs.join(" ")}`)
-    await helmExecute(helmExecuteArgs)
+    await helmExecute(helmExecuteArgs, { autoExitOnError: true })
 
     debug("Success")
   } catch (err) {