Merge pull request #259 from zerospiel/fix_err_join

Fix erroneous `errors.Join` usage
Mirantis · Sep 4, 2024 · 5683fbf · 5683fbf
2 parents d9cfcd3 + b7d3c75
commit 5683fbf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/go.mod b/go.mod
@@ -13,7 +13,6 @@ require (
 	github.com/onsi/ginkgo/v2 v2.20.2
 	github.com/onsi/gomega v1.34.2
 	github.com/opencontainers/go-digest v1.0.1-0.20231025023718-d50d2fec9c98
-	github.com/pkg/errors v0.9.1
 	github.com/segmentio/analytics-go v3.1.0+incompatible
 	helm.sh/helm/v3 v3.15.4
 	k8s.io/api v0.31.0
@@ -115,6 +114,7 @@ require (
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.20.0 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.55.0 // indirect

diff --git a/internal/controller/management_controller.go b/internal/controller/management_controller.go
@@ -107,13 +107,13 @@ func (r *ManagementReconciler) Update(ctx context.Context, management *hmc.Manag
 		if err != nil {
 			errMsg := fmt.Sprintf("Failed to get Template %s/%s: %s", hmc.TemplatesNamespace, component.Template, err)
 			updateComponentsStatus(detectedComponents, &detectedProviders, component.Template, template.Status, errMsg)
-			errs = errors.Join(errors.New(errMsg))
+			errs = errors.Join(errs, errors.New(errMsg))
 			continue
 		}
 		if !template.Status.Valid {
 			errMsg := fmt.Sprintf("Template %s/%s is not marked as valid", hmc.TemplatesNamespace, component.Template)
 			updateComponentsStatus(detectedComponents, &detectedProviders, component.Template, template.Status, errMsg)
-			errs = errors.Join(errors.New(errMsg))
+			errs = errors.Join(errs, errors.New(errMsg))
 			continue
 		}
 
@@ -122,7 +122,7 @@ func (r *ManagementReconciler) Update(ctx context.Context, management *hmc.Manag
 		if err != nil {
 			errMsg := fmt.Sprintf("error reconciling HelmRelease %s/%s: %s", management.Namespace, component.Template, err)
 			updateComponentsStatus(detectedComponents, &detectedProviders, component.Template, template.Status, errMsg)
-			errs = errors.Join(errors.New(errMsg))
+			errs = errors.Join(errs, errors.New(errMsg))
 			continue
 		}
 		updateComponentsStatus(detectedComponents, &detectedProviders, component.Template, template.Status, "")
@@ -132,7 +132,8 @@ func (r *ManagementReconciler) Update(ctx context.Context, management *hmc.Manag
 	management.Status.AvailableProviders = detectedProviders
 	management.Status.Components = detectedComponents
 	if err := r.Status().Update(ctx, management); err != nil {
-		errs = errors.Join(fmt.Errorf("failed to update status for Management %s/%s: %w", management.Namespace, management.Name, err))
+		errs = errors.Join(errs, fmt.Errorf("failed to update status for Management %s/%s: %w",
+			management.Namespace, management.Name, err))
 	}
 	if errs != nil {
 		l.Error(errs, "Multiple errors during Management reconciliation")
@@ -282,8 +283,8 @@ func updateComponentsStatus(
 	providers *hmc.Providers,
 	componentName string,
 	templateStatus hmc.TemplateStatus,
-	err string) {
-
+	err string,
+) {
 	components[componentName] = hmc.ComponentStatus{
 		Error:   err,
 		Success: err == "",

diff --git a/internal/controller/release_controller.go b/internal/controller/release_controller.go
@@ -17,13 +17,13 @@ package controller
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"time"
 
 	hcv2 "github.com/fluxcd/helm-controller/api/v2"
 	"github.com/fluxcd/pkg/apis/meta"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
-	"github.com/pkg/errors"
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chartutil"
 	"helm.sh/helm/v3/pkg/storage/driver"

diff --git a/internal/utils/kube.go b/internal/utils/kube.go
@@ -35,11 +35,11 @@ func EnsureDeleteAllOf(ctx context.Context, cl client.Client, gvk schema.GroupVe
 	for _, item := range itemsList.Items {
 		if item.DeletionTimestamp.IsZero() {
 			if err := cl.Delete(ctx, &item); err != nil && !apierrors.IsNotFound(err) {
-				errs = errors.Join(err)
+				errs = errors.Join(errs, err)
 				continue
 			}
 		}
-		errs = errors.Join(fmt.Errorf("waiting for %s %s/%s removal", gvk.Kind, item.Namespace, item.Name))
+		errs = errors.Join(errs, fmt.Errorf("waiting for %s %s/%s removal", gvk.Kind, item.Namespace, item.Name))
 	}
 	return errs
 }
diff --git a/internal/webhook/deployment_webhook.go b/internal/webhook/deployment_webhook.go
@@ -37,9 +37,7 @@ type DeploymentValidator struct {
 	client.Client
 }
 
-var (
-	InvalidDeploymentErr = errors.New("the deployment is invalid")
-)
+var InvalidDeploymentErr = errors.New("the deployment is invalid")
 
 func (v *DeploymentValidator) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	v.Client = mgr.GetClient()