refactor remaining code from urfave/cli

Signed-off-by: Christian Richter <c.richter@opencloud.eu>
This commit is contained in:
Christian Richter
2025-12-15 16:40:27 +01:00
committed by Florian Schade
parent a8545bfa39
commit 0372869b8b
16 changed files with 90 additions and 65 deletions
+4 -3
View File
@@ -6,7 +6,8 @@ import (
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/urfave/cli/v2"
"github.com/spf13/pflag"
"go.opentelemetry.io/otel/trace"
)
@@ -23,7 +24,7 @@ type Options struct {
Address string
Handler http.Handler
Context context.Context
Flags []cli.Flag
Flags []pflag.Flag
TraceProvider trace.TracerProvider
}
@@ -83,7 +84,7 @@ func Context(ctx context.Context) Option {
}
// Flags provides a function to set the flags option.
func Flags(flags ...cli.Flag) Option {
func Flags(flags ...pflag.Flag) Option {
return func(o *Options) {
o.Flags = append(o.Flags, flags...)
}
+2 -1
View File
@@ -62,7 +62,8 @@ func NewService(opts ...Option) (Service, error) {
micro.Name(strings.Join([]string{sopts.Namespace, sopts.Name}, ".")),
micro.Version(sopts.Version),
micro.Context(sopts.Context),
micro.Flags(sopts.Flags...),
// TODO: clarify if this is actually used on the go-micro side
//micro.Flags(sopts.Flags...),
micro.Registry(registry.GetRegistry()),
micro.RegisterTTL(registry.GetRegisterTTL()),
micro.RegisterInterval(registry.GetRegisterInterval()),