internal/cmd/update.go: handle windows-specific behaviours

johnstcn · johnstcn · commit 24df4f71e43a · 2021-08-17T09:49:59.000Z
diff --git a/internal/cmd/update.go b/internal/cmd/update.go
@@ -208,22 +208,42 @@ func (u *updater) Run(ctx context.Context, force bool, coderURLArg string, versi
 
 	_ = updatedBin.Close()
 
+	if err := u.doUpdate(ctx, updatedCoderBinaryPath); err != nil {
+		return clog.Fatal("failed to update coder binary", clog.Causef(err.Error()))
+	}
+
+	clog.LogSuccess("Updated coder CLI to version " + desiredVersion.String())
+	return nil
+}
+
+func (u *updater) doUpdate(ctx context.Context, updatedCoderBinaryPath string) error {
+	var err error
+	// TODO(cian): on Windows, we must do two things differnetly:
+	// 1) Calling the updated binary fails due to the xterminal.MakeOutputRaw call in main; skipping this check on Windows.
+	// 2) We must rename the currently running binary before renaming the new binary
+	if u.osF() == goosWindows {
+		err = u.fs.Rename(u.executablePath, updatedCoderBinaryPath+".old")
+		if err != nil {
+			return xerrors.Errorf("windows: rename current coder binary: %w", err)
+		}
+		err = u.fs.Rename(updatedCoderBinaryPath, u.executablePath)
+		if err != nil {
+			return xerrors.Errorf("windows: rename updated coder binary: %w", err)
+		}
+		return nil
+	}
+
 	// validate that we can execute the new binary before overwriting
 	updatedVersionOutput, err := u.execF(ctx, updatedCoderBinaryPath, "--version")
 	if err != nil {
-		return clog.Fatal("failed to check version of updated coder binary",
-			clog.BlankLine,
-			fmt.Sprintf("output: %q", string(updatedVersionOutput)),
-			clog.Causef(err.Error()))
+		return xerrors.Errorf("check version of updated coder binary: %w", err)
 	}
-
 	clog.LogInfo(fmt.Sprintf("updated binary reports %s", bytes.TrimSpace(updatedVersionOutput)))
 
 	if err = u.fs.Rename(updatedCoderBinaryPath, u.executablePath); err != nil {
-		return clog.Fatal("failed to update coder binary in-place", clog.Causef(err.Error()))
+		return xerrors.Errorf("update coder binary in-place: %w", err)
 	}
 
-	clog.LogSuccess("Updated coder CLI to version " + desiredVersion.String())
 	return nil
 }
 
diff --git a/internal/cmd/update_test.go b/internal/cmd/update_test.go
@@ -345,11 +345,25 @@ func Test_updater_run(t *testing.T) {
 		u := fromParams(p)
 		assertFileContent(t, p.Fakefs, fakeExePathLinux, fakeOldVersion)
 		err := u.Run(p.Ctx, false, fakeCoderURL, "")
-		assertCLIError(t, "update coder - cannot exec new binary", err, "failed to check version of updated coder binary", "")
+		assertCLIError(t, "update coder - cannot exec new binary", err, "failed to update coder binary", fakeError.Error())
 		assertFileContent(t, p.Fakefs, fakeExePathLinux, fakeOldVersion)
 	})
 
 	if runtime.GOOS == goosWindows {
+		run(t, "update coder - windows", func(t *testing.T, p *params) {
+			fakeFile(t, p.Fakefs, fakeExePathWindows, 0755, fakeOldVersion)
+			p.HTTPClient.M[apiPrivateVersionURL] = newFakeGetterResponse([]byte(fakeNewVersionJSON), 200, variadicS(), nil)
+			p.HTTPClient.M[fakeGithubReleaseURL] = newFakeGetterResponse([]byte(fakeGithubReleaseJSON), 200, variadicS(), nil)
+			p.HTTPClient.M[fakeAssetURLLinux] = newFakeGetterResponse(fakeValidTgzBytes, 200, variadicS(), nil)
+			p.VersionF = func() string { return fakeOldVersion }
+			p.ConfirmF = fakeConfirmYes
+			p.OsF = func() string { return goosWindows }
+			u := fromParams(p)
+			assertFileContent(t, p.Fakefs, fakeExePathWindows, fakeOldVersion)
+			err := u.Run(p.Ctx, false, fakeCoderURL, "")
+			assertCLIError(t, "update coder - cannot exec new binary", err, "failed to update coder binary", fakeError.Error())
+			assertFileContent(t, p.Fakefs, fakeExePathWindows, fakeOldVersion)
+		})
 		run(t, "update coder - path blocklist - windows", func(t *testing.T, p *params) {
 			p.ExecutablePath = `C:\Windows\system32\coder.exe`
 			u := fromParams(p)
