internal/cmd/update.go: handle copy error from archive

johnstcn · johnstcn · commit 6238053fe2ff · 2021-08-17T09:49:28.000Z
diff --git a/internal/cmd/update.go b/internal/cmd/update.go
@@ -145,7 +145,7 @@ func (u *updater) Run(ctx context.Context, force bool, coderURLArg string, versi
 	if !force {
 		label := fmt.Sprintf("Do you want to download version %s instead", desiredVersion)
 		if _, err := u.confirmF(label); err != nil {
-			return clog.Fatal("failed to confirm update", clog.Tipf(`use "--force" to update without confirmation`))
+			return clog.Fatal("user cancelled operation", clog.Tipf(`use "--force" to update without confirmation`))
 		}
 	}
 
@@ -383,7 +383,10 @@ func extractFromTgz(path string, archive []byte) ([]byte, error) {
 		}
 		fi := hdr.FileInfo()
 		if fi.Name() == path && fi.Mode().IsRegular() {
-			_, _ = io.Copy(bw, tr)
+			_, err = io.Copy(bw, tr)
+			if err != nil {
+				return nil, xerrors.Errorf("failed to read file %q from archive", fi.Name())
+			}
 			break
 		}
 	}
diff --git a/internal/cmd/update_test.go b/internal/cmd/update_test.go
@@ -197,7 +197,7 @@ 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 - user cancelled", err, "failed to confirm update", "")
+		assertCLIError(t, "update coder - user cancelled", err, "user cancelled operation", "")
 		assertFileContent(t, p.Fakefs, fakeExePathLinux, fakeOldVersion)
 	})
 

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func (u *updater) Run(ctx context.Context, force bool, coderURLArg string, versi`
`145`	`145`	`if !force {`
`146`	`146`	`label := fmt.Sprintf("Do you want to download version %s instead", desiredVersion)`
`147`	`147`	`if _, err := u.confirmF(label); err != nil {`
`148`		- return clog.Fatal("failed to confirm update", clog.Tipf(`use "--force" to update without confirmation`))
	`148`	+ return clog.Fatal("user cancelled operation", clog.Tipf(`use "--force" to update without confirmation`))
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
`@@ -383,7 +383,10 @@ func extractFromTgz(path string, archive []byte) ([]byte, error) {`
`383`	`383`	`}`
`384`	`384`	`fi := hdr.FileInfo()`
`385`	`385`	`if fi.Name() == path && fi.Mode().IsRegular() {`
`386`		`- _, _ = io.Copy(bw, tr)`
	`386`	`+ _, err = io.Copy(bw, tr)`
	`387`	`+ if err != nil {`
	`388`	`+ return nil, xerrors.Errorf("failed to read file %q from archive", fi.Name())`
	`389`	`+ }`
`387`	`390`	`break`
`388`	`391`	`}`
`389`	`392`	`}`