use go-multierror to combine read/write close errors

znull · znull · commit 456f4381e02a · 2021-12-15T14:20:41.000-07:00
diff --git a/go.mod b/go.mod
@@ -17,6 +17,7 @@ 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,10 +192,12 @@ 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
@@ -16,6 +16,7 @@ import (
 	"github.com/cli/cli/v2/internal/codespaces"
 	"github.com/cli/cli/v2/pkg/cmdutil"
 	"github.com/cli/cli/v2/pkg/liveshare"
+	"github.com/hashicorp/go-multierror"
 	"github.com/spf13/cobra"
 )
 
@@ -299,10 +300,12 @@ func (crwc *combinedReadWriteCloser) Write(p []byte) (n int, err error) {
 }
 
 func (crwc *combinedReadWriteCloser) Close() error {
-	werr := crwc.writer.Close()
-	rerr := crwc.reader.Close()
-	if werr {
-		return werr
+	var errs error
+	if err := crwc.writer.Close(); err != nil {
+		errs = multierror.Append(errs, err)
 	}
-	return rerr
+	if err := crwc.reader.Close(); err != nil {
+		errs = multierror.Append(errs, err)
+	}
+	return errs
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import (`
`16`	`16`	`"github.com/cli/cli/v2/internal/codespaces"`
`17`	`17`	`"github.com/cli/cli/v2/pkg/cmdutil"`
`18`	`18`	`"github.com/cli/cli/v2/pkg/liveshare"`
	`19`	`+ "github.com/hashicorp/go-multierror"`
`19`	`20`	`"github.com/spf13/cobra"`
`20`	`21`	`)`
`21`	`22`
`@@ -299,10 +300,12 @@ func (crwc *combinedReadWriteCloser) Write(p []byte) (n int, err error) {`
`299`	`300`	`}`
`300`	`301`
`301`	`302`	`func (crwc *combinedReadWriteCloser) Close() error {`
`302`		`- werr := crwc.writer.Close()`
`303`		`- rerr := crwc.reader.Close()`
`304`		`- if werr {`
`305`		`- return werr`
	`303`	`+ var errs error`
	`304`	`+ if err := crwc.writer.Close(); err != nil {`
	`305`	`+ errs = multierror.Append(errs, err)`
`306`	`306`	`}`
`307`		`- return rerr`
	`307`	`+ if err := crwc.reader.Close(); err != nil {`
	`308`	`+ errs = multierror.Append(errs, err)`
	`309`	`+ }`
	`310`	`+ return errs`
`308`	`311`	`}`