exclude config items not inteded to be used from un/marshalling

This commit is contained in:
Willy Kloucek
2022-03-11 12:12:44 +01:00
parent 351733c110
commit 9a4737d3ed
50 changed files with 87 additions and 87 deletions
+3 -3
View File
@@ -8,9 +8,9 @@ import (
// Config combines all available configuration parts.
type Config struct {
*shared.Commons
*shared.Commons `ocisConfig:"-" yaml:"-"`
Service Service
Service Service `ocisConfig:"-" yaml:"-"`
Tracing *Tracing `ocisConfig:"tracing"`
Log *Log `ocisConfig:"log"`
@@ -21,7 +21,7 @@ type Config struct {
Thumbnail Thumbnail `ocisConfig:"thumbnail"`
Context context.Context
Context context.Context `ocisConfig:"-" yaml:"-"`
}
// FileSystemStorage defines the available filesystem storage configuration.
@@ -41,7 +41,7 @@ func DefaultConfig() *config.Config {
FileSystemStorage: config.FileSystemStorage{
RootDirectory: path.Join(defaults.BaseDataPath(), "thumbnails"),
},
WebdavAllowInsecure: true,
WebdavAllowInsecure: false,
RevaGateway: "127.0.0.1:9142",
CS3AllowInsecure: false,
TransferTokenSecret: "changemeplease",
+1 -1
View File
@@ -3,5 +3,5 @@ package config
// GRPC defines the available grpc configuration.
type GRPC struct {
Addr string `ocisConfig:"addr" env:"THUMBNAILS_GRPC_ADDR"`
Namespace string
Namespace string `ocisConfig:"-" yaml:"-"`
}
+1 -1
View File
@@ -4,5 +4,5 @@ package config
type HTTP struct {
Addr string `ocisConfig:"addr" env:"THUMBNAILS_HTTP_ADDR"`
Root string `ocisConfig:"root" env:"THUMBNAILS_HTTP_ROOT"`
Namespace string
Namespace string `ocisConfig:"-" yaml:"-"`
}
+1 -1
View File
@@ -2,5 +2,5 @@ package config
// Service defines the available service configuration.
type Service struct {
Name string
Name string `ocisConfig:"-" yaml:"-"`
}