public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplify multierr usage with standard errors (#1208)

This commit is contained in:
Cyril Jouve 2023-12-10 13:04:05 +01:00 committed by GitHub
parent 9f2264ce24
commit e0f1f765c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -24,7 +24,6 @@ require (
github.com/tatsushid/go-prettytable v0.0.0-20141013043238-ed2d14c29939 github.com/tatsushid/go-prettytable v0.0.0-20141013043238-ed2d14c29939
github.com/variantdev/dag v1.1.0 github.com/variantdev/dag v1.1.0
go.szostok.io/version v1.2.0 go.szostok.io/version v1.2.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.26.0 go.uber.org/zap v1.26.0
golang.org/x/sync v0.5.0 golang.org/x/sync v0.5.0
golang.org/x/term v0.15.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 v1.14.0 // indirect
go.opentelemetry.io/otel/trace v1.14.0 // indirect go.opentelemetry.io/otel/trace v1.14.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // 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 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/api v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect

8
pkg/remote/remote.go
View File

@ -2,6 +2,7 @@ package remote
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
@ -18,7 +19,6 @@ import (
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/hashicorp/go-getter" "github.com/hashicorp/go-getter"
"github.com/hashicorp/go-getter/helper/url" "github.com/hashicorp/go-getter/helper/url"
"go.uber.org/multierr"
"go.uber.org/zap" "go.uber.org/zap"
"github.com/helmfile/helmfile/pkg/envvar" "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": case u.Getter == "normal" && u.Scheme == "s3":
err := r.S3Getter.Get(r.Home, path, cacheDirPath) err := r.S3Getter.Get(r.Home, path, cacheDirPath)
if err != nil { if err != nil {
return "", multierr.Append(err, err) return "", err
} }
case u.Getter == "normal" && (u.Scheme == "https" || u.Scheme == "http"): case u.Getter == "normal" && (u.Scheme == "https" || u.Scheme == "http"):
err := r.HttpGetter.Get(r.Home, path, cacheDirPath) err := r.HttpGetter.Get(r.Home, path, cacheDirPath)
if err != nil { if err != nil {
return "", multierr.Append(err, err) return "", err
} }
default: default:
if u.Getter != "" { 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 { if err := r.Getter.Get(r.Home, getterSrc, cacheDirPath); err != nil {
rmerr := os.RemoveAll(cacheDirPath) rmerr := os.RemoveAll(cacheDirPath)
if rmerr != nil { if rmerr != nil {
return "", multierr.Append(err, rmerr) return "", errors.Join(err, rmerr)
} }
return "", err return "", err
} }