don't use archived github.com/pkg/errors package

Signed-off-by: Tim Ramlot <[email protected]>

Author: inteon

go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/jetstack/venafi-connection-lib v0.3.2-0.20250305134451-ec1757b9e01b
 	github.com/maxatome/go-testdeep v1.14.0
 	github.com/microcosm-cc/bluemonday v1.0.27
-	github.com/pkg/errors v0.9.1
 	github.com/pmylund/go-cache v2.1.0+incompatible
 	github.com/prometheus/client_golang v1.21.0
 	github.com/spf13/cobra v1.8.1
@@ -49,6 +48,7 @@ require (
 	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/sosodev/duration v1.2.0 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect

pkg/client/client_oauth.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-multierror"
-	"github.com/pkg/errors"
 	"k8s.io/client-go/transport"
 
 	"github.com/jetstack/preflight/api"
@@ -188,25 +187,25 @@ func (c *OAuthClient) renewAccessToken(ctx context.Context) error {
 	payload.Set("password", c.credentials.UserSecret)
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, tokenURL, strings.NewReader(payload.Encode()))
 	if err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	version.SetUserAgent(req)
 
 	res, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 
 	body, err := io.ReadAll(res.Body)
 	if err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 
 	defer res.Body.Close()
 
 	if status := res.StatusCode; status < 200 || status >= 300 {
-		return errors.Errorf("auth server did not provide an access token: (status %d) %s.", status, string(body))
+		return fmt.Errorf("auth server did not provide an access token: (status %d) %s.", status, string(body))
 	}
 
 	response := struct {
@@ -216,11 +215,11 @@ func (c *OAuthClient) renewAccessToken(ctx context.Context) error {
 
 	err = json.Unmarshal(body, &response)
 	if err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 
 	if response.ExpiresIn == 0 {
-		return errors.Errorf("got wrong expiration for access token")
+		return fmt.Errorf("got wrong expiration for access token")
 	}
 
 	c.accessToken.bearer = response.Bearer

pkg/client/client_venconn.go

@@ -6,6 +6,7 @@ import (
 	"crypto/x509"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -14,7 +15,6 @@ import (
 	venapi "github.com/jetstack/venafi-connection-lib/api/v1alpha1"
 	"github.com/jetstack/venafi-connection-lib/chain/sources/venafi"
 	"github.com/jetstack/venafi-connection-lib/venafi_client"
-	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"

pkg/datagatherer/k8s/client.go

@@ -2,7 +2,6 @@
 package k8s
 
 import (
-	"github.com/pkg/errors"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
@@ -16,12 +15,12 @@ import (
 func NewDynamicClient(kubeconfigPath string) (dynamic.Interface, error) {
 	cfg, err := kubeconfig.LoadRESTConfig(kubeconfigPath)
 	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, err
 	}
 
 	cl, err := dynamic.NewForConfig(cfg)
 	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, err
 	}
 
 	return cl, nil
@@ -33,12 +32,12 @@ func NewDynamicClient(kubeconfigPath string) (dynamic.Interface, error) {
 func NewDiscoveryClient(kubeconfigPath string) (*discovery.DiscoveryClient, error) {
 	cfg, err := kubeconfig.LoadRESTConfig(kubeconfigPath)
 	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, err
 	}
 
 	discoveryClient, err := discovery.NewDiscoveryClientForConfig(cfg)
 	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, err
 	}
 
 	return discoveryClient, nil
@@ -50,12 +49,12 @@ func NewDiscoveryClient(kubeconfigPath string) (*discovery.DiscoveryClient, erro
 func NewClientSet(kubeconfigPath string) (kubernetes.Interface, error) {
 	cfg, err := kubeconfig.LoadRESTConfig(kubeconfigPath)
 	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, err
 	}
 
 	clientset, err := kubernetes.NewForConfig(cfg)
 	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, err
 	}
 
 	return clientset, nil

pkg/datagatherer/k8s/dynamic.go

@@ -2,12 +2,12 @@ package k8s
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"regexp"
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/pmylund/go-cache"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
@@ -148,7 +148,7 @@ func (c *ConfigDynamic) NewDataGatherer(ctx context.Context) (datagatherer.DataG
 	if isNativeResource(c.GroupVersionResource) {
 		clientset, err := NewClientSet(c.KubeConfigPath)
 		if err != nil {
-			return nil, errors.WithStack(err)
+			return nil, err
 		}
 
 		return c.newDataGathererWithClient(ctx, nil, clientset)
@@ -348,7 +348,7 @@ func (g *DataGathererDynamic) Fetch() (interface{}, int, error) {
 	// Redact Secret data
 	err := redactList(items, g.ExcludeAnnotKeys, g.ExcludeLabelKeys)
 	if err != nil {
-		return nil, -1, errors.WithStack(err)
+		return nil, -1, err
 	}
 
 	// add gathered resources to items
@@ -363,7 +363,7 @@ func redactList(list []*api.GatheredResource, excludeAnnotKeys, excludeLabelKeys
 			// Determine the kind of items in case this is a generic 'mixed' list.
 			gvks, _, err := scheme.Scheme.ObjectKinds(item)
 			if err != nil {
-				return errors.WithStack(err)
+				return err
 			}
 
 			resource := item
@@ -408,7 +408,7 @@ func redactList(list []*api.GatheredResource, excludeAnnotKeys, excludeLabelKeys
 			resource := item.(runtime.Object)
 			gvks, _, err := scheme.Scheme.ObjectKinds(resource)
 			if err != nil {
-				return errors.WithStack(err)
+				return err
 			}
 
 			// During the internal marshal/unmarshal the runtime.Object the metav1.TypeMeta seems to be lost

pkg/kubeconfig/kubeconfig.go

@@ -1,7 +1,6 @@
 package kubeconfig
 
 import (
-	"github.com/pkg/errors"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 )
@@ -24,7 +23,7 @@ func LoadRESTConfig(path string) (*rest.Config, error) {
 		&clientcmd.ConfigOverrides{},
 	).ClientConfig()
 	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, err
 	}
 
 	return cfg, nil