From 3ce2c2123d45228ecbfd3668a507fc91b1aed288 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 16 May 2022 09:44:14 +0200 Subject: [PATCH] remove composition of Commons --- extensions/app-provider/pkg/config/config.go | 10 +++++----- extensions/app-registry/pkg/config/config.go | 2 +- extensions/audit/pkg/config/config.go | 2 +- extensions/auth-basic/pkg/config/config.go | 10 +++++----- extensions/auth-bearer/pkg/config/config.go | 10 +++++----- extensions/auth-machine/pkg/config/config.go | 10 +++++----- extensions/frontend/pkg/config/config.go | 10 +++++----- extensions/gateway/pkg/config/config.go | 2 +- extensions/graph-explorer/pkg/config/config.go | 2 +- extensions/graph/pkg/config/config.go | 2 +- extensions/groups/pkg/config/config.go | 10 +++++----- extensions/idm/pkg/config/config.go | 2 +- extensions/idp/pkg/config/config.go | 2 +- extensions/nats/pkg/config/config.go | 2 +- extensions/notifications/pkg/config/config.go | 3 +-- extensions/ocdav/pkg/config/config.go | 10 +++++----- extensions/ocs/pkg/config/config.go | 2 +- extensions/proxy/pkg/config/config.go | 2 +- extensions/search/pkg/config/config.go | 16 ++++++++-------- extensions/settings/pkg/config/config.go | 2 +- extensions/sharing/pkg/config/config.go | 10 +++++----- .../storage-publiclink/pkg/config/config.go | 10 +++++----- extensions/storage-shares/pkg/config/config.go | 10 +++++----- extensions/storage-system/pkg/config/config.go | 10 +++++----- extensions/storage-users/pkg/config/config.go | 10 +++++----- extensions/store/pkg/config/config.go | 2 +- extensions/thumbnails/pkg/config/config.go | 2 +- extensions/users/pkg/config/config.go | 10 +++++----- extensions/web/pkg/config/config.go | 2 +- extensions/webdav/pkg/config/config.go | 2 +- 30 files changed, 89 insertions(+), 90 deletions(-) diff --git a/extensions/app-provider/pkg/config/config.go b/extensions/app-provider/pkg/config/config.go index 2e511aa6ba..5b056762b8 100644 --- a/extensions/app-provider/pkg/config/config.go +++ b/extensions/app-provider/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` GRPC GRPCConfig `yaml:"grpc"` diff --git a/extensions/app-registry/pkg/config/config.go b/extensions/app-registry/pkg/config/config.go index 5211333828..f8b00b1365 100644 --- a/extensions/app-registry/pkg/config/config.go +++ b/extensions/app-registry/pkg/config/config.go @@ -7,7 +7,7 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` Tracing *Tracing `yaml:"tracing"` diff --git a/extensions/audit/pkg/config/config.go b/extensions/audit/pkg/config/config.go index a0f3033f84..73141351b0 100644 --- a/extensions/audit/pkg/config/config.go +++ b/extensions/audit/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` diff --git a/extensions/auth-basic/pkg/config/config.go b/extensions/auth-basic/pkg/config/config.go index b63d30f321..6ae9b1507f 100644 --- a/extensions/auth-basic/pkg/config/config.go +++ b/extensions/auth-basic/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` GRPC GRPCConfig `yaml:"grpc"` diff --git a/extensions/auth-bearer/pkg/config/config.go b/extensions/auth-bearer/pkg/config/config.go index 962fb06d88..3973c46155 100644 --- a/extensions/auth-bearer/pkg/config/config.go +++ b/extensions/auth-bearer/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` GRPC GRPCConfig `yaml:"grpc"` diff --git a/extensions/auth-machine/pkg/config/config.go b/extensions/auth-machine/pkg/config/config.go index c51d6a7ac5..98473058b4 100644 --- a/extensions/auth-machine/pkg/config/config.go +++ b/extensions/auth-machine/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` GRPC GRPCConfig `yaml:"grpc"` diff --git a/extensions/frontend/pkg/config/config.go b/extensions/frontend/pkg/config/config.go index 3f903850a5..449e7f4f8f 100644 --- a/extensions/frontend/pkg/config/config.go +++ b/extensions/frontend/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` HTTP HTTPConfig `yaml:"http"` diff --git a/extensions/gateway/pkg/config/config.go b/extensions/gateway/pkg/config/config.go index daa9ec030b..c14064523b 100644 --- a/extensions/gateway/pkg/config/config.go +++ b/extensions/gateway/pkg/config/config.go @@ -7,7 +7,7 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` Tracing *Tracing `yaml:"tracing"` diff --git a/extensions/graph-explorer/pkg/config/config.go b/extensions/graph-explorer/pkg/config/config.go index afe2230057..11f5d1b349 100644 --- a/extensions/graph-explorer/pkg/config/config.go +++ b/extensions/graph-explorer/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` diff --git a/extensions/graph/pkg/config/config.go b/extensions/graph/pkg/config/config.go index a5566880ec..57c1df58af 100644 --- a/extensions/graph/pkg/config/config.go +++ b/extensions/graph/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` diff --git a/extensions/groups/pkg/config/config.go b/extensions/groups/pkg/config/config.go index 64873bc109..6c58eb6595 100644 --- a/extensions/groups/pkg/config/config.go +++ b/extensions/groups/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` GRPC GRPCConfig `yaml:"grpc"` diff --git a/extensions/idm/pkg/config/config.go b/extensions/idm/pkg/config/config.go index 6f0686fbbe..69310d9183 100644 --- a/extensions/idm/pkg/config/config.go +++ b/extensions/idm/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` diff --git a/extensions/idp/pkg/config/config.go b/extensions/idp/pkg/config/config.go index 70c5ed1daf..9a6577f55b 100644 --- a/extensions/idp/pkg/config/config.go +++ b/extensions/idp/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` diff --git a/extensions/nats/pkg/config/config.go b/extensions/nats/pkg/config/config.go index 877089ff32..e85405107a 100644 --- a/extensions/nats/pkg/config/config.go +++ b/extensions/nats/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` diff --git a/extensions/notifications/pkg/config/config.go b/extensions/notifications/pkg/config/config.go index d5964983c8..98375e3a08 100644 --- a/extensions/notifications/pkg/config/config.go +++ b/extensions/notifications/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` @@ -22,7 +22,6 @@ type Config struct { // Notifications definces the config options for the notifications service. type Notifications struct { - *shared.Commons `yaml:"-"` SMTP SMTP `yaml:"SMTP"` Events Events `yaml:"events"` RevaGateway string `yaml:"reva_gateway" env:"REVA_GATEWAY;NOTIFICATIONS_REVA_GATEWAY" desc:"CS3 gateway used to look up user metadata"` diff --git a/extensions/ocdav/pkg/config/config.go b/extensions/ocdav/pkg/config/config.go index 8c7e2407dc..72d60a06d3 100644 --- a/extensions/ocdav/pkg/config/config.go +++ b/extensions/ocdav/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` HTTP HTTPConfig `yaml:"http"` diff --git a/extensions/ocs/pkg/config/config.go b/extensions/ocs/pkg/config/config.go index a105abf455..73924980b3 100644 --- a/extensions/ocs/pkg/config/config.go +++ b/extensions/ocs/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` diff --git a/extensions/proxy/pkg/config/config.go b/extensions/proxy/pkg/config/config.go index 69ab602ddf..0025b33879 100644 --- a/extensions/proxy/pkg/config/config.go +++ b/extensions/proxy/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` diff --git a/extensions/search/pkg/config/config.go b/extensions/search/pkg/config/config.go index 0303ea0fa7..63994534b1 100644 --- a/extensions/search/pkg/config/config.go +++ b/extensions/search/pkg/config/config.go @@ -8,23 +8,23 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `ocisConfig:"-" yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service - Service Service `ocisConfig:"-" yaml:"-"` + Service Service `yaml:"-"` - Tracing *Tracing `ocisConfig:"tracing"` - Log *Log `ocisConfig:"log"` - Debug Debug `ocisConfig:"debug"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` - GRPC GRPC `ocisConfig:"grpc"` + GRPC GRPC `yaml:"grpc"` Datapath string `yaml:"data_path" env:"SEARCH_DATA_PATH"` - Reva Reva `ocisConfig:"reva"` + Reva Reva `yaml:"reva"` Events Events `yaml:"events"` MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;SEARCH_MACHINE_AUTH_API_KEY"` - Context context.Context `ocisConfig:"-" yaml:"-"` + Context context.Context `yaml:"-"` } // Events combines the configuration options for the event bus. diff --git a/extensions/settings/pkg/config/config.go b/extensions/settings/pkg/config/config.go index ef0685a6da..9cd5329cad 100644 --- a/extensions/settings/pkg/config/config.go +++ b/extensions/settings/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` diff --git a/extensions/sharing/pkg/config/config.go b/extensions/sharing/pkg/config/config.go index 03917e0b30..5ede701c6a 100644 --- a/extensions/sharing/pkg/config/config.go +++ b/extensions/sharing/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` GRPC GRPCConfig `yaml:"grpc"` diff --git a/extensions/storage-publiclink/pkg/config/config.go b/extensions/storage-publiclink/pkg/config/config.go index 0f719b989e..f359a4969c 100644 --- a/extensions/storage-publiclink/pkg/config/config.go +++ b/extensions/storage-publiclink/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` GRPC GRPCConfig `yaml:"grpc"` diff --git a/extensions/storage-shares/pkg/config/config.go b/extensions/storage-shares/pkg/config/config.go index b0416316c2..af0a4e50b3 100644 --- a/extensions/storage-shares/pkg/config/config.go +++ b/extensions/storage-shares/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` GRPC GRPCConfig `yaml:"grpc"` diff --git a/extensions/storage-system/pkg/config/config.go b/extensions/storage-system/pkg/config/config.go index 141319a244..ab6caefb09 100644 --- a/extensions/storage-system/pkg/config/config.go +++ b/extensions/storage-system/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` GRPC GRPCConfig `yaml:"grpc"` HTTP HTTPConfig `yaml:"http"` diff --git a/extensions/storage-users/pkg/config/config.go b/extensions/storage-users/pkg/config/config.go index 0ecde7803b..9e3ab909b4 100644 --- a/extensions/storage-users/pkg/config/config.go +++ b/extensions/storage-users/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` GRPC GRPCConfig `yaml:"grpc"` HTTP HTTPConfig `yaml:"http"` diff --git a/extensions/store/pkg/config/config.go b/extensions/store/pkg/config/config.go index ac71316bd9..8b76e455a6 100644 --- a/extensions/store/pkg/config/config.go +++ b/extensions/store/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` diff --git a/extensions/thumbnails/pkg/config/config.go b/extensions/thumbnails/pkg/config/config.go index a26f20c806..9b38664148 100644 --- a/extensions/thumbnails/pkg/config/config.go +++ b/extensions/thumbnails/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` diff --git a/extensions/users/pkg/config/config.go b/extensions/users/pkg/config/config.go index 584f27d4ef..006fb47d42 100644 --- a/extensions/users/pkg/config/config.go +++ b/extensions/users/pkg/config/config.go @@ -7,11 +7,11 @@ import ( ) type Config struct { - *shared.Commons `yaml:"-"` - Service Service `yaml:"-"` - Tracing *Tracing `yaml:"tracing"` - Log *Log `yaml:"log"` - Debug Debug `yaml:"debug"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service + Service Service `yaml:"-"` + Tracing *Tracing `yaml:"tracing"` + Log *Log `yaml:"log"` + Debug Debug `yaml:"debug"` GRPC GRPCConfig `yaml:"grpc"` diff --git a/extensions/web/pkg/config/config.go b/extensions/web/pkg/config/config.go index e289109b1b..e6c7575956 100644 --- a/extensions/web/pkg/config/config.go +++ b/extensions/web/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"` diff --git a/extensions/webdav/pkg/config/config.go b/extensions/webdav/pkg/config/config.go index 7d381480b4..e210fcaa9d 100644 --- a/extensions/webdav/pkg/config/config.go +++ b/extensions/webdav/pkg/config/config.go @@ -8,7 +8,7 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons `yaml:"-"` + Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service Service Service `yaml:"-"`