mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-23 13:30:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7467 from dragonchaser/remove-obsolete-cliflags

Browse Source 
remove obsolete cli flags
This commit is contained in:
Christian Richter
2023-10-12 08:20:09 +02:00
committed by GitHub
parent 48857e96f7 e56b23541a
commit ce7ca53e2c
12 changed files with 0 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ocis-pkg/service/grpc/option.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/urfave/cli/v2"
"go.opentelemetry.io/otel/trace"
)
@@ -22,7 +21,6 @@ type Options struct {
TLSCert string
TLSKey string
Context context.Context
Flags []cli.Flag
TraceProvider trace.TracerProvider
}
@@ -96,13 +94,6 @@ func Context(ctx context.Context) Option {
}
}
// Flags provides a function to set the flags option.
func Flags(flags ...cli.Flag) Option {
return func(o *Options) {
o.Flags = append(o.Flags, flags...)
}
}
// TraceProvider provides a function to set the trace provider option.
func TraceProvider(tp trace.TracerProvider) Option {
return func(o *Options) {

1
ocis-pkg/service/grpc/service.go
View File

@@ -58,7 +58,6 @@ func NewServiceWithClient(client client.Client, 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...),
micro.Registry(registry.GetRegistry()),
micro.RegisterTTL(time.Second * 30),
micro.RegisterInterval(time.Second * 10),

9
services/eventhistory/pkg/server/grpc/option.go
View File

@@ -7,7 +7,6 @@ import (
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/eventhistory/pkg/config"
"github.com/owncloud/ocis/v2/services/eventhistory/pkg/metrics"
"github.com/urfave/cli/v2"
"go-micro.dev/v4/store"
"go.opentelemetry.io/otel/trace"
)
@@ -24,7 +23,6 @@ type Options struct {
Config *config.Config
Metrics *metrics.Metrics
Namespace string
Flags []cli.Flag
Persistence store.Store
Consumer events.Consumer
TraceProvider trace.TracerProvider
@@ -90,13 +88,6 @@ func Namespace(val string) Option {
}
}
// Flags provides a function to set the flags option.
func Flags(flags []cli.Flag) Option {
return func(o *Options) {
o.Flags = append(o.Flags, flags...)
}
}
// Persistence provides a function to configure the store
func Persistence(store store.Store) Option {
return func(o *Options) {

1
services/eventhistory/pkg/server/grpc/server.go
View File

@@ -24,7 +24,6 @@ func NewService(opts ...Option) grpc.Service {
grpc.Version(version.GetString()),
grpc.Address(options.Address),
grpc.Context(options.Context),
grpc.Flags(options.Flags...),
grpc.Version(version.GetString()),
grpc.TraceProvider(options.TraceProvider),
)

9
services/search/pkg/server/grpc/option.go
View File

@@ -7,7 +7,6 @@ import (
"github.com/owncloud/ocis/v2/services/search/pkg/config"
"github.com/owncloud/ocis/v2/services/search/pkg/metrics"
svc "github.com/owncloud/ocis/v2/services/search/pkg/service/grpc/v0"
"github.com/urfave/cli/v2"
"go.opentelemetry.io/otel/trace"
)
@@ -21,7 +20,6 @@ type Options struct {
Context context.Context
Config *config.Config
Metrics *metrics.Metrics
Flags []cli.Flag
Handler *svc.Service
JWTSecret string
TraceProvider trace.TracerProvider
@@ -73,13 +71,6 @@ func Metrics(val *metrics.Metrics) Option {
}
}
// Flags provides a function to set the flags option.
func Flags(val []cli.Flag) Option {
return func(o *Options) {
o.Flags = append(o.Flags, val...)
}
}
// Handler provides a function to set the handler option.
func Handler(val *svc.Service) Option {
return func(o *Options) {

1
services/search/pkg/server/grpc/server.go
View File

@@ -23,7 +23,6 @@ func Server(opts ...Option) (grpc.Service, func(), error) {
grpc.Address(options.Config.GRPC.Addr),
grpc.Namespace(options.Config.GRPC.Namespace),
grpc.Logger(options.Logger),
grpc.Flags(options.Flags...),
grpc.Version(version.GetString()),
grpc.TraceProvider(options.TraceProvider),
)

9
services/settings/pkg/server/grpc/option.go
View File

@@ -7,7 +7,6 @@ import (
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
"github.com/owncloud/ocis/v2/services/settings/pkg/metrics"
"github.com/owncloud/ocis/v2/services/settings/pkg/settings"
"github.com/urfave/cli/v2"
"go.opentelemetry.io/otel/trace"
)
@@ -22,7 +21,6 @@ type Options struct {
Config *config.Config
Metrics *metrics.Metrics
ServiceHandler settings.ServiceHandler
Flags []cli.Flag
TraceProvider trace.TracerProvider
}
@@ -72,13 +70,6 @@ func Metrics(val *metrics.Metrics) Option {
}
}
// Flags provides a function to set the flags option.
func Flags(val []cli.Flag) Option {
return func(o *Options) {
o.Flags = append(o.Flags, val...)
}
}
// ServiceHandler provides a function to set the ServiceHandler option
func ServiceHandler(val settings.ServiceHandler) Option {
return func(o *Options) {

1
services/settings/pkg/server/grpc/server.go
View File

@@ -28,7 +28,6 @@ func Server(opts ...Option) grpc.Service {
grpc.Address(options.Config.GRPC.Addr),
grpc.Namespace(options.Config.GRPC.Namespace),
grpc.Context(options.Context),
grpc.Flags(options.Flags...),
grpc.TraceProvider(options.TraceProvider),
)
if err != nil {

9
services/store/pkg/server/grpc/option.go
View File

@@ -6,7 +6,6 @@ import (
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/store/pkg/config"
"github.com/owncloud/ocis/v2/services/store/pkg/metrics"
"github.com/urfave/cli/v2"
"go.opentelemetry.io/otel/trace"
)
@@ -20,7 +19,6 @@ type Options struct {
Context context.Context
Config *config.Config
Metrics *metrics.Metrics
Flags []cli.Flag
TraceProvider trace.TracerProvider
}
@@ -70,13 +68,6 @@ func Metrics(val *metrics.Metrics) Option {
}
}
// Flags provides a function to set the flags option.
func Flags(val []cli.Flag) Option {
return func(o *Options) {
o.Flags = append(o.Flags, val...)
}
}
// TraceProvider provides a function to configure the trace provider
func TraceProvider(traceProvider trace.TracerProvider) Option {
return func(o *Options) {

1
services/store/pkg/server/grpc/server.go
View File

@@ -24,7 +24,6 @@ func Server(opts ...Option) grpc.Service {
grpc.Context(options.Context),
grpc.Address(options.Config.GRPC.Addr),
grpc.Logger(options.Logger),
grpc.Flags(options.Flags...),
grpc.TraceProvider(options.TraceProvider),
)
if err != nil {

9
services/thumbnails/pkg/server/grpc/option.go
View File

@@ -6,7 +6,6 @@ import (
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/thumbnails/pkg/config"
"github.com/owncloud/ocis/v2/services/thumbnails/pkg/metrics"
"github.com/urfave/cli/v2"
"go.opentelemetry.io/otel/trace"
)
@@ -22,7 +21,6 @@ type Options struct {
Config *config.Config
Metrics *metrics.Metrics
Namespace string
Flags []cli.Flag
TraceProvider trace.TracerProvider
}
@@ -86,13 +84,6 @@ func Namespace(val string) Option {
}
}
// Flags provides a function to set the flags option.
func Flags(flags []cli.Flag) Option {
return func(o *Options) {
o.Flags = append(o.Flags, flags...)
}
}
// TraceProvider provides a function to set the TraceProvider option
func TraceProvider(val trace.TracerProvider) Option {
return func(o *Options) {

1
services/thumbnails/pkg/server/grpc/server.go
View File

@@ -29,7 +29,6 @@ func NewService(opts ...Option) grpc.Service {
grpc.Version(version.GetString()),
grpc.Address(options.Address),
grpc.Context(options.Context),
grpc.Flags(options.Flags...),
grpc.Version(version.GetString()),
grpc.TraceProvider(options.TraceProvider),
)