diff --git a/go.mod b/go.mod index 9c705996..7b32aeee 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,6 @@ require ( github.com/tatsushid/go-prettytable v0.0.0-20141013043238-ed2d14c29939 github.com/variantdev/dag v1.1.0 go.szostok.io/version v1.2.0 - go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 golang.org/x/sync v0.5.0 golang.org/x/term v0.15.0 @@ -237,6 +236,7 @@ require ( go.opentelemetry.io/otel v1.14.0 // indirect go.opentelemetry.io/otel/trace v1.14.0 // indirect go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect + go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.15.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect diff --git a/pkg/remote/remote.go b/pkg/remote/remote.go index d7f0b666..b99277ee 100644 --- a/pkg/remote/remote.go +++ b/pkg/remote/remote.go @@ -2,6 +2,7 @@ package remote import ( "context" + "errors" "fmt" "io" "net/http" @@ -18,7 +19,6 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/hashicorp/go-getter" "github.com/hashicorp/go-getter/helper/url" - "go.uber.org/multierr" "go.uber.org/zap" "github.com/helmfile/helmfile/pkg/envvar" @@ -275,12 +275,12 @@ func (r *Remote) Fetch(path string, cacheDirOpt ...string) (string, error) { case u.Getter == "normal" && u.Scheme == "s3": err := r.S3Getter.Get(r.Home, path, cacheDirPath) if err != nil { - return "", multierr.Append(err, err) + return "", err } case u.Getter == "normal" && (u.Scheme == "https" || u.Scheme == "http"): err := r.HttpGetter.Get(r.Home, path, cacheDirPath) if err != nil { - return "", multierr.Append(err, err) + return "", err } default: if u.Getter != "" { @@ -290,7 +290,7 @@ func (r *Remote) Fetch(path string, cacheDirOpt ...string) (string, error) { if err := r.Getter.Get(r.Home, getterSrc, cacheDirPath); err != nil { rmerr := os.RemoveAll(cacheDirPath) if rmerr != nil { - return "", multierr.Append(err, rmerr) + return "", errors.Join(err, rmerr) } return "", err }