From 131178e5d960292802cbc290f3772339505e7ab8 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Tue, 2 Dec 2025 15:34:58 +0100 Subject: [PATCH] migrate policies from urfave/cli to spf13/cobra Signed-off-by: Christian Richter --- services/policies/pkg/command/health.go | 19 +++++++++---------- services/policies/pkg/command/root.go | 18 ++++++++++-------- services/policies/pkg/command/server.go | 21 ++++++++++----------- services/policies/pkg/command/version.go | 15 +++++++-------- 4 files changed, 36 insertions(+), 37 deletions(-) diff --git a/services/policies/pkg/command/health.go b/services/policies/pkg/command/health.go index 77c53ce6de..15d18fa3e5 100644 --- a/services/policies/pkg/command/health.go +++ b/services/policies/pkg/command/health.go @@ -4,24 +4,23 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/pkg/log" - "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/policies/pkg/config" "github.com/opencloud-eu/opencloud/services/policies/pkg/config/parser" - "github.com/urfave/cli/v2" + + "github.com/spf13/cobra" ) // Health is the entrypoint for the health command. -func Health(cfg *config.Config) *cli.Command { - return &cli.Command{ - Name: "health", - Usage: "check health status", - Category: "info", - Before: func(c *cli.Context) error { +func Health(cfg *config.Config) *cobra.Command { + return &cobra.Command{ + Use: "health", + Short: "check health status", + PreRunE: func(cmd *cobra.Command, args []string) error { return configlog.ReturnError(parser.ParseConfig(cfg)) }, - Action: func(c *cli.Context) error { + RunE: func(cmd *cobra.Command, args []string) error { logger := log.NewLogger( log.Name(cfg.Service.Name), log.Level(cfg.Log.Level), diff --git a/services/policies/pkg/command/root.go b/services/policies/pkg/command/root.go index 605d9b55a6..3229890546 100644 --- a/services/policies/pkg/command/root.go +++ b/services/policies/pkg/command/root.go @@ -5,12 +5,13 @@ import ( "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/policies/pkg/config" - "github.com/urfave/cli/v2" + + "github.com/spf13/cobra" ) // GetCommands provides all commands for this service -func GetCommands(cfg *config.Config) cli.Commands { - return []*cli.Command{ +func GetCommands(cfg *config.Config) []*cobra.Command { + return []*cobra.Command{ Server(cfg), Health(cfg), Version(cfg), @@ -19,11 +20,12 @@ func GetCommands(cfg *config.Config) cli.Commands { // Execute is the entry point for the policies command. func Execute(cfg *config.Config) error { - app := clihelper.DefaultApp(&cli.App{ - Name: "policies", - Usage: "Serve policies for OpenCloud", - Commands: GetCommands(cfg), + app := clihelper.DefaultAppCobra(&cobra.Command{ + Use: "policies", + Short: "Serve policies for OpenCloud", }) + app.AddCommand(GetCommands(cfg)...) + app.SetArgs(os.Args[1:]) - return app.RunContext(cfg.Context, os.Args) + return app.ExecuteContext(cfg.Context) } diff --git a/services/policies/pkg/command/server.go b/services/policies/pkg/command/server.go index 8726bf4297..1d807a2adb 100644 --- a/services/policies/pkg/command/server.go +++ b/services/policies/pkg/command/server.go @@ -5,9 +5,6 @@ import ( "fmt" "os/signal" - "github.com/opencloud-eu/reva/v2/pkg/events/stream" - "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/pkg/generators" "github.com/opencloud-eu/opencloud/pkg/log" @@ -22,18 +19,20 @@ import ( "github.com/opencloud-eu/opencloud/services/policies/pkg/server/debug" svcEvent "github.com/opencloud-eu/opencloud/services/policies/pkg/service/event" svcGRPC "github.com/opencloud-eu/opencloud/services/policies/pkg/service/grpc" + "github.com/opencloud-eu/reva/v2/pkg/events/stream" + + "github.com/spf13/cobra" ) // Server is the entrypoint for the server command. -func Server(cfg *config.Config) *cli.Command { - return &cli.Command{ - Name: "server", - Usage: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", "authz"), - Category: "server", - Before: func(c *cli.Context) error { +func Server(cfg *config.Config) *cobra.Command { + return &cobra.Command{ + Use: "server", + Short: fmt.Sprintf("start the %s service without runtime (unsupervised mode)", "authz"), + PreRunE: func(cmd *cobra.Command, args []string) error { return configlog.ReturnFatal(parser.ParseConfig(cfg)) }, - Action: func(c *cli.Context) error { + RunE: func(cmd *cobra.Command, args []string) error { var cancel context.CancelFunc if cfg.Context == nil { cfg.Context, cancel = signal.NotifyContext(context.Background(), runner.StopSignals...) @@ -49,7 +48,7 @@ func Server(cfg *config.Config) *cli.Command { log.File(cfg.Log.File), ).SubloggerWithRequestID(ctx) - traceProvider, err := tracing.GetTraceProvider(c.Context, cfg.Commons.TracesExporter, cfg.Service.Name) + traceProvider, err := tracing.GetTraceProvider(cmd.Context(), cfg.Commons.TracesExporter, cfg.Service.Name) if err != nil { return err } diff --git a/services/policies/pkg/command/version.go b/services/policies/pkg/command/version.go index 2886e9ee83..238c5cd1b3 100644 --- a/services/policies/pkg/command/version.go +++ b/services/policies/pkg/command/version.go @@ -6,20 +6,19 @@ import ( "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/pkg/version" + "github.com/opencloud-eu/opencloud/services/policies/pkg/config" "github.com/olekukonko/tablewriter" "github.com/olekukonko/tablewriter/tw" - "github.com/opencloud-eu/opencloud/services/policies/pkg/config" - "github.com/urfave/cli/v2" + "github.com/spf13/cobra" ) // Version prints the service versions of all running instances. -func Version(cfg *config.Config) *cli.Command { - return &cli.Command{ - Name: "version", - Usage: "print the version of this binary and the running service instances", - Category: "info", - Action: func(c *cli.Context) error { +func Version(cfg *config.Config) *cobra.Command { + return &cobra.Command{ + Use: "version", + Short: "print the version of this binary and the running service instances", + RunE: func(cmd *cobra.Command, args []string) error { fmt.Println("Version: " + version.GetString()) fmt.Printf("Compiled: %s\n", version.Compiled()) fmt.Println("")