refactor: Move Hooks to the api package

api/api.go

@@ -6,7 +6,13 @@ package api
 import (
 	"context"
 
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
+	"github.com/cilium/cilium-cli/connectivity"
+	"github.com/cilium/cilium-cli/connectivity/check"
 	"github.com/cilium/cilium-cli/k8s"
+	"github.com/cilium/cilium-cli/sysdump"
 )
 
 // key is a context.Context value key type. It's unexported to avoid key collisions.
@@ -44,3 +50,31 @@ func GetK8sClientContextValue(ctx context.Context) (*k8s.Client, bool) {
 	client, ok := ctx.Value(k8sClientKey).(*k8s.Client)
 	return client, ok
 }
+
+// Hooks to extend the default cilium-cli command with additional functionality.
+type Hooks interface {
+	ConnectivityTestHooks
+	sysdump.Hooks
+	// InitializeCommand gets called with the root command before returning it
+	// from cli.NewCiliumCommand.
+	InitializeCommand(rootCmd *cobra.Command)
+}
+
+// ConnectivityTestHooks to extend cilium-cli with additional connectivity tests and related flags.
+type ConnectivityTestHooks interface {
+	connectivity.Hooks
+	// AddConnectivityTestFlags is an hook to register additional connectivity test flags.
+	AddConnectivityTestFlags(flags *pflag.FlagSet)
+}
+
+type NopHooks struct{}
+
+var _ Hooks = &NopHooks{}
+
+func (*NopHooks) AddSysdumpFlags(*pflag.FlagSet)                                  {}
+func (*NopHooks) AddSysdumpTasks(*sysdump.Collector) error                        { return nil }
+func (*NopHooks) AddConnectivityTestFlags(*pflag.FlagSet)                         {}
+func (*NopHooks) AddConnectivityTests(*check.ConnectivityTest) error              { return nil }
+func (*NopHooks) DetectFeatures(context.Context, *check.ConnectivityTest) error   { return nil }
+func (*NopHooks) SetupAndValidate(context.Context, *check.ConnectivityTest) error { return nil }
+func (*NopHooks) InitializeCommand(*cobra.Command)                                {}

cli/cmd.go

@@ -9,12 +9,9 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 
 	"github.com/cilium/cilium-cli/api"
-	"github.com/cilium/cilium-cli/connectivity/check"
 	"github.com/cilium/cilium-cli/k8s"
-	"github.com/cilium/cilium-cli/sysdump"
 )
 
 var (
@@ -26,11 +23,11 @@ var (
 
 // NewDefaultCiliumCommand returns a new "cilium" cli cobra command without any additional hooks.
 func NewDefaultCiliumCommand() *cobra.Command {
-	return NewCiliumCommand(&NopHooks{})
+	return NewCiliumCommand(&api.NopHooks{})
 }
 
 // NewCiliumCommand returns a new "cilium" cli cobra command registering all the additional input hooks.
-func NewCiliumCommand(hooks Hooks) *cobra.Command {
+func NewCiliumCommand(hooks api.Hooks) *cobra.Command {
 	cmd := &cobra.Command{
 		PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
 			// return early for commands that don't require the kubernetes client
@@ -104,19 +101,3 @@ cilium connectivity test`,
 	hooks.InitializeCommand(cmd)
 	return cmd
 }
-
-type (
-	SysdumpHooks = sysdump.Hooks
-)
-
-type NopHooks struct{}
-
-var _ Hooks = &NopHooks{}
-
-func (*NopHooks) AddSysdumpFlags(*pflag.FlagSet)                                  {}
-func (*NopHooks) AddSysdumpTasks(*sysdump.Collector) error                        { return nil }
-func (*NopHooks) AddConnectivityTestFlags(*pflag.FlagSet)                         {}
-func (*NopHooks) AddConnectivityTests(*check.ConnectivityTest) error              { return nil }
-func (*NopHooks) DetectFeatures(context.Context, *check.ConnectivityTest) error   { return nil }
-func (*NopHooks) SetupAndValidate(context.Context, *check.ConnectivityTest) error { return nil }
-func (*NopHooks) InitializeCommand(*cobra.Command)                                {}

cli/cmd_test.go

@@ -8,12 +8,14 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/cilium/cilium-cli/api"
 )
 
 const usage = "override usage"
 
 type testHooks struct {
-	NopHooks
+	api.NopHooks
 }
 
 func (th *testHooks) InitializeCommand(rootCmd *cobra.Command) {

cli/connectivity.go

@@ -17,6 +17,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
+	"github.com/cilium/cilium-cli/api"
 	"github.com/cilium/cilium-cli/connectivity"
 	"github.com/cilium/cilium-cli/connectivity/check"
 	"github.com/cilium/cilium-cli/defaults"
@@ -25,7 +26,7 @@ import (
 
 var errInternal = errors.New("encountered internal error, exiting")
 
-func newCmdConnectivity(hooks Hooks) *cobra.Command {
+func newCmdConnectivity(hooks api.Hooks) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "connectivity",
 		Short: "Connectivity troubleshooting",
@@ -49,7 +50,7 @@ var params = check.Parameters{
 
 var tests []string
 
-func RunE(hooks Hooks) func(cmd *cobra.Command, args []string) error {
+func RunE(hooks api.Hooks) func(cmd *cobra.Command, args []string) error {
 	return func(cmd *cobra.Command, _ []string) error {
 		params.CiliumNamespace = namespace
 
@@ -115,7 +116,7 @@ func RunE(hooks Hooks) func(cmd *cobra.Command, args []string) error {
 	}
 }
 
-func newCmdConnectivityTest(hooks Hooks) *cobra.Command {
+func newCmdConnectivityTest(hooks api.Hooks) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "test",
 		Short: "Validate connectivity in cluster",
@@ -202,7 +203,7 @@ func newCmdConnectivityTest(hooks Hooks) *cobra.Command {
 	return cmd
 }
 
-func newCmdConnectivityPerf(hooks Hooks) *cobra.Command {
+func newCmdConnectivityPerf(hooks api.Hooks) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "perf",
 		Short: "Test network performance",