diff --git a/cmd/cluster.go b/cmd/cluster.go index 590d497b..6c4ebf54 100644 --- a/cmd/cluster.go +++ b/cmd/cluster.go @@ -13,7 +13,7 @@ import ( "github.com/rancher/norman/types" managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3" "github.com/sirupsen/logrus" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) const ( diff --git a/cmd/cluster_test.go b/cmd/cluster_test.go index e4dc4a5c..3adf0a0e 100644 --- a/cmd/cluster_test.go +++ b/cmd/cluster_test.go @@ -12,7 +12,7 @@ import ( managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) func TestListClusterMembers(t *testing.T) { diff --git a/cmd/common.go b/cmd/common.go index 5ac90e29..0a7f0604 100644 --- a/cmd/common.go +++ b/cmd/common.go @@ -31,7 +31,7 @@ import ( "github.com/rancher/norman/types/convert" managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3" "github.com/sirupsen/logrus" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" "golang.org/x/text/cases" "golang.org/x/text/language" "k8s.io/client-go/tools/clientcmd/api" diff --git a/cmd/context.go b/cmd/context.go index ca8034fc..c0d7137f 100644 --- a/cmd/context.go +++ b/cmd/context.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/rancher/cli/cliclient" "github.com/sirupsen/logrus" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) func ContextCommand() cli.Command { diff --git a/cmd/inspect.go b/cmd/inspect.go index a54d4ffc..9bc66cf1 100644 --- a/cmd/inspect.go +++ b/cmd/inspect.go @@ -3,7 +3,7 @@ package cmd import ( "strings" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) func InspectCommand() cli.Command { diff --git a/cmd/kubectl.go b/cmd/kubectl.go index f56562b7..aba204a6 100644 --- a/cmd/kubectl.go +++ b/cmd/kubectl.go @@ -8,7 +8,7 @@ import ( "github.com/rancher/norman/clientbase" client "github.com/rancher/rancher/pkg/client/generated/management/v3" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/cmd/kubectl_token.go b/cmd/kubectl_token.go index 2002a143..d026160e 100644 --- a/cmd/kubectl_token.go +++ b/cmd/kubectl_token.go @@ -26,7 +26,7 @@ import ( apiv3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3" managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3" "github.com/tidwall/gjson" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" "golang.org/x/term" ) diff --git a/cmd/kubectl_token_test.go b/cmd/kubectl_token_test.go index fd8896c0..9ea6adb3 100644 --- a/cmd/kubectl_token_test.go +++ b/cmd/kubectl_token_test.go @@ -12,7 +12,7 @@ import ( apiv3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) func TestGetAuthProviders(t *testing.T) { diff --git a/cmd/login.go b/cmd/login.go index 28896865..8c702a09 100644 --- a/cmd/login.go +++ b/cmd/login.go @@ -19,7 +19,7 @@ import ( "github.com/rancher/cli/cliclient" "github.com/rancher/cli/config" managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) type LoginData struct { diff --git a/cmd/machine.go b/cmd/machine.go index 5150ced7..7420c722 100644 --- a/cmd/machine.go +++ b/cmd/machine.go @@ -5,7 +5,7 @@ import ( "github.com/rancher/cli/cliclient" capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1beta1" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) type MachineData struct { diff --git a/cmd/namespace.go b/cmd/namespace.go index 180d2e4f..4493c2b9 100644 --- a/cmd/namespace.go +++ b/cmd/namespace.go @@ -5,7 +5,7 @@ import ( "github.com/rancher/cli/cliclient" clusterClient "github.com/rancher/rancher/pkg/client/generated/cluster/v3" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) type NamespaceData struct { diff --git a/cmd/node.go b/cmd/node.go index ffa2bfad..57cdbd71 100644 --- a/cmd/node.go +++ b/cmd/node.go @@ -7,7 +7,7 @@ import ( "github.com/rancher/cli/cliclient" managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) type NodeData struct { diff --git a/cmd/project.go b/cmd/project.go index 18d0b2ac..e7608451 100644 --- a/cmd/project.go +++ b/cmd/project.go @@ -7,7 +7,7 @@ import ( "github.com/rancher/cli/cliclient" "github.com/rancher/norman/types" managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) type ProjectData struct { diff --git a/cmd/project_test.go b/cmd/project_test.go index 422fe348..e39c7d87 100644 --- a/cmd/project_test.go +++ b/cmd/project_test.go @@ -12,7 +12,7 @@ import ( managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) func TestListProjectMembers(t *testing.T) { diff --git a/cmd/ps.go b/cmd/ps.go index 2797bef0..fb07cba4 100644 --- a/cmd/ps.go +++ b/cmd/ps.go @@ -4,7 +4,7 @@ import ( "strconv" "github.com/rancher/cli/cliclient" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" "golang.org/x/text/cases" "golang.org/x/text/language" ) diff --git a/cmd/server.go b/cmd/server.go index bd54f37c..5d84b27d 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -12,7 +12,7 @@ import ( "github.com/rancher/cli/config" "github.com/sirupsen/logrus" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" "golang.org/x/exp/maps" ) diff --git a/cmd/settings.go b/cmd/settings.go index a8fa65db..72a72a0b 100644 --- a/cmd/settings.go +++ b/cmd/settings.go @@ -3,7 +3,7 @@ package cmd import ( managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3" "github.com/sirupsen/logrus" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) type settingHolder struct { diff --git a/cmd/ssh.go b/cmd/ssh.go index 8311089d..b543424f 100644 --- a/cmd/ssh.go +++ b/cmd/ssh.go @@ -17,7 +17,7 @@ import ( "github.com/rancher/cli/cliclient" managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) const sshDescription = ` diff --git a/cmd/up.go b/cmd/up.go index 9d7fde8a..409323c9 100644 --- a/cmd/up.go +++ b/cmd/up.go @@ -5,7 +5,7 @@ import ( "github.com/rancher/cli/cliclient" client "github.com/rancher/rancher/pkg/client/generated/management/v3" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) func UpCommand() cli.Command { diff --git a/cmd/util_ls.go b/cmd/util_ls.go index 21b040b9..403e6810 100644 --- a/cmd/util_ls.go +++ b/cmd/util_ls.go @@ -2,7 +2,7 @@ package cmd import ( "github.com/rancher/norman/types" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) func baseListOpts() *types.ListOpts { diff --git a/cmd/wait.go b/cmd/wait.go index f563c6b3..61327816 100644 --- a/cmd/wait.go +++ b/cmd/wait.go @@ -7,7 +7,7 @@ import ( ntypes "github.com/rancher/norman/types" "github.com/sirupsen/logrus" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) var ( diff --git a/cmd/writer.go b/cmd/writer.go index 9e746231..903b5217 100644 --- a/cmd/writer.go +++ b/cmd/writer.go @@ -7,7 +7,7 @@ import ( "text/tabwriter" "github.com/ghodss/yaml" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) type TableWriter struct { diff --git a/go.mod b/go.mod index 511c8a12..88bce823 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.11.1 github.com/tidwall/gjson v1.17.0 - github.com/urfave/cli v1.22.14 + github.com/urfave/cli/v3 v3.6.1 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 golang.org/x/oauth2 v0.32.0 golang.org/x/sync v0.17.0 @@ -33,7 +33,6 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.12.2 // indirect github.com/fxamacker/cbor/v2 v2.9.0 // indirect @@ -66,7 +65,6 @@ require ( github.com/rancher/lasso v0.2.5 // indirect github.com/rancher/rke v1.8.0-rc.4 // indirect github.com/rancher/wrangler/v3 v3.3.1 // indirect - github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/spf13/pflag v1.0.6 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect diff --git a/go.sum b/go.sum index 62669a44..4e27482e 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -7,9 +6,6 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0= -github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -110,22 +106,15 @@ github.com/rancher/wrangler/v3 v3.3.1 h1:YFqRfhxjuLNudUrvWrn+64wUPZ8pnn2KWbTsha7 github.com/rancher/wrangler/v3 v3.3.1/go.mod h1:0D4kZDaOUkP5W2Zfww/75tQwF9w7kaZgzpZG+4XQDAI= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= -github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM= @@ -134,8 +123,8 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk= -github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA= +github.com/urfave/cli/v3 v3.6.1 h1:j8Qq8NyUawj/7rTYdBGrxcH7A/j7/G8Q5LhWEW4G3Mo= +github.com/urfave/cli/v3 v3.6.1/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/main.go b/main.go index f3327bf4..3c40cd3a 100644 --- a/main.go +++ b/main.go @@ -10,7 +10,7 @@ import ( "github.com/rancher/cli/cmd" "github.com/rancher/cli/config" "github.com/sirupsen/logrus" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) var VERSION = "dev"