remove composition of Commons

This commit is contained in:
Willy Kloucek
2022-05-16 11:34:05 +02:00
parent 922d1414d8
commit 3ce2c2123d
30 changed files with 89 additions and 90 deletions
+5 -5
View File
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` GRPC GRPCConfig `yaml:"grpc"`
+1 -1
View File
@@ -7,7 +7,7 @@ import (
) )
type Config struct { 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"`
+1 -1
View File
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
+5 -5
View File
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` GRPC GRPCConfig `yaml:"grpc"`
+5 -5
View File
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` GRPC GRPCConfig `yaml:"grpc"`
+5 -5
View File
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` GRPC GRPCConfig `yaml:"grpc"`
+5 -5
View File
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` HTTP HTTPConfig `yaml:"http"`
+1 -1
View File
@@ -7,7 +7,7 @@ import (
) )
type Config struct { 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"`
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
+1 -1
View File
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
+5 -5
View File
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` GRPC GRPCConfig `yaml:"grpc"`
+1 -1
View File
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
+1 -1
View File
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
+1 -1
View File
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
@@ -22,7 +22,6 @@ type Config struct {
// Notifications definces the config options for the notifications service. // Notifications definces the config options for the notifications service.
type Notifications struct { type Notifications struct {
*shared.Commons `yaml:"-"`
SMTP SMTP `yaml:"SMTP"` SMTP SMTP `yaml:"SMTP"`
Events Events `yaml:"events"` Events Events `yaml:"events"`
RevaGateway string `yaml:"reva_gateway" env:"REVA_GATEWAY;NOTIFICATIONS_REVA_GATEWAY" desc:"CS3 gateway used to look up user metadata"` RevaGateway string `yaml:"reva_gateway" env:"REVA_GATEWAY;NOTIFICATIONS_REVA_GATEWAY" desc:"CS3 gateway used to look up user metadata"`
+5 -5
View File
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` HTTP HTTPConfig `yaml:"http"`
+1 -1
View File
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
+1 -1
View File
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
+8 -8
View File
@@ -8,23 +8,23 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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"` Datapath string `yaml:"data_path" env:"SEARCH_DATA_PATH"`
Reva Reva `ocisConfig:"reva"` Reva Reva `yaml:"reva"`
Events Events `yaml:"events"` Events Events `yaml:"events"`
MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;SEARCH_MACHINE_AUTH_API_KEY"` 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. // Events combines the configuration options for the event bus.
+1 -1
View File
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
+5 -5
View File
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` GRPC GRPCConfig `yaml:"grpc"`
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` GRPC GRPCConfig `yaml:"grpc"`
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` GRPC GRPCConfig `yaml:"grpc"`
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` GRPC GRPCConfig `yaml:"grpc"`
HTTP HTTPConfig `yaml:"http"` HTTP HTTPConfig `yaml:"http"`
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` GRPC GRPCConfig `yaml:"grpc"`
HTTP HTTPConfig `yaml:"http"` HTTP HTTPConfig `yaml:"http"`
+1 -1
View File
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
+1 -1
View File
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
+5 -5
View File
@@ -7,11 +7,11 @@ import (
) )
type Config struct { 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"` GRPC GRPCConfig `yaml:"grpc"`
+1 -1
View File
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`
+1 -1
View File
@@ -8,7 +8,7 @@ import (
// Config combines all available configuration parts. // Config combines all available configuration parts.
type Config struct { 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:"-"`