From 9a4737d3ed8b24464001d65b3bbb0d26413b46e5 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 11 Mar 2022 12:12:44 +0100 Subject: [PATCH] exclude config items not inteded to be used from un/marshalling --- accounts/pkg/config/config.go | 6 +++--- accounts/pkg/config/grpc.go | 2 +- accounts/pkg/config/http.go | 4 ++-- accounts/pkg/config/service.go | 2 +- audit/pkg/config/config.go | 6 +++--- audit/pkg/config/service.go | 2 +- glauth/pkg/config/config.go | 6 +++--- glauth/pkg/config/ldap.go | 2 +- glauth/pkg/config/ldaps.go | 2 +- glauth/pkg/config/service.go | 2 +- graph-explorer/pkg/config/config.go | 6 +++--- graph-explorer/pkg/config/http.go | 2 +- graph-explorer/pkg/config/service.go | 2 +- graph/pkg/config/config.go | 6 +++--- graph/pkg/config/http.go | 2 +- graph/pkg/config/service.go | 2 +- idm/pkg/config/config.go | 6 +++--- idm/pkg/config/service.go | 2 +- idp/pkg/config/config.go | 6 +++--- idp/pkg/config/http.go | 2 +- idp/pkg/config/log.go | 8 ++++---- idp/pkg/config/service.go | 2 +- nats/pkg/config/config.go | 6 +++--- nats/pkg/config/service.go | 2 +- notifications/pkg/config/config.go | 6 +++--- notifications/pkg/config/service.go | 2 +- ocs/pkg/config/config.go | 6 +++--- ocs/pkg/config/http.go | 4 ++-- ocs/pkg/config/service.go | 2 +- proxy/pkg/config/config.go | 6 +++--- proxy/pkg/config/http.go | 2 +- proxy/pkg/config/service.go | 2 +- settings/pkg/config/config.go | 6 +++--- settings/pkg/config/grpc.go | 2 +- settings/pkg/config/http.go | 2 +- settings/pkg/config/service.go | 2 +- store/pkg/config/config.go | 6 +++--- store/pkg/config/grpc.go | 2 +- store/pkg/config/service.go | 2 +- thumbnails/pkg/config/config.go | 6 +++--- thumbnails/pkg/config/defaults/defaultconfig.go | 2 +- thumbnails/pkg/config/grpc.go | 2 +- thumbnails/pkg/config/http.go | 2 +- thumbnails/pkg/config/service.go | 2 +- web/pkg/config/config.go | 6 +++--- web/pkg/config/http.go | 2 +- web/pkg/config/service.go | 2 +- webdav/pkg/config/config.go | 6 +++--- webdav/pkg/config/http.go | 2 +- webdav/pkg/config/service.go | 2 +- 50 files changed, 87 insertions(+), 87 deletions(-) diff --git a/accounts/pkg/config/config.go b/accounts/pkg/config/config.go index 9a4609d7e..3a3d3dd59 100644 --- a/accounts/pkg/config/config.go +++ b/accounts/pkg/config/config.go @@ -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"` @@ -28,7 +28,7 @@ type Config struct { HashDifficulty int `ocisConfig:"hash_difficulty" env:"ACCOUNTS_HASH_DIFFICULTY" desc:"The hash difficulty makes sure that validating a password takes at least a certain amount of time."` DemoUsersAndGroups bool `ocisConfig:"demo_users_and_groups" env:"ACCOUNTS_DEMO_USERS_AND_GROUPS" desc:"If this flag is set the service will setup the demo users and groups."` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } // Asset defines the available asset configuration. diff --git a/accounts/pkg/config/grpc.go b/accounts/pkg/config/grpc.go index a89e0ca00..148fda925 100644 --- a/accounts/pkg/config/grpc.go +++ b/accounts/pkg/config/grpc.go @@ -3,5 +3,5 @@ package config // GRPC defines the available grpc configuration. type GRPC struct { Addr string `ocisConfig:"addr" env:"ACCOUNTS_GRPC_ADDR" desc:"The address of the grpc service."` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` } diff --git a/accounts/pkg/config/http.go b/accounts/pkg/config/http.go index 6a8828ea9..a71b095a2 100644 --- a/accounts/pkg/config/http.go +++ b/accounts/pkg/config/http.go @@ -3,10 +3,10 @@ package config // HTTP defines the available http configuration. type HTTP struct { Addr string `ocisConfig:"addr" env:"ACCOUNTS_HTTP_ADDR" desc:"The address of the http service."` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` Root string `ocisConfig:"root" env:"ACCOUNTS_HTTP_ROOT" desc:"The root path of the http service."` CacheTTL int `ocisConfig:"cache_ttl" env:"ACCOUNTS_CACHE_TTL" desc:"The cache time for the static assets."` - CORS CORS + CORS CORS `ocisConfig:"cors"` } // CORS defines the available cors configuration. diff --git a/accounts/pkg/config/service.go b/accounts/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/accounts/pkg/config/service.go +++ b/accounts/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/audit/pkg/config/config.go b/audit/pkg/config/config.go index 2041e52bc..33c98abf0 100644 --- a/audit/pkg/config/config.go +++ b/audit/pkg/config/config.go @@ -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:"-"` Log *Log `ocisConfig:"log"` Debug Debug `ocisConfig:"debug"` @@ -18,7 +18,7 @@ type Config struct { Events Events `ocisConfig:"events"` Auditlog Auditlog `ocisConfig:"auditlog"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } // Events combines the configuration options for the event bus. diff --git a/audit/pkg/config/service.go b/audit/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/audit/pkg/config/service.go +++ b/audit/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/glauth/pkg/config/config.go b/glauth/pkg/config/config.go index 7de14cf68..2628e18ae 100644 --- a/glauth/pkg/config/config.go +++ b/glauth/pkg/config/config.go @@ -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"` @@ -24,7 +24,7 @@ type Config struct { RoleBundleUUID string `ocisConfig:"role_bundle_uuid" env:"GLAUTH_ROLE_BUNDLE_ID"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } // Backend defined the available backend configuration. diff --git a/glauth/pkg/config/ldap.go b/glauth/pkg/config/ldap.go index b0780084a..0c4602cf7 100644 --- a/glauth/pkg/config/ldap.go +++ b/glauth/pkg/config/ldap.go @@ -4,5 +4,5 @@ package config type Ldap struct { Enabled bool `ocisConfig:"enabled" env:"GLAUTH_LDAP_ENABLED"` Addr string `ocisConfig:"addr" env:"GLAUTH_LDAP_ADDR"` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` } diff --git a/glauth/pkg/config/ldaps.go b/glauth/pkg/config/ldaps.go index 2c09f2530..927b493d1 100644 --- a/glauth/pkg/config/ldaps.go +++ b/glauth/pkg/config/ldaps.go @@ -4,7 +4,7 @@ package config type Ldaps struct { Enabled bool `ocisConfig:"enabled" env:"GLAUTH_LDAPS_ENABLED"` Addr string `ocisConfig:"addr" env:"GLAUTH_LDAPS_ADDR"` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` Cert string `ocisConfig:"cert" env:"GLAUTH_LDAPS_CERT"` Key string `ocisConfig:"key" env:"GLAUTH_LDAPS_KEY"` } diff --git a/glauth/pkg/config/service.go b/glauth/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/glauth/pkg/config/service.go +++ b/glauth/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/graph-explorer/pkg/config/config.go b/graph-explorer/pkg/config/config.go index 2d70fd664..82f90fc24 100644 --- a/graph-explorer/pkg/config/config.go +++ b/graph-explorer/pkg/config/config.go @@ -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"` @@ -20,7 +20,7 @@ type Config struct { GraphExplorer GraphExplorer `ocisConfig:"graph_explorer"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } // GraphExplorer defines the available graph-explorer configuration. diff --git a/graph-explorer/pkg/config/http.go b/graph-explorer/pkg/config/http.go index 8990a455e..040f808db 100644 --- a/graph-explorer/pkg/config/http.go +++ b/graph-explorer/pkg/config/http.go @@ -4,7 +4,7 @@ package config type HTTP struct { Addr string `ocisConfig:"addr" env:"GRAPH_EXPLORER_HTTP_ADDR"` Root string `ocisConfig:"root" env:"GRAPH_EXPLORER_HTTP_ROOT"` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` } // CORS defines the available cors configuration. diff --git a/graph-explorer/pkg/config/service.go b/graph-explorer/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/graph-explorer/pkg/config/service.go +++ b/graph-explorer/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/graph/pkg/config/config.go b/graph/pkg/config/config.go index 88e4c1166..6a46eb0cb 100644 --- a/graph/pkg/config/config.go +++ b/graph/pkg/config/config.go @@ -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"` @@ -24,7 +24,7 @@ type Config struct { Spaces Spaces `ocisConfig:"spaces"` Identity Identity `ocisConfig:"identity"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } type Spaces struct { diff --git a/graph/pkg/config/http.go b/graph/pkg/config/http.go index 64351105b..3ce0de1b7 100644 --- a/graph/pkg/config/http.go +++ b/graph/pkg/config/http.go @@ -3,6 +3,6 @@ package config // HTTP defines the available http configuration. type HTTP struct { Addr string `ocisConfig:"addr" env:"GRAPH_HTTP_ADDR"` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` Root string `ocisConfig:"root" env:"GRAPH_HTTP_ROOT"` } diff --git a/graph/pkg/config/service.go b/graph/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/graph/pkg/config/service.go +++ b/graph/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/idm/pkg/config/config.go b/idm/pkg/config/config.go index 44a97887c..4917a5542 100644 --- a/idm/pkg/config/config.go +++ b/idm/pkg/config/config.go @@ -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 { ServiceUserPasswords ServiceUserPasswords `ocisConfig:"service_user_passwords"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } type Settings struct { diff --git a/idm/pkg/config/service.go b/idm/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/idm/pkg/config/service.go +++ b/idm/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/idp/pkg/config/config.go b/idp/pkg/config/config.go index 4e5e4b0d1..a8ca6e384 100644 --- a/idp/pkg/config/config.go +++ b/idp/pkg/config/config.go @@ -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"` @@ -22,7 +22,7 @@ type Config struct { IDP Settings `ocisConfig:"idp"` Ldap Ldap `ocisConfig:"ldap"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } // Ldap defines the available LDAP configuration. diff --git a/idp/pkg/config/http.go b/idp/pkg/config/http.go index 4d528e027..b76b48f56 100644 --- a/idp/pkg/config/http.go +++ b/idp/pkg/config/http.go @@ -4,7 +4,7 @@ package config type HTTP struct { Addr string `ocisConfig:"addr" env:"IDP_HTTP_ADDR"` Root string `ocisConfig:"root" env:"IDP_HTTP_ROOT"` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` TLSCert string `ocisConfig:"tls_cert" env:"IDP_TRANSPORT_TLS_CERT"` TLSKey string `ocisConfig:"tls_key" env:"IDP_TRANSPORT_TLS_KEY"` TLS bool `ocisConfig:"tls" env:"IDP_TLS"` diff --git a/idp/pkg/config/log.go b/idp/pkg/config/log.go index 39ba2d9e5..4183ee357 100644 --- a/idp/pkg/config/log.go +++ b/idp/pkg/config/log.go @@ -2,8 +2,8 @@ package config // Log defines the available log configuration. type Log struct { - Level string `mapstructure:"level" env:"OCIS_LOG_LEVEL;IDP_LOG_LEVEL"` - Pretty bool `mapstructure:"pretty" env:"OCIS_LOG_PRETTY;IDP_LOG_PRETTY"` - Color bool `mapstructure:"color" env:"OCIS_LOG_COLOR;IDP_LOG_COLOR"` - File string `mapstructure:"file" env:"OCIS_LOG_FILE;IDP_LOG_FILE"` + Level string `ocisConfig:"level" env:"OCIS_LOG_LEVEL;IDP_LOG_LEVEL"` + Pretty bool `ocisConfig:"pretty" env:"OCIS_LOG_PRETTY;IDP_LOG_PRETTY"` + Color bool `ocisConfig:"color" env:"OCIS_LOG_COLOR;IDP_LOG_COLOR"` + File string `ocisConfig:"file" env:"OCIS_LOG_FILE;IDP_LOG_FILE"` } diff --git a/idp/pkg/config/service.go b/idp/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/idp/pkg/config/service.go +++ b/idp/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/nats/pkg/config/config.go b/nats/pkg/config/config.go index af3257f34..bc8d670fc 100644 --- a/nats/pkg/config/config.go +++ b/nats/pkg/config/config.go @@ -8,16 +8,16 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons + *shared.Commons `ocisConfig:"-" yaml:"-"` - Service Service + Service Service `ocisConfig:"-" yaml:"-"` Log *Log `ocisConfig:"log"` Debug Debug `ocisConfig:"debug"` Nats Nats `ociConfig:"nats"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } // Nats is the nats config diff --git a/nats/pkg/config/service.go b/nats/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/nats/pkg/config/service.go +++ b/nats/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/notifications/pkg/config/config.go b/notifications/pkg/config/config.go index 8ac7da5d8..bda3539d6 100644 --- a/notifications/pkg/config/config.go +++ b/notifications/pkg/config/config.go @@ -8,16 +8,16 @@ import ( // Config combines all available configuration parts. type Config struct { - *shared.Commons + *shared.Commons `ocisConfig:"-" yaml:"-"` - Service Service + Service Service `ocisConfig:"-" yaml:"-"` Log *Log `ocisConfig:"log"` Debug Debug `ocisConfig:"debug"` Notifications Notifications `ocisConfig:"notifications"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } // Notifications definces the config options for the notifications service. diff --git a/notifications/pkg/config/service.go b/notifications/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/notifications/pkg/config/service.go +++ b/notifications/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/ocs/pkg/config/config.go b/ocs/pkg/config/config.go index 2c9693adc..3659d08f3 100644 --- a/ocs/pkg/config/config.go +++ b/ocs/pkg/config/config.go @@ -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"` @@ -27,7 +27,7 @@ type Config struct { StorageUsersDriver string `ocisConfig:"storage_users_driver" env:"STORAGE_USERS_DRIVER;OCS_STORAGE_USERS_DRIVER"` MachineAuthAPIKey string `ocisConfig:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;OCS_MACHINE_AUTH_API_KEY"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } // IdentityManagement keeps track of the OIDC address. This is because Reva requisite of uniqueness for users diff --git a/ocs/pkg/config/http.go b/ocs/pkg/config/http.go index b965e78b3..d951aed83 100644 --- a/ocs/pkg/config/http.go +++ b/ocs/pkg/config/http.go @@ -4,8 +4,8 @@ package config type HTTP struct { Addr string `ocisConfig:"addr" env:"OCS_HTTP_ADDR"` Root string `ocisConfig:"root" env:"OCS_HTTP_ROOT"` - Namespace string - CORS CORS `ocisConfig:"cors"` + Namespace string `ocisConfig:"-" yaml:"-"` + CORS CORS `ocisConfig:"cors"` } // CORS defines the available cors configuration. diff --git a/ocs/pkg/config/service.go b/ocs/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/ocs/pkg/config/service.go +++ b/ocs/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/proxy/pkg/config/config.go b/proxy/pkg/config/config.go index 277b7dff2..6cda66b8f 100644 --- a/proxy/pkg/config/config.go +++ b/proxy/pkg/config/config.go @@ -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"` @@ -34,7 +34,7 @@ type Config struct { InsecureBackends bool `ocisConfig:"insecure_backends" env:"PROXY_INSECURE_BACKENDS"` AuthMiddleware AuthMiddleware `ocisConfig:"auth_middleware"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } // Policy enables us to use multiple directors. diff --git a/proxy/pkg/config/http.go b/proxy/pkg/config/http.go index 8ab553063..325389414 100644 --- a/proxy/pkg/config/http.go +++ b/proxy/pkg/config/http.go @@ -4,7 +4,7 @@ package config type HTTP struct { Addr string `ocisConfig:"addr" env:"PROXY_HTTP_ADDR"` Root string `ocisConfig:"root" env:"PROXY_HTTP_ROOT"` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` TLSCert string `ocisConfig:"tls_cert" env:"PROXY_TRANSPORT_TLS_CERT"` TLSKey string `ocisConfig:"tls_key" env:"PROXY_TRANSPORT_TLS_KEY"` TLS bool `ocisConfig:"tls" env:"PROXY_TLS"` diff --git a/proxy/pkg/config/service.go b/proxy/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/proxy/pkg/config/service.go +++ b/proxy/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/settings/pkg/config/config.go b/settings/pkg/config/config.go index 8e9e5f1ef..ef0e3d31a 100644 --- a/settings/pkg/config/config.go +++ b/settings/pkg/config/config.go @@ -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"` @@ -23,7 +23,7 @@ type Config struct { Asset Asset `ocisConfig:"asset"` TokenManager TokenManager `ocisConfig:"token_manager"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } // Asset defines the available asset configuration. diff --git a/settings/pkg/config/grpc.go b/settings/pkg/config/grpc.go index 016b61fa9..fc399ca6b 100644 --- a/settings/pkg/config/grpc.go +++ b/settings/pkg/config/grpc.go @@ -3,5 +3,5 @@ package config // GRPC defines the available grpc configuration. type GRPC struct { Addr string `ocisConfig:"addr" env:"SETTINGS_GRPC_ADDR"` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` } diff --git a/settings/pkg/config/http.go b/settings/pkg/config/http.go index f2099febf..fa23bd1fe 100644 --- a/settings/pkg/config/http.go +++ b/settings/pkg/config/http.go @@ -3,7 +3,7 @@ package config // HTTP defines the available http configuration. type HTTP struct { Addr string `ocisConfig:"addr" env:"SETTINGS_HTTP_ADDR"` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` Root string `ocisConfig:"root" env:"SETTINGS_HTTP_ROOT"` CacheTTL int `ocisConfig:"cache_ttl" env:"SETTINGS_CACHE_TTL"` CORS CORS `ocisConfig:"cors"` diff --git a/settings/pkg/config/service.go b/settings/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/settings/pkg/config/service.go +++ b/settings/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/store/pkg/config/config.go b/store/pkg/config/config.go index 585fd7424..7c8bc6ae1 100644 --- a/store/pkg/config/config.go +++ b/store/pkg/config/config.go @@ -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"` @@ -20,5 +20,5 @@ type Config struct { Datapath string `ocisConfig:"data_path" env:"STORE_DATA_PATH"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } diff --git a/store/pkg/config/grpc.go b/store/pkg/config/grpc.go index ed87112dd..095e30f6b 100644 --- a/store/pkg/config/grpc.go +++ b/store/pkg/config/grpc.go @@ -3,5 +3,5 @@ package config // GRPC defines the available grpc configuration. type GRPC struct { Addr string `ocisConfig:"addr" env:"STORE_GRPC_ADDR"` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` } diff --git a/store/pkg/config/service.go b/store/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/store/pkg/config/service.go +++ b/store/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/thumbnails/pkg/config/config.go b/thumbnails/pkg/config/config.go index 2311a4e4d..fff0d33f4 100644 --- a/thumbnails/pkg/config/config.go +++ b/thumbnails/pkg/config/config.go @@ -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. diff --git a/thumbnails/pkg/config/defaults/defaultconfig.go b/thumbnails/pkg/config/defaults/defaultconfig.go index a32f7df07..f52e21232 100644 --- a/thumbnails/pkg/config/defaults/defaultconfig.go +++ b/thumbnails/pkg/config/defaults/defaultconfig.go @@ -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", diff --git a/thumbnails/pkg/config/grpc.go b/thumbnails/pkg/config/grpc.go index 9682ed12c..51bacff50 100644 --- a/thumbnails/pkg/config/grpc.go +++ b/thumbnails/pkg/config/grpc.go @@ -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:"-"` } diff --git a/thumbnails/pkg/config/http.go b/thumbnails/pkg/config/http.go index f3b4d5728..9dc731261 100644 --- a/thumbnails/pkg/config/http.go +++ b/thumbnails/pkg/config/http.go @@ -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:"-"` } diff --git a/thumbnails/pkg/config/service.go b/thumbnails/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/thumbnails/pkg/config/service.go +++ b/thumbnails/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/web/pkg/config/config.go b/web/pkg/config/config.go index d403136e1..4b571ba85 100644 --- a/web/pkg/config/config.go +++ b/web/pkg/config/config.go @@ -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"` @@ -22,7 +22,7 @@ type Config struct { File string `ocisConfig:"file" env:"WEB_UI_CONFIG"` // TODO: rename this to a more self explaining string Web Web `ocisConfig:"web"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } // Asset defines the available asset configuration. diff --git a/web/pkg/config/http.go b/web/pkg/config/http.go index 317b93497..ac074ab2e 100644 --- a/web/pkg/config/http.go +++ b/web/pkg/config/http.go @@ -3,7 +3,7 @@ package config // HTTP defines the available http configuration. type HTTP struct { Addr string `ocisConfig:"addr" env:"WEB_HTTP_ADDR"` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` Root string `ocisConfig:"root" env:"WEB_HTTP_ROOT"` CacheTTL int `ocisConfig:"cache_ttl" env:"WEB_CACHE_TTL"` } diff --git a/web/pkg/config/service.go b/web/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/web/pkg/config/service.go +++ b/web/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` } diff --git a/webdav/pkg/config/config.go b/webdav/pkg/config/config.go index 04fb193e5..1c64f2923 100644 --- a/webdav/pkg/config/config.go +++ b/webdav/pkg/config/config.go @@ -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"` @@ -22,5 +22,5 @@ type Config struct { WebdavNamespace string `ocisConfig:"webdav_namespace" env:"STORAGE_WEBDAV_NAMESPACE"` //TODO: prevent this cross config RevaGateway string `ocisConfig:"reva_gateway" env:"REVA_GATEWAY"` - Context context.Context + Context context.Context `ocisConfig:"-" yaml:"-"` } diff --git a/webdav/pkg/config/http.go b/webdav/pkg/config/http.go index 4ce2f2dcd..ebf8332c3 100644 --- a/webdav/pkg/config/http.go +++ b/webdav/pkg/config/http.go @@ -11,7 +11,7 @@ type CORS struct { // HTTP defines the available http configuration. type HTTP struct { Addr string `ocisConfig:"addr" env:"WEBDAV_HTTP_ADDR"` - Namespace string + Namespace string `ocisConfig:"-" yaml:"-"` Root string `ocisConfig:"root" env:"WEBDAV_HTTP_ROOT"` CORS CORS `ocisConfig:"cors"` } diff --git a/webdav/pkg/config/service.go b/webdav/pkg/config/service.go index f98aa3d27..c019b7304 100644 --- a/webdav/pkg/config/service.go +++ b/webdav/pkg/config/service.go @@ -2,5 +2,5 @@ package config // Service defines the available service configuration. type Service struct { - Name string + Name string `ocisConfig:"-" yaml:"-"` }