Replace 'github.com/pkg/errors' with 'errors' (#8259)

Remove github.com/pkg/errors dependency

Author: alexandear

docs/guidelines/design-conventions.md

@@ -25,7 +25,7 @@ General conventions followed when developing in eksctl:
     - i.e. no dots, ellipsis or semicolons
   - do not write long log messages, try to break up into two if extra information is needed
 
-- use `errors.Wrapf` to wrap errors
+- use `fmt.Errorf` with `%w` to wrap errors
   - avoid wrapping errors that are already meaningful
 
 - we use Kris Nova's logger, this may change in the future and we should probably abstract it

go.mod

@@ -55,7 +55,6 @@ require (
 	github.com/orcaman/concurrent-map v1.0.0
 	github.com/otiai10/copy v1.14.1
 	github.com/pelletier/go-toml v1.9.5
-	github.com/pkg/errors v0.9.1
 	github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b
 	github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522
 	github.com/sethvargo/go-password v0.3.1
@@ -335,6 +334,7 @@ require (
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pkg/sftp v1.13.7 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/polyfloyd/go-errorlint v1.7.1 // indirect

pkg/actions/nodegroup/upgrade.go

@@ -2,6 +2,7 @@ package nodegroup
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -16,7 +17,6 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/eks"
 	"github.com/blang/semver/v4"
 	"github.com/kris-nova/logger"
-	"github.com/pkg/errors"
 
 	"github.com/weaveworks/eksctl/pkg/goformation"
 	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
@@ -59,7 +59,7 @@ func (m *Manager) Upgrade(ctx context.Context, options UpgradeOptions) error {
 
 	if options.KubernetesVersion != "" {
 		if _, err := semver.ParseTolerant(options.KubernetesVersion); err != nil {
-			return errors.Wrap(err, "invalid Kubernetes version")
+			return fmt.Errorf("invalid Kubernetes version: %w", err)
 		}
 	}
 
@@ -130,7 +130,7 @@ func (m *Manager) upgradeUsingAPI(ctx context.Context, options UpgradeOptions, n
 			// Use the current Kubernetes version
 			version, err := semver.ParseTolerant(*nodegroup.Version)
 			if err != nil {
-				return errors.Wrapf(err, "unexpected error parsing Kubernetes version %q", *nodegroup.Version)
+				return fmt.Errorf("unexpected error parsing Kubernetes version %q: %w", *nodegroup.Version, err)
 			}
 			input.Version = aws.String(fmt.Sprintf("%v.%v", version.Major, version.Minor))
 		}
@@ -183,12 +183,12 @@ func (m *Manager) upgradeUsingStack(ctx context.Context, options UpgradeOptions,
 		NodeGroupName: options.NodegroupName,
 	})
 	if err != nil {
-		return errors.Wrap(err, "error fetching nodegroup template")
+		return fmt.Errorf("error fetching nodegroup template: %w", err)
 	}
 
 	stack, err := goformation.ParseJSON([]byte(template))
 	if err != nil {
-		return errors.Wrap(err, "unexpected error parsing nodegroup template")
+		return fmt.Errorf("unexpected error parsing nodegroup template: %w", err)
 	}
 
 	ngResources := stack.GetAllEKSNodegroupResources()
@@ -204,7 +204,7 @@ func (m *Manager) upgradeUsingStack(ctx context.Context, options UpgradeOptions,
 		}
 
 		if err := m.stackManager.UpdateNodeGroupStack(ctx, options.NodegroupName, string(bytes), true); err != nil {
-			return errors.Wrap(err, "error updating nodegroup stack")
+			return fmt.Errorf("error updating nodegroup stack: %w", err)
 		}
 		return nil
 	}
@@ -258,7 +258,7 @@ func (m *Manager) upgradeUsingStack(ctx context.Context, options UpgradeOptions,
 			// Use the current Kubernetes version
 			version, err := semver.ParseTolerant(*nodegroup.Version)
 			if err != nil {
-				return errors.Wrapf(err, "unexpected error parsing Kubernetes version %q", *nodegroup.Version)
+				return fmt.Errorf("unexpected error parsing Kubernetes version %q: %w", *nodegroup.Version, err)
 			}
 			kubernetesVersion = fmt.Sprintf("%v.%v", version.Major, version.Minor)
 		}
@@ -333,7 +333,7 @@ func (m *Manager) requiresStackUpdate(ctx context.Context, nodeGroupName string)
 
 	curVer, err := version.ParseEksctlVersion(version.GetVersion())
 	if err != nil {
-		return false, errors.Wrap(err, "unexpected error parsing current eksctl version")
+		return false, fmt.Errorf("unexpected error parsing current eksctl version: %w", err)
 	}
 	return !ver.EQ(curVer), nil
 }
@@ -385,7 +385,7 @@ func (m *Manager) usesCustomAMIEKSNodeGroup(ctx context.Context, ng *ekstypes.No
 func (m *Manager) usesCustomAMI(ctx context.Context, lt *api.LaunchTemplate) (bool, error) {
 	customLaunchTemplate, err := m.launchTemplateFetcher.Fetch(ctx, lt)
 	if err != nil {
-		return false, errors.Wrap(err, "error fetching launch template data")
+		return false, fmt.Errorf("error fetching launch template data: %w", err)
 	}
 	return customLaunchTemplate.ImageId != nil, nil
 }

pkg/actions/podidentityassociation/iam_role_updater.go

@@ -2,14 +2,14 @@ package podidentityassociation
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"slices"
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	cfntypes "github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 	"github.com/kris-nova/logger"
-	"github.com/pkg/errors"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"

pkg/addons/default/addons.go

@@ -11,7 +11,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/kris-nova/logger"
-	"github.com/pkg/errors"
 
 	"github.com/weaveworks/eksctl/pkg/kubernetes"
 )
@@ -93,7 +92,7 @@ func makeGetError[T any](resource *T, err error, resourceName string) (*T, error
 func newList(data []byte) (*metav1.List, error) {
 	list, err := kubernetes.NewList(data)
 	if err != nil {
-		return nil, errors.Wrapf(err, "loading individual resources from manifest")
+		return nil, fmt.Errorf("loading individual resources from manifest: %w", err)
 	}
 	return list, nil
 }

pkg/addons/default/coredns.go

@@ -3,12 +3,12 @@ package defaultaddons
 import (
 	"context"
 	"embed"
+	"errors"
 	"fmt"
 	"regexp"
 	"strings"
 
 	"github.com/kris-nova/logger"
-	"github.com/pkg/errors"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -42,7 +42,7 @@ func UpdateCoreDNS(ctx context.Context, input AddonInput, plan bool) (bool, erro
 			logger.Warning("%q service was not found", KubeDNS)
 			return false, nil
 		}
-		return false, errors.Wrapf(err, "getting %q service", KubeDNS)
+		return false, fmt.Errorf("getting %q service: %w", KubeDNS, err)
 	}
 
 	kubeDNSDeployment, err := input.RawClient.ClientSet().AppsV1().Deployments(metav1.NamespaceSystem).Get(ctx, CoreDNS, metav1.GetOptions{})
@@ -51,7 +51,7 @@ func UpdateCoreDNS(ctx context.Context, input AddonInput, plan bool) (bool, erro
 			logger.Warning("%q was not found", CoreDNS)
 			return false, nil
 		}
-		return false, errors.Wrapf(err, "getting %q", CoreDNS)
+		return false, fmt.Errorf("getting %q: %w", CoreDNS, err)
 	}
 
 	// if Deployment is present, go through our list of assets

pkg/addons/device_plugin.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	// For go:embed
 	_ "embed"
+	"errors"
 	"fmt"
 	"time"
 
 	"github.com/kris-nova/logger"
-	"github.com/pkg/errors"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/kubernetes"
@@ -87,14 +87,14 @@ type DevicePlugin interface {
 func applyDevicePlugin(dp DevicePlugin) error {
 	list, err := kubernetes.NewList(dp.Manifest())
 	if err != nil {
-		return errors.Wrap(err, "creating list from device plugin manifest")
+		return fmt.Errorf("creating list from device plugin manifest: %w", err)
 	}
 
 	rawClient := dp.RawClient()
 	for _, rawObj := range list.Items {
 		rawResource, err := rawClient.NewRawResource(rawObj.Object)
 		if err != nil {
-			return errors.Wrap(err, "creating raw resource from list item")
+			return fmt.Errorf("creating raw resource from list item: %w", err)
 		}
 		switch rawResource.GVK.Kind {
 		case "DaemonSet":
@@ -103,23 +103,23 @@ func applyDevicePlugin(dp DevicePlugin) error {
 				return &typeAssertionError{&appsv1.DaemonSet{}, rawResource}
 			}
 			if err := dp.SetImage(&daemonSet.Spec.Template); err != nil {
-				return errors.Wrap(err, "setting image of device plugin daemonset")
+				return fmt.Errorf("setting image of device plugin daemonset: %w", err)
 			}
 			if err := dp.SetTolerations(&daemonSet.Spec.Template); err != nil {
-				return errors.Wrap(err, "adding tolerations to device plugin daemonset")
+				return fmt.Errorf("adding tolerations to device plugin daemonset: %w", err)
 			}
 			msg, err := rawResource.CreateOrReplace(dp.PlanMode())
 			if err != nil {
-				return errors.Wrap(err, "calling create or replace on raw device plugin daemonset")
+				return fmt.Errorf("calling create or replace on raw device plugin daemonset: %w", err)
 			}
 			logger.Info(msg)
 			if err := watchDaemonSetReady(dp.RawClient().ClientSet().AppsV1().DaemonSets(daemonSet.Namespace), daemonSet.Name); err != nil {
-				return errors.Wrap(err, "waiting for device plugin daemonset to become ready")
+				return fmt.Errorf("waiting for device plugin daemonset to become ready: %w", err)
 			}
 		default:
 			status, err := rawResource.CreateOrReplace(dp.PlanMode())
 			if err != nil {
-				return errors.Wrap(err, "calling create or replace on raw device plugin rawResource")
+				return fmt.Errorf("calling create or replace on raw device plugin rawResource: %w", err)
 			}
 			logger.Info(status)
 		}

pkg/addons/irsa_helper.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/pkg/errors"
-
 	"github.com/weaveworks/eksctl/pkg/actions/irsa"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/manager"
@@ -40,7 +38,7 @@ func NewIRSAHelper(oidc *iamoidc.OpenIDConnectManager, stackManager manager.Stac
 func (h *irsaHelper) IsSupported(ctx context.Context) (bool, error) {
 	exists, err := h.oidc.CheckProviderExists(ctx)
 	if err != nil {
-		return false, errors.Wrapf(err, "error checking OIDC provider")
+		return false, fmt.Errorf("error checking OIDC provider: %w", err)
 	}
 	return exists, nil
 }
@@ -52,7 +50,7 @@ func (h *irsaHelper) CreateOrUpdate(ctx context.Context, sa *api.ClusterIAMServi
 	stack, err := h.stackManager.DescribeStack(ctx, &manager.Stack{StackName: &name})
 	if err != nil {
 		if !manager.IsStackDoesNotExistError(err) {
-			return errors.Wrapf(err, "error checking if iamserviceaccount %s/%s exists", sa.Namespace, sa.Name)
+			return fmt.Errorf("error checking if iamserviceaccount %s/%s exists: %w", sa.Namespace, sa.Name, err)
 		}
 	}
 	if stack == nil {

pkg/addons/vpc_controller.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	// For go:embed
 	_ "embed"
+	"errors"
 	"fmt"
 	"time"
 
 	"github.com/cloudflare/cfssl/csr"
 	"github.com/kris-nova/logger"
-	"github.com/pkg/errors"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/assetutil"
@@ -130,7 +130,7 @@ func (v *VPCController) generateCert() error {
 
 	csrPEM, privateKey, err := generateCertReq(webhookServiceName, vpcControllerNamespace)
 	if err != nil {
-		return errors.Wrap(err, "generating CSR")
+		return fmt.Errorf("generating CSR: %w", err)
 	}
 
 	manifest := vpcAdmissionWebhookCsrYaml
@@ -148,7 +148,7 @@ func (v *VPCController) generateCert() error {
 	certificateSigningRequest.Name = csrName
 
 	if err := v.applyRawResource(certificateSigningRequest); err != nil {
-		return errors.Wrap(err, "creating CertificateSigningRequest")
+		return fmt.Errorf("creating CertificateSigningRequest: %w", err)
 	}
 
 	certificateSigningRequest.Status.Conditions = []certsv1beta1.CertificateSigningRequestCondition{
@@ -161,7 +161,7 @@ func (v *VPCController) generateCert() error {
 	}
 
 	if _, err := csrClientSet.UpdateApproval(context.TODO(), certificateSigningRequest, metav1.UpdateOptions{}); err != nil {
-		return errors.Wrap(err, "updating approval")
+		return fmt.Errorf("updating approval: %w", err)
 	}
 
 	logger.Info("waiting for certificate to be available")
@@ -227,7 +227,7 @@ func (v *VPCController) createCertSecrets(key, cert []byte) error {
 
 	err := v.applyRawResource(secret)
 	if err != nil {
-		return errors.Wrap(err, "error creating secret")
+		return fmt.Errorf("error creating secret: %w", err)
 	}
 	return err
 }
@@ -266,7 +266,7 @@ func (v *VPCController) deployVPCResourceController(ctx context.Context) error {
 			AttachPolicy: makePolicyDocument(),
 		}
 		if err := v.irsa.CreateOrUpdate(ctx, sa); err != nil {
-			return errors.Wrap(err, "error enabling IRSA")
+			return fmt.Errorf("error enabling IRSA: %w", err)
 		}
 	} else {
 		// If an OIDC provider isn't associated with the cluster, the VPC controller relies on the managed policy

pkg/apis/eksctl.io/v1alpha5/identity_provider.go

@@ -2,9 +2,8 @@ package v1alpha5
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
-
-	"github.com/pkg/errors"
 )
 
 type IdentityProviderType string

pkg/apis/eksctl.io/v1alpha5/identitymapping.go

@@ -1,7 +1,7 @@
 package v1alpha5
 
 import (
-	"github.com/pkg/errors"
+	"errors"
 )
 
 // IAMIdentityMapping contains IAM accounts, users, roles and services that will be added to the

pkg/apis/eksctl.io/v1alpha5/vpc.go

@@ -2,14 +2,14 @@ package v1alpha5
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net"
 	"reflect"
 
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/pkg/errors"
 
 	"github.com/weaveworks/eksctl/pkg/utils/ipnet"
 )