Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove composition of Commons #3803

Merged
merged 1 commit into from
May 16, 2022
Merged

remove composition of Commons #3803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions extensions/app-provider/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
2 changes: 1 addition & 1 deletion extensions/app-registry/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
2 changes: 1 addition & 1 deletion extensions/audit/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand Down
10 changes: 5 additions & 5 deletions extensions/auth-basic/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
10 changes: 5 additions & 5 deletions extensions/auth-bearer/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
10 changes: 5 additions & 5 deletions extensions/auth-machine/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
10 changes: 5 additions & 5 deletions extensions/frontend/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
2 changes: 1 addition & 1 deletion extensions/gateway/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
2 changes: 1 addition & 1 deletion extensions/graph-explorer/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand Down
2 changes: 1 addition & 1 deletion extensions/graph/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand Down
10 changes: 5 additions & 5 deletions extensions/groups/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
2 changes: 1 addition & 1 deletion extensions/idm/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand Down
2 changes: 1 addition & 1 deletion extensions/idp/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand Down
2 changes: 1 addition & 1 deletion extensions/nats/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand Down
3 changes: 1 addition & 2 deletions extensions/notifications/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand All @@ -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"`
Expand Down
10 changes: 5 additions & 5 deletions extensions/ocdav/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
2 changes: 1 addition & 1 deletion extensions/ocs/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand Down
2 changes: 1 addition & 1 deletion extensions/proxy/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand Down
16 changes: 8 additions & 8 deletions extensions/search/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion extensions/settings/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand Down
10 changes: 5 additions & 5 deletions extensions/sharing/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
10 changes: 5 additions & 5 deletions extensions/storage-publiclink/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
10 changes: 5 additions & 5 deletions extensions/storage-shares/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
10 changes: 5 additions & 5 deletions extensions/storage-system/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
10 changes: 5 additions & 5 deletions extensions/storage-users/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
2 changes: 1 addition & 1 deletion extensions/store/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand Down
2 changes: 1 addition & 1 deletion extensions/thumbnails/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand Down
10 changes: 5 additions & 5 deletions extensions/users/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
2 changes: 1 addition & 1 deletion extensions/web/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"-"`

Expand Down
Loading