From 065e2eb3ebc6c97392075f0d47200d708acd5c9e Mon Sep 17 00:00:00 2001 From: Justen Stall <39888103+justenstall@users.noreply.github.com> Date: Mon, 21 Apr 2025 12:17:50 -0400 Subject: [PATCH] updates after merge conflict resolution Signed-off-by: Justen Stall <39888103+justenstall@users.noreply.github.com> --- go.mod | 4 +--- go.sum | 5 ----- pkg/action/hooks.go | 5 ++--- pkg/action/install.go | 8 ++++---- pkg/lint/rules/chartfile.go | 2 +- pkg/postrender/exec.go | 2 +- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 912d382bc..7474584bc 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,6 @@ require ( github.com/gobwas/glob v0.2.3 github.com/gofrs/flock v0.12.1 github.com/gosuri/uitable v0.0.4 - github.com/hashicorp/go-multierror v1.1.1 github.com/jmoiron/sqlx v1.4.0 github.com/lib/pq v1.10.9 github.com/mattn/go-shellwords v1.0.12 @@ -27,7 +26,6 @@ require ( github.com/moby/term v0.5.2 github.com/opencontainers/image-spec v1.1.1 github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 - github.com/pkg/errors v0.9.1 github.com/rubenv/sql-migrate v1.8.0 github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 github.com/spf13/cobra v1.9.1 @@ -95,7 +93,6 @@ require ( github.com/gorilla/websocket v1.5.3 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect - github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect github.com/huandu/xstrings v1.5.0 // indirect @@ -122,6 +119,7 @@ require ( github.com/onsi/gomega v1.36.2 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect diff --git a/go.sum b/go.sum index ea10b6adc..60866b9a9 100644 --- a/go.sum +++ b/go.sum @@ -162,11 +162,6 @@ github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJr github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU= github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= -github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/golang-lru/arc/v2 v2.0.5 h1:l2zaLDubNhW4XO3LnliVj0GXO3+/CGNJAg1dcN2Fpfw= github.com/hashicorp/golang-lru/arc/v2 v2.0.5/go.mod h1:ny6zBSQZi2JxIeYcv7kt2sH2PXJtirBN7RDhRpxPkxU= github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvHgwfx2Vm4= diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go index 0ef00a832..8db0d51f8 100644 --- a/pkg/action/hooks.go +++ b/pkg/action/hooks.go @@ -23,7 +23,6 @@ import ( "sort" "time" - "github.com/pkg/errors" "helm.sh/helm/v4/pkg/kube" "gopkg.in/yaml.v3" @@ -88,7 +87,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent, waiter, err := cfg.KubeClient.GetWaiter(waitStrategy) if err != nil { - return errors.Wrapf(err, "unable to get waiter") + return fmt.Errorf("unable to get waiter: %w", err) } // Watch hook resources until they have completed err = waiter.WatchUntilReady(resources, timeout) @@ -238,7 +237,7 @@ func (cfg *Configuration) deriveNamespace(h *release.Hook, namespace string) (st }{} err := yaml.Unmarshal([]byte(h.Manifest), &tmp) if err != nil { - return "", errors.Wrapf(err, "unable to parse metadata.namespace from kubernetes manifest for output logs hook %s", h.Path) + return "", fmt.Errorf("unable to parse metadata.namespace from kubernetes manifest for output logs hook %s: %w", h.Path, err) } if tmp.Metadata.Namespace == "" { return namespace, nil diff --git a/pkg/action/install.go b/pkg/action/install.go index 0ea5efb81..68e4ccdb8 100644 --- a/pkg/action/install.go +++ b/pkg/action/install.go @@ -184,7 +184,7 @@ func (i *Install) installCRDs(crds []chart.CRD) error { if len(totalItems) > 0 { waiter, err := i.cfg.KubeClient.GetWaiter(i.WaitStrategy) if err != nil { - return errors.Wrapf(err, "unable to get waiter") + return fmt.Errorf("unable to get waiter: %w", err) } // Give time for the CRD to be recognized. if err := waiter.Wait(totalItems, 60*time.Second); err != nil { @@ -240,7 +240,7 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma if !i.ClientOnly { if err := i.cfg.KubeClient.IsReachable(); err != nil { slog.Error(fmt.Sprintf("cluster reachability check failed: %v", err)) - return nil, errors.Wrap(err, "cluster reachability check failed") + return nil, fmt.Errorf("cluster reachability check failed: %w", err) } } @@ -252,12 +252,12 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma if err := i.availableName(); err != nil { slog.Error("release name check failed", slog.Any("error", err)) - return nil, errors.Wrap(err, "release name check failed") + return nil, fmt.Errorf("release name check failed: %w", err) } if err := chartutil.ProcessDependencies(chrt, vals); err != nil { slog.Error("chart dependencies processing failed", slog.Any("error", err)) - return nil, errors.Wrap(err, "chart dependencies processing failed") + return nil, fmt.Errorf("chart dependencies processing failed: %w", err) } var interactWithRemote bool diff --git a/pkg/lint/rules/chartfile.go b/pkg/lint/rules/chartfile.go index 94dae78fa..724c3f2ea 100644 --- a/pkg/lint/rules/chartfile.go +++ b/pkg/lint/rules/chartfile.go @@ -107,7 +107,7 @@ func validateChartYamlFormat(chartFileError error) error { func validateChartYamlStrictFormat(chartFileError error) error { if chartFileError != nil { - return errors.Errorf("failed to strictly parse chart metadata file\n\t%s", chartFileError.Error()) + return fmt.Errorf("failed to strictly parse chart metadata file\n\t%w", chartFileError) } return nil } diff --git a/pkg/postrender/exec.go b/pkg/postrender/exec.go index 3a6e20b82..16d9c09ce 100644 --- a/pkg/postrender/exec.go +++ b/pkg/postrender/exec.go @@ -66,7 +66,7 @@ func (p *execRender) Run(renderedManifests *bytes.Buffer) (*bytes.Buffer, error) // If the binary returned almost nothing, it's likely that it didn't // successfully render anything if len(bytes.TrimSpace(postRendered.Bytes())) == 0 { - return nil, errors.Errorf("post-renderer %q produced empty output", p.binaryPath) + return nil, fmt.Errorf("post-renderer %q produced empty output", p.binaryPath) } return postRendered, nil