Merge pull request #3803 from wkloucek/un-compose-commons

remove composition of Commons

extensions/app-provider/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	GRPC GRPCConfig `yaml:"grpc"`
 

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"`

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:"-"`
 

extensions/auth-basic/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	GRPC GRPCConfig `yaml:"grpc"`
 

extensions/auth-bearer/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	GRPC GRPCConfig `yaml:"grpc"`
 

extensions/auth-machine/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	GRPC GRPCConfig `yaml:"grpc"`
 

extensions/frontend/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	HTTP HTTPConfig `yaml:"http"`
 

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"`

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:"-"`
 

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:"-"`
 

extensions/groups/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	GRPC GRPCConfig `yaml:"grpc"`
 

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:"-"`
 

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:"-"`
 

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:"-"`
 

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"`

extensions/ocdav/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	HTTP HTTPConfig `yaml:"http"`
 

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:"-"`
 

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:"-"`
 

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"`
+	Tracing *Tracing `yaml:"tracing"`
-	Log     *Log     `ocisConfig:"log"`
+	Log     *Log     `yaml:"log"`
-	Debug   Debug    `ocisConfig:"debug"`
+	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.

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:"-"`
 

extensions/sharing/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	GRPC GRPCConfig `yaml:"grpc"`
 

extensions/storage-publiclink/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	GRPC GRPCConfig `yaml:"grpc"`
 

extensions/storage-shares/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	GRPC GRPCConfig `yaml:"grpc"`
 

extensions/storage-system/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	GRPC GRPCConfig `yaml:"grpc"`
 	HTTP HTTPConfig `yaml:"http"`

extensions/storage-users/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	GRPC GRPCConfig `yaml:"grpc"`
 	HTTP HTTPConfig `yaml:"http"`

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:"-"`
 

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:"-"`
 

extensions/users/pkg/config/config.go

@@ -7,11 +7,11 @@ import (
 )
 
 type Config struct {
-	*shared.Commons `yaml:"-"`
+	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-	Service         Service  `yaml:"-"`
+	Service Service         `yaml:"-"`
-	Tracing         *Tracing `yaml:"tracing"`
+	Tracing *Tracing        `yaml:"tracing"`
-	Log             *Log     `yaml:"log"`
+	Log     *Log            `yaml:"log"`
-	Debug           Debug    `yaml:"debug"`
+	Debug   Debug           `yaml:"debug"`
 
 	GRPC GRPCConfig `yaml:"grpc"`
 

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:"-"`
 

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:"-"`