Bump spf13/cobra to 1.8.0 and adapt PersistentPreRun usage

Signed-off-by: Kimmo Lehto <[email protected]>

cmd/api/api.go

@@ -66,10 +66,9 @@ func NewAPICmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "api",
 		Short: "Run the controller API",
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			logrus.SetOutput(cmd.OutOrStdout())
 			k0slog.SetInfoLevel()
-			return config.CallParentPersistentPreRun(cmd, args)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts, err := config.GetCmdOpts(cmd)

cmd/controller/controller.go

@@ -76,10 +76,9 @@ func NewControllerCmd() *cobra.Command {
 	or CLI flag:
 	$ k0s controller --token-file [path_to_file]
 	Note: Token can be passed either as a CLI argument or as a flag`,
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			logrus.SetOutput(cmd.OutOrStdout())
 			k0slog.SetInfoLevel()
-			return config.CallParentPersistentPreRun(cmd, args)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts, err := config.GetCmdOpts(cmd)

cmd/etcd/etcd.go

@@ -30,10 +30,6 @@ func NewEtcdCmd() *cobra.Command {
 		Use:   "etcd",
 		Short: "Manage etcd cluster",
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			if err := config.CallParentPersistentPreRun(cmd, args); err != nil {
-				return err
-			}
-
 			opts, err := config.GetCmdOpts(cmd)
 			if err != nil {
 				return err

cmd/kubectl/kubectl.go

@@ -125,10 +125,6 @@ func hookKubectlPluginHandler(kubectlCmd *cobra.Command) {
 		logs.InitLogs()
 		cobra.OnFinalize(logs.FlushLogs)
 
-		if err := config.CallParentPersistentPreRun(kubectlCmd, args); err != nil {
-			return err
-		}
-
 		if err := fallbackToK0sKubeconfig(cmd); err != nil {
 			return err
 		}

cmd/root.go

@@ -191,6 +191,7 @@ $ k0s completion fish > ~/.config/fish/completions/k0s.fish
 }
 
 func Execute() {
+	cobra.EnableTraverseRunHooks = true
 	if err := NewRootCmd().Execute(); err != nil {
 		os.Exit(1)
 	}

cmd/worker/worker.go

@@ -56,10 +56,9 @@ func NewWorkerCmd() *cobra.Command {
 	or CLI flag:
 	$ k0s worker --token-file [path_to_file]
 	Note: Token can be passed either as a CLI argument or as a flag`,
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			logrus.SetOutput(cmd.OutOrStdout())
 			k0slog.SetInfoLevel()
-			return config.CallParentPersistentPreRun(cmd, args)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts, err := config.GetCmdOpts(cmd)

go.mod

@@ -43,7 +43,7 @@ require (
 	github.com/rqlite/rqlite v4.6.0+incompatible
 	github.com/segmentio/analytics-go v3.1.0+incompatible
 	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.7.0
+	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
 	github.com/urfave/cli v1.22.14
@@ -121,7 +121,7 @@ require (
 	github.com/containernetworking/plugins v1.2.0 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/daviddengcn/go-colortext v1.0.0 // indirect

pkg/config/cli.go

@@ -28,7 +28,6 @@ import (
 	"github.com/k0sproject/k0s/pkg/k0scloudprovider"
 
 	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"golang.org/x/exp/slices"
 )
@@ -263,34 +262,3 @@ func GetCmdOpts(cobraCmd command) (*CLIOptions, error) {
 		DebugListenOn:    DebugListenOn,
 	}, nil
 }
-
-// CallParentPersistentPreRun runs the parent command's persistent pre-run.
-// Cobra does not do this automatically.
-//
-// See: https://github.com/spf13/cobra/issues/216
-// See: https://github.com/spf13/cobra/blob/v1.4.0/command.go#L833-L843
-func CallParentPersistentPreRun(cmd *cobra.Command, args []string) error {
-	for p := cmd.Parent(); p != nil; p = p.Parent() {
-		preRunE := p.PersistentPreRunE
-		preRun := p.PersistentPreRun
-
-		p.PersistentPreRunE = nil
-		p.PersistentPreRun = nil
-
-		defer func() {
-			p.PersistentPreRunE = preRunE
-			p.PersistentPreRun = preRun
-		}()
-
-		if preRunE != nil {
-			return preRunE(cmd, args)
-		}
-
-		if preRun != nil {
-			preRun(cmd, args)
-			return nil
-		}
-	}
-
-	return nil
-}