Bump dependencies for v2.11 (#414)

Author: pmatseykanets

cliclient/cliclient.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"strings"
 
-	errorsPkg "github.com/pkg/errors"
 	"github.com/rancher/cli/config"
 	"github.com/rancher/norman/clientbase"
 	ntypes "github.com/rancher/norman/types"
@@ -120,7 +119,7 @@ func (mc *MasterClient) newClusterClient() error {
 	cc, err := clusterClient.NewClient(options)
 	if err != nil {
 		if clientbase.IsNotFound(err) {
-			err = errorsPkg.WithMessage(err, "Current cluster not available, try running `rancher context switch`. Error")
+			err = fmt.Errorf("current cluster not available, try running `rancher context switch`: %w", err)
 		}
 		return err
 	}
@@ -137,7 +136,7 @@ func (mc *MasterClient) newProjectClient() error {
 	pc, err := projectClient.NewClient(options)
 	if err != nil {
 		if clientbase.IsNotFound(err) {
-			err = errorsPkg.WithMessage(err, "Current project not available, try running `rancher context switch`. Error")
+			err = fmt.Errorf("current project not available, try running `rancher context switch: %w", err)
 		}
 		return err
 	}

cmd/common.go

@@ -6,6 +6,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/pem"
+	"errors"
 	"fmt"
 	"io"
 	"math/rand"
@@ -23,7 +24,6 @@ import (
 	"unicode"
 
 	"github.com/ghodss/yaml"
-	"github.com/pkg/errors"
 	"github.com/rancher/cli/cliclient"
 	"github.com/rancher/cli/config"
 	"github.com/rancher/norman/clientbase"
@@ -266,7 +266,7 @@ func verifyCert(caCert []byte) (string, error) {
 	block, _ := pem.Decode(caCert)
 
 	if nil == block {
-		return "", errors.New("No cert was found")
+		return "", errors.New("no cert was found")
 	}
 
 	parsedCert, err := x509.ParseCertificate(block.Bytes)
@@ -275,7 +275,7 @@ func verifyCert(caCert []byte) (string, error) {
 	}
 
 	if !parsedCert.IsCA {
-		return "", errors.New("CACerts is not valid")
+		return "", errors.New("caCerts is not valid")
 	}
 	return string(caCert), nil
 }

cmd/kubectl_token_oauth.go

@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/pkg/errors"
 	apiv3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3"
 	managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3"
 	"golang.org/x/oauth2"
@@ -53,7 +52,7 @@ func newOauthConfig(provider TypedProvider) (*oauth2.Config, error) {
 	case *apiv3.AzureADProvider:
 		oauthProvider = p.OAuthProvider
 	default:
-		return nil, errors.New("provider is not a supported OAuth provider")
+		return nil, fmt.Errorf("provider %s is not a supported OAuth provider", provider.GetType())
 	}
 
 	return &oauth2.Config{

cmd/namespace.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/pkg/errors"
 	"github.com/rancher/cli/cliclient"
 	clusterClient "github.com/rancher/rancher/pkg/client/generated/cluster/v3"
 	"github.com/urfave/cli"
@@ -200,7 +199,7 @@ func namespaceMove(ctx *cli.Context) error {
 	}
 
 	if anno, ok := namespace.Annotations["cattle.io/appIds"]; ok && anno != "" {
-		return errors.Errorf("Namespace %v cannot be moved", namespace.Name)
+		return fmt.Errorf("namespace %s cannot be moved", namespace.Name)
 	}
 
 	if _, ok := namespace.Actions["move"]; ok {

cmd/server.go

@@ -2,14 +2,14 @@ package cmd
 
 import (
 	"bufio"
+	"errors"
 	"fmt"
 	"io"
 	"os"
 	"sort"
 	"strconv"
 	"strings"
 
-	"github.com/pkg/errors"
 	"github.com/rancher/cli/config"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
@@ -98,7 +98,7 @@ func serverCurrent(out io.Writer, cfg *config.Config) error {
 
 	currentServer, found := cfg.Servers[serverName]
 	if !found {
-		return errors.New("Current server not set")
+		return errors.New("current server not set")
 	}
 
 	fmt.Fprintf(out, "Name: %s URL: %s\n", serverName, currentServer.URL)
@@ -109,7 +109,7 @@ func serverCurrent(out io.Writer, cfg *config.Config) error {
 func serverDelete(cfg *config.Config, serverName string) error {
 	_, ok := cfg.Servers[serverName]
 	if !ok {
-		return errors.New("Server not found")
+		return errors.New("server not found")
 	}
 	delete(cfg.Servers, serverName)
 
@@ -152,7 +152,7 @@ func serverLs(out io.Writer, cfg *config.Config, format string) error {
 func serverSwitch(cf *config.Config, serverName string) error {
 	_, ok := cf.Servers[serverName]
 	if !ok {
-		return errors.New("Server not found")
+		return errors.New("server not found")
 	}
 
 	if len(cf.Servers[serverName].Project) == 0 {

cmd/server_test.go

@@ -28,7 +28,7 @@ func TestServerCurrentCommand(t *testing.T) {
 				cfg.CurrentServer = ""
 				return cfg
 			}(),
-			expectedErr: "Current server not set",
+			expectedErr: "current server not set",
 		},
 		{
 			name: "non existing current server set",
@@ -38,7 +38,7 @@ func TestServerCurrentCommand(t *testing.T) {
 					"my-server": {URL: "https://myserver.com"},
 				},
 			},
-			expectedErr: "Current server not set",
+			expectedErr: "current server not set",
 		},
 	}
 	for _, tc := range tt {
@@ -84,7 +84,7 @@ func TestServerDelete(t *testing.T) {
 			actualCurrentServer:   "server1",
 			serverToDelete:        "server-nope",
 			expectedCurrentServer: "server1",
-			expectedErr:           "Server not found",
+			expectedErr:           "server not found",
 		},
 	}
 	for _, tc := range tt {
@@ -140,14 +140,14 @@ func TestServerSwitch(t *testing.T) {
 			actualCurrentServer:   "server1",
 			serverName:            "server-nope",
 			expectedCurrentServer: "server1",
-			expectedErr:           "Server not found",
+			expectedErr:           "server not found",
 		},
 		{
 			name:                  "switch to empty server fails",
 			actualCurrentServer:   "server1",
 			serverName:            "",
 			expectedCurrentServer: "server1",
-			expectedErr:           "Server not found",
+			expectedErr:           "server not found",
 		},
 	}
 	for _, tc := range tt {

cmd/ssh.go

@@ -6,6 +6,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -14,7 +15,6 @@ import (
 	"path"
 	"strings"
 
-	"github.com/pkg/errors"
 	"github.com/rancher/cli/cliclient"
 	managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3"
 	"github.com/urfave/cli"

go.mod

@@ -4,24 +4,23 @@ go 1.23.4
 
 toolchain go1.23.7
 
-replace k8s.io/client-go => k8s.io/client-go v0.31.1
+replace k8s.io/client-go => k8s.io/client-go v0.32.2
 
 require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b
-	github.com/pkg/errors v0.9.1
-	github.com/rancher/norman v0.0.0-20241001183610-78a520c160ab
-	github.com/rancher/rancher/pkg/apis v0.0.0-20241119163817-d801b4924311
-	github.com/rancher/rancher/pkg/client v0.0.0-20241119163817-d801b4924311
+	github.com/rancher/norman v0.5.2
+	github.com/rancher/rancher/pkg/apis v0.0.0-20250312180415-94853c35bd1e
+	github.com/rancher/rancher/pkg/client v0.0.0-20250312180415-94853c35bd1e
 	github.com/sirupsen/logrus v1.9.3
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 	github.com/tidwall/gjson v1.17.0
-	github.com/urfave/cli v1.22.5
-	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
-	golang.org/x/oauth2 v0.23.0
-	golang.org/x/sync v0.8.0
-	golang.org/x/term v0.25.0
-	golang.org/x/text v0.19.0
+	github.com/urfave/cli v1.22.14
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
+	golang.org/x/oauth2 v0.26.0
+	golang.org/x/sync v0.11.0
+	golang.org/x/term v0.29.0
+	golang.org/x/text v0.22.0
 	k8s.io/client-go v12.0.0+incompatible
 )
 
@@ -35,55 +34,60 @@ require (
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // 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.19.1 // indirect
+	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.55.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/rancher/aks-operator v1.10.0 // indirect
-	github.com/rancher/eks-operator v1.10.0 // indirect
-	github.com/rancher/fleet/pkg/apis v0.11.0 // indirect
-	github.com/rancher/gke-operator v1.10.0 // indirect
-	github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813 // indirect
-	github.com/rancher/rke v1.7.0-rc.5 // indirect
-	github.com/rancher/wrangler/v3 v3.1.0 // indirect
+	github.com/rancher/aks-operator v1.11.0-rc.5 // indirect
+	github.com/rancher/eks-operator v1.11.0-rc.4 // indirect
+	github.com/rancher/fleet/pkg/apis v0.12.0-alpha.2.0.20250307143218-68772e96751c // indirect
+	github.com/rancher/gke-operator v1.11.0-rc.4 // indirect
+	github.com/rancher/lasso v0.2.1 // indirect
+	github.com/rancher/rke v1.8.0-rc.4 // indirect
+	github.com/rancher/wrangler/v3 v3.2.0-rc.3 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/spf13/cobra v1.8.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/time v0.7.0 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
+	go.opentelemetry.io/otel/trace v1.34.0 // indirect
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/time v0.10.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.31.1 // indirect
-	k8s.io/apimachinery v0.31.1 // indirect
-	k8s.io/apiserver v0.31.1 // indirect
-	k8s.io/component-base v0.31.1 // indirect
+	k8s.io/api v0.32.2 // indirect
+	k8s.io/apimachinery v0.32.2 // indirect
+	k8s.io/apiserver v0.32.2 // indirect
+	k8s.io/component-base v0.32.2 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/kubernetes v1.31.1 // indirect
-	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
+	k8s.io/kubernetes v1.32.1 // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )