Revert "use go-multierror to combine read/write close errors"

znull · znull · commit 92609bd1ec29 · 2021-12-16T16:09:32.000-07:00
This reverts commit 456f438.
diff --git a/go.mod b/go.mod
@@ -17,7 +17,6 @@ require (
 	github.com/google/go-cmp v0.5.6
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/gorilla/websocket v1.4.2
-	github.com/hashicorp/go-multierror v1.0.0
 	github.com/hashicorp/go-version v1.3.0
 	github.com/henvic/httpretty v0.0.6
 	github.com/itchyny/gojq v0.12.6
diff --git a/go.sum b/go.sum
@@ -192,12 +192,10 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
-github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go
@@ -19,7 +19,6 @@ import (
 	"github.com/cli/cli/v2/internal/codespaces/api"
 	"github.com/cli/cli/v2/pkg/cmdutil"
 	"github.com/cli/cli/v2/pkg/liveshare"
-	"github.com/hashicorp/go-multierror"
 	"github.com/spf13/cobra"
 )
 
@@ -462,12 +461,10 @@ func (crwc *combinedReadWriteCloser) Write(p []byte) (n int, err error) {
 }
 
 func (crwc *combinedReadWriteCloser) Close() error {
-	var errs error
-	if err := crwc.writer.Close(); err != nil {
-		errs = multierror.Append(errs, err)
+	werr := crwc.writer.Close()
+	rerr := crwc.reader.Close()
+	if werr != nil {
+		return werr
 	}
-	if err := crwc.reader.Close(); err != nil {
-		errs = multierror.Append(errs, err)
-	}
-	return errs
+	return rerr
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ import (`
`19`	`19`	`"github.com/cli/cli/v2/internal/codespaces/api"`
`20`	`20`	`"github.com/cli/cli/v2/pkg/cmdutil"`
`21`	`21`	`"github.com/cli/cli/v2/pkg/liveshare"`
`22`		`- "github.com/hashicorp/go-multierror"`
`23`	`22`	`"github.com/spf13/cobra"`
`24`	`23`	`)`
`25`	`24`
`@@ -462,12 +461,10 @@ func (crwc *combinedReadWriteCloser) Write(p []byte) (n int, err error) {`
`462`	`461`	`}`
`463`	`462`
`464`	`463`	`func (crwc *combinedReadWriteCloser) Close() error {`
`465`		`- var errs error`
`466`		`- if err := crwc.writer.Close(); err != nil {`
`467`		`- errs = multierror.Append(errs, err)`
	`464`	`+ werr := crwc.writer.Close()`
	`465`	`+ rerr := crwc.reader.Close()`
	`466`	`+ if werr != nil {`
	`467`	`+ return werr`
`468`	`468`	`}`
`469`		`- if err := crwc.reader.Close(); err != nil {`
`470`		`- errs = multierror.Append(errs, err)`
`471`		`- }`
`472`		`- return errs`
	`469`	`+ return rerr`
`473`	`470`	`}`