sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16 from opencloud-eu/code-changes

Browse Source 
small Code changes that mostly affect user visible strings ...
This commit is contained in:
Jörn Friedrich Dreyer
2025-01-14 15:26:26 +01:00
committed by GitHub
parent b595dcefc0 ca25f8b18b
commit fe2976ffd9
66 changed files with 215 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opencloud/pkg/init/structs.go
+2 -2
View File
@@ -2,7 +2,7 @@ package init
// TODO: use the oCIS config struct instead of this custom struct // TODO: use the oCIS config struct instead of this custom struct
// We can't use it right now, because it would need "omitempty" on // We can't use it right now, because it would need "omitempty" on
// all elements, in order to produce a slim config file with `ocis init`. // all elements, in order to produce a slim config file with `opencloud init`.
// We can't just add these "omitempty" tags, since we want to generate // We can't just add these "omitempty" tags, since we want to generate
// full example configuration files with that struct, too. // full example configuration files with that struct, too.
// Proposed solution to get rid of this temporary solution: // Proposed solution to get rid of this temporary solution:
@@ -13,7 +13,7 @@ package init
// - recurse through the nodes and delete empty / default ones // - recurse through the nodes and delete empty / default ones
// - marshal it to yaml // - marshal it to yaml
// OcisConfig is the configuration for the oCIS services // OcisConfig is the configuration for the OpenCloud services
type OcisConfig struct { type OcisConfig struct {
TokenManager TokenManager `yaml:"token_manager"` TokenManager TokenManager `yaml:"token_manager"`
MachineAuthAPIKey string `yaml:"machine_auth_api_key"` MachineAuthAPIKey string `yaml:"machine_auth_api_key"`
opencloud/pkg/runtime/service/service.go
+52 -52
View File
@@ -22,7 +22,7 @@ import (
notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/command" notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/command"
"github.com/thejerf/suture/v4" "github.com/thejerf/suture/v4"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/pkg/log"
ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
@@ -71,10 +71,10 @@ var (
runset map[string]struct{} runset map[string]struct{}
// wait funcs run after the service group has been started. // wait funcs run after the service group has been started.
_waitFuncs = []func(*ociscfg.Config) error{pingNats, pingGateway, nil, wait(time.Second), nil} _waitFuncs = []func(*occfg.Config) error{pingNats, pingGateway, nil, wait(time.Second), nil}
) )
type serviceFuncMap map[string]func(*ociscfg.Config) suture.Service type serviceFuncMap map[string]func(*occfg.Config) suture.Service
// Service represents a RPC service. // Service represents a RPC service.
type Service struct { type Service struct {
@@ -86,7 +86,7 @@ type Service struct {
serviceToken map[string][]suture.ServiceToken serviceToken map[string][]suture.ServiceToken
context context.Context context context.Context
cancel context.CancelFunc cancel context.CancelFunc
cfg *ociscfg.Config cfg *occfg.Config
} }
// NewService returns a configured service with a controller and a default logger. // NewService returns a configured service with a controller and a default logger.
@@ -121,7 +121,7 @@ func NewService(ctx context.Context, options ...Option) (*Service, error) {
} }
// populate services // populate services
reg := func(priority int, name string, exec func(context.Context, *ociscfg.Config) error) { reg := func(priority int, name string, exec func(context.Context, *occfg.Config) error) {
if s.Services[priority] == nil { if s.Services[priority] == nil {
s.Services[priority] = make(serviceFuncMap) s.Services[priority] = make(serviceFuncMap)
} }
@@ -129,14 +129,14 @@ func NewService(ctx context.Context, options ...Option) (*Service, error) {
} }
// nats is in priority group 0. It needs to start before all other services // nats is in priority group 0. It needs to start before all other services
reg(0, opts.Config.Nats.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(0, opts.Config.Nats.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Nats.Context = ctx cfg.Nats.Context = ctx
cfg.Nats.Commons = cfg.Commons cfg.Nats.Commons = cfg.Commons
return nats.Execute(cfg.Nats) return nats.Execute(cfg.Nats)
}) })
// gateway is in priority group 1. It needs to start before the reva services // gateway is in priority group 1. It needs to start before the reva services
reg(1, opts.Config.Gateway.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(1, opts.Config.Gateway.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Gateway.Context = ctx cfg.Gateway.Context = ctx
cfg.Gateway.Commons = cfg.Commons cfg.Gateway.Commons = cfg.Commons
return gateway.Execute(cfg.Gateway) return gateway.Execute(cfg.Gateway)
@@ -145,157 +145,157 @@ func NewService(ctx context.Context, options ...Option) (*Service, error) {
// priority group 2 is empty for now // priority group 2 is empty for now
// most services are in priority group 3 // most services are in priority group 3
reg(3, opts.Config.Activitylog.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Activitylog.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Activitylog.Context = ctx cfg.Activitylog.Context = ctx
cfg.Activitylog.Commons = cfg.Commons cfg.Activitylog.Commons = cfg.Commons
return activitylog.Execute(cfg.Activitylog) return activitylog.Execute(cfg.Activitylog)
}) })
reg(3, opts.Config.AppProvider.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.AppProvider.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.AppProvider.Context = ctx cfg.AppProvider.Context = ctx
cfg.AppProvider.Commons = cfg.Commons cfg.AppProvider.Commons = cfg.Commons
return appProvider.Execute(cfg.AppProvider) return appProvider.Execute(cfg.AppProvider)
}) })
reg(3, opts.Config.AppRegistry.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.AppRegistry.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.AppRegistry.Context = ctx cfg.AppRegistry.Context = ctx
cfg.AppRegistry.Commons = cfg.Commons cfg.AppRegistry.Commons = cfg.Commons
return appRegistry.Execute(cfg.AppRegistry) return appRegistry.Execute(cfg.AppRegistry)
}) })
reg(3, opts.Config.AuthBasic.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.AuthBasic.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.AuthBasic.Context = ctx cfg.AuthBasic.Context = ctx
cfg.AuthBasic.Commons = cfg.Commons cfg.AuthBasic.Commons = cfg.Commons
return authbasic.Execute(cfg.AuthBasic) return authbasic.Execute(cfg.AuthBasic)
}) })
reg(3, opts.Config.AuthMachine.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.AuthMachine.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.AuthMachine.Context = ctx cfg.AuthMachine.Context = ctx
cfg.AuthMachine.Commons = cfg.Commons cfg.AuthMachine.Commons = cfg.Commons
return authmachine.Execute(cfg.AuthMachine) return authmachine.Execute(cfg.AuthMachine)
}) })
reg(3, opts.Config.AuthService.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.AuthService.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.AuthService.Context = ctx cfg.AuthService.Context = ctx
cfg.AuthService.Commons = cfg.Commons cfg.AuthService.Commons = cfg.Commons
return authservice.Execute(cfg.AuthService) return authservice.Execute(cfg.AuthService)
}) })
reg(3, opts.Config.Clientlog.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Clientlog.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Clientlog.Context = ctx cfg.Clientlog.Context = ctx
cfg.Clientlog.Commons = cfg.Commons cfg.Clientlog.Commons = cfg.Commons
return clientlog.Execute(cfg.Clientlog) return clientlog.Execute(cfg.Clientlog)
}) })
reg(3, opts.Config.EventHistory.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.EventHistory.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.EventHistory.Context = ctx cfg.EventHistory.Context = ctx
cfg.EventHistory.Commons = cfg.Commons cfg.EventHistory.Commons = cfg.Commons
return eventhistory.Execute(cfg.EventHistory) return eventhistory.Execute(cfg.EventHistory)
}) })
reg(3, opts.Config.Graph.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Graph.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Graph.Context = ctx cfg.Graph.Context = ctx
cfg.Graph.Commons = cfg.Commons cfg.Graph.Commons = cfg.Commons
return graph.Execute(cfg.Graph) return graph.Execute(cfg.Graph)
}) })
reg(3, opts.Config.Groups.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Groups.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Groups.Context = ctx cfg.Groups.Context = ctx
cfg.Groups.Commons = cfg.Commons cfg.Groups.Commons = cfg.Commons
return groups.Execute(cfg.Groups) return groups.Execute(cfg.Groups)
}) })
reg(3, opts.Config.IDM.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.IDM.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.IDM.Context = ctx cfg.IDM.Context = ctx
cfg.IDM.Commons = cfg.Commons cfg.IDM.Commons = cfg.Commons
return idm.Execute(cfg.IDM) return idm.Execute(cfg.IDM)
}) })
reg(3, opts.Config.OCDav.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.OCDav.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.OCDav.Context = ctx cfg.OCDav.Context = ctx
cfg.OCDav.Commons = cfg.Commons cfg.OCDav.Commons = cfg.Commons
return ocdav.Execute(cfg.OCDav) return ocdav.Execute(cfg.OCDav)
}) })
reg(3, opts.Config.OCS.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.OCS.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.OCS.Context = ctx cfg.OCS.Context = ctx
cfg.OCS.Commons = cfg.Commons cfg.OCS.Commons = cfg.Commons
return ocs.Execute(cfg.OCS) return ocs.Execute(cfg.OCS)
}) })
reg(3, opts.Config.Postprocessing.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Postprocessing.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Postprocessing.Context = ctx cfg.Postprocessing.Context = ctx
cfg.Postprocessing.Commons = cfg.Commons cfg.Postprocessing.Commons = cfg.Commons
return postprocessing.Execute(cfg.Postprocessing) return postprocessing.Execute(cfg.Postprocessing)
}) })
reg(3, opts.Config.Search.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Search.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Search.Context = ctx cfg.Search.Context = ctx
cfg.Search.Commons = cfg.Commons cfg.Search.Commons = cfg.Commons
return search.Execute(cfg.Search) return search.Execute(cfg.Search)
}) })
reg(3, opts.Config.Settings.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Settings.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Settings.Context = ctx cfg.Settings.Context = ctx
cfg.Settings.Commons = cfg.Commons cfg.Settings.Commons = cfg.Commons
return settings.Execute(cfg.Settings) return settings.Execute(cfg.Settings)
}) })
reg(3, opts.Config.StoragePublicLink.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.StoragePublicLink.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.StoragePublicLink.Context = ctx cfg.StoragePublicLink.Context = ctx
cfg.StoragePublicLink.Commons = cfg.Commons cfg.StoragePublicLink.Commons = cfg.Commons
return storagepublic.Execute(cfg.StoragePublicLink) return storagepublic.Execute(cfg.StoragePublicLink)
}) })
reg(3, opts.Config.StorageShares.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.StorageShares.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.StorageShares.Context = ctx cfg.StorageShares.Context = ctx
cfg.StorageShares.Commons = cfg.Commons cfg.StorageShares.Commons = cfg.Commons
return storageshares.Execute(cfg.StorageShares) return storageshares.Execute(cfg.StorageShares)
}) })
reg(3, opts.Config.StorageSystem.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.StorageSystem.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.StorageSystem.Context = ctx cfg.StorageSystem.Context = ctx
cfg.StorageSystem.Commons = cfg.Commons cfg.StorageSystem.Commons = cfg.Commons
return storageSystem.Execute(cfg.StorageSystem) return storageSystem.Execute(cfg.StorageSystem)
}) })
reg(3, opts.Config.StorageUsers.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.StorageUsers.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.StorageUsers.Context = ctx cfg.StorageUsers.Context = ctx
cfg.StorageUsers.Commons = cfg.Commons cfg.StorageUsers.Commons = cfg.Commons
return storageusers.Execute(cfg.StorageUsers) return storageusers.Execute(cfg.StorageUsers)
}) })
reg(3, opts.Config.Thumbnails.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Thumbnails.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Thumbnails.Context = ctx cfg.Thumbnails.Context = ctx
cfg.Thumbnails.Commons = cfg.Commons cfg.Thumbnails.Commons = cfg.Commons
return thumbnails.Execute(cfg.Thumbnails) return thumbnails.Execute(cfg.Thumbnails)
}) })
reg(3, opts.Config.Userlog.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Userlog.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Userlog.Context = ctx cfg.Userlog.Context = ctx
cfg.Userlog.Commons = cfg.Commons cfg.Userlog.Commons = cfg.Commons
return userlog.Execute(cfg.Userlog) return userlog.Execute(cfg.Userlog)
}) })
reg(3, opts.Config.Users.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Users.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Users.Context = ctx cfg.Users.Context = ctx
cfg.Users.Commons = cfg.Commons cfg.Users.Commons = cfg.Commons
return users.Execute(cfg.Users) return users.Execute(cfg.Users)
}) })
reg(3, opts.Config.Web.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Web.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Web.Context = ctx cfg.Web.Context = ctx
cfg.Web.Commons = cfg.Commons cfg.Web.Commons = cfg.Commons
return web.Execute(cfg.Web) return web.Execute(cfg.Web)
}) })
reg(3, opts.Config.WebDAV.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.WebDAV.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.WebDAV.Context = ctx cfg.WebDAV.Context = ctx
cfg.WebDAV.Commons = cfg.Commons cfg.WebDAV.Commons = cfg.Commons
return webdav.Execute(cfg.WebDAV) return webdav.Execute(cfg.WebDAV)
}) })
reg(3, opts.Config.Webfinger.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Webfinger.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Webfinger.Context = ctx cfg.Webfinger.Context = ctx
cfg.Webfinger.Commons = cfg.Commons cfg.Webfinger.Commons = cfg.Commons
return webfinger.Execute(cfg.Webfinger) return webfinger.Execute(cfg.Webfinger)
}) })
reg(3, opts.Config.IDP.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.IDP.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.IDP.Context = ctx cfg.IDP.Context = ctx
cfg.IDP.Commons = cfg.Commons cfg.IDP.Commons = cfg.Commons
return idp.Execute(cfg.IDP) return idp.Execute(cfg.IDP)
}) })
reg(3, opts.Config.Proxy.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Proxy.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Proxy.Context = ctx cfg.Proxy.Context = ctx
cfg.Proxy.Commons = cfg.Commons cfg.Proxy.Commons = cfg.Commons
return proxy.Execute(cfg.Proxy) return proxy.Execute(cfg.Proxy)
}) })
reg(3, opts.Config.Sharing.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.Sharing.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Sharing.Context = ctx cfg.Sharing.Context = ctx
cfg.Sharing.Commons = cfg.Commons cfg.Sharing.Commons = cfg.Commons
return sharing.Execute(cfg.Sharing) return sharing.Execute(cfg.Sharing)
}) })
reg(3, opts.Config.SSE.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.SSE.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.SSE.Context = ctx cfg.SSE.Context = ctx
cfg.SSE.Commons = cfg.Commons cfg.SSE.Commons = cfg.Commons
return sse.Execute(cfg.SSE) return sse.Execute(cfg.SSE)
}) })
reg(3, opts.Config.OCM.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(3, opts.Config.OCM.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.OCM.Context = ctx cfg.OCM.Context = ctx
cfg.OCM.Commons = cfg.Commons cfg.OCM.Commons = cfg.Commons
return ocm.Execute(cfg.OCM) return ocm.Execute(cfg.OCM)
@@ -304,42 +304,42 @@ func NewService(ctx context.Context, options ...Option) (*Service, error) {
// out of some unknown reason ci gets angry when frontend service starts in priority group 3 // out of some unknown reason ci gets angry when frontend service starts in priority group 3
// this is not reproducible locally, it can start when nats and gateway are already running // this is not reproducible locally, it can start when nats and gateway are already running
// FIXME: find out why // FIXME: find out why
reg(4, opts.Config.Frontend.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { reg(4, opts.Config.Frontend.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Frontend.Context = ctx cfg.Frontend.Context = ctx
cfg.Frontend.Commons = cfg.Commons cfg.Frontend.Commons = cfg.Commons
return frontend.Execute(cfg.Frontend) return frontend.Execute(cfg.Frontend)
}) })
// populate optional services // populate optional services
areg := func(name string, exec func(context.Context, *ociscfg.Config) error) { areg := func(name string, exec func(context.Context, *occfg.Config) error) {
s.Additional[name] = NewSutureServiceBuilder(exec) s.Additional[name] = NewSutureServiceBuilder(exec)
} }
areg(opts.Config.Antivirus.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { areg(opts.Config.Antivirus.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Antivirus.Context = ctx cfg.Antivirus.Context = ctx
// cfg.Antivirus.Commons = cfg.Commons // antivirus holds no Commons atm // cfg.Antivirus.Commons = cfg.Commons // antivirus holds no Commons atm
return antivirus.Execute(cfg.Antivirus) return antivirus.Execute(cfg.Antivirus)
}) })
areg(opts.Config.Audit.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { areg(opts.Config.Audit.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Audit.Context = ctx cfg.Audit.Context = ctx
cfg.Audit.Commons = cfg.Commons cfg.Audit.Commons = cfg.Commons
return audit.Execute(cfg.Audit) return audit.Execute(cfg.Audit)
}) })
areg(opts.Config.AuthApp.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { areg(opts.Config.AuthApp.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.AuthApp.Context = ctx cfg.AuthApp.Context = ctx
cfg.AuthApp.Commons = cfg.Commons cfg.AuthApp.Commons = cfg.Commons
return authapp.Execute(cfg.AuthApp) return authapp.Execute(cfg.AuthApp)
}) })
areg(opts.Config.Policies.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { areg(opts.Config.Policies.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Policies.Context = ctx cfg.Policies.Context = ctx
cfg.Policies.Commons = cfg.Commons cfg.Policies.Commons = cfg.Commons
return policies.Execute(cfg.Policies) return policies.Execute(cfg.Policies)
}) })
areg(opts.Config.Invitations.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { areg(opts.Config.Invitations.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Invitations.Context = ctx cfg.Invitations.Context = ctx
cfg.Invitations.Commons = cfg.Commons cfg.Invitations.Commons = cfg.Commons
return invitations.Execute(cfg.Invitations) return invitations.Execute(cfg.Invitations)
}) })
areg(opts.Config.Notifications.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error { areg(opts.Config.Notifications.Service.Name, func(ctx context.Context, cfg *occfg.Config) error {
cfg.Notifications.Context = ctx cfg.Notifications.Context = ctx
cfg.Notifications.Commons = cfg.Commons cfg.Notifications.Commons = cfg.Commons
return notifications.Execute(cfg.Notifications) return notifications.Execute(cfg.Notifications)
@@ -447,13 +447,13 @@ func scheduleServiceTokens(s *Service, funcSet serviceFuncMap) {
} }
swap := deepcopy.Copy(s.cfg) swap := deepcopy.Copy(s.cfg)
s.serviceToken[name] = append(s.serviceToken[name], s.Supervisor.Add(funcSet[name](swap.(*ociscfg.Config)))) s.serviceToken[name] = append(s.serviceToken[name], s.Supervisor.Add(funcSet[name](swap.(*occfg.Config))))
} }
} }
// generateRunSet interprets the cfg.Runtime.Services config option to cherry-pick which services to start using // generateRunSet interprets the cfg.Runtime.Services config option to cherry-pick which services to start using
// the runtime. // the runtime.
func (s *Service) generateRunSet(cfg *ociscfg.Config) { func (s *Service) generateRunSet(cfg *occfg.Config) {
runset = make(map[string]struct{}) runset = make(map[string]struct{})
if cfg.Runtime.Services != nil { if cfg.Runtime.Services != nil {
for _, name := range cfg.Runtime.Services { for _, name := range cfg.Runtime.Services {
@@ -520,14 +520,14 @@ func trap(s *Service, ctx context.Context) {
} }
// pingNats will attempt to connect to nats, blocking until a connection is established // pingNats will attempt to connect to nats, blocking until a connection is established
func pingNats(cfg *ociscfg.Config) error { func pingNats(cfg *occfg.Config) error {
// We need to get a natsconfig from somewhere. We can use any one. // We need to get a natsconfig from somewhere. We can use any one.
evcfg := cfg.Postprocessing.Postprocessing.Events evcfg := cfg.Postprocessing.Postprocessing.Events
_, err := stream.NatsFromConfig("initial", true, stream.NatsConfig(evcfg)) _, err := stream.NatsFromConfig("initial", true, stream.NatsConfig(evcfg))
return err return err
} }
func pingGateway(cfg *ociscfg.Config) error { func pingGateway(cfg *occfg.Config) error {
// init grpc connection // init grpc connection
_, err := ogrpc.NewClient() _, err := ogrpc.NewClient()
if err != nil { if err != nil {
@@ -548,8 +548,8 @@ func pingGateway(cfg *ociscfg.Config) error {
return err return err
} }
func wait(d time.Duration) func(cfg *ociscfg.Config) error { func wait(d time.Duration) func(cfg *occfg.Config) error {
return func(cfg *ociscfg.Config) error { return func(cfg *occfg.Config) error {
time.Sleep(d) time.Sleep(d)
return nil return nil
} }
opencloud/pkg/runtime/service/sutureservice.go
+3 -3
View File
@@ -3,7 +3,7 @@ package service
import ( import (
"context" "context"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/thejerf/suture/v4" "github.com/thejerf/suture/v4"
) )
@@ -13,8 +13,8 @@ type SutureService struct {
} }
// NewSutureServiceBuilder creates a new suture service // NewSutureServiceBuilder creates a new suture service
func NewSutureServiceBuilder(f func(context.Context, *ociscfg.Config) error) func(*ociscfg.Config) suture.Service { func NewSutureServiceBuilder(f func(context.Context, *occfg.Config) error) func(*occfg.Config) suture.Service {
return func(cfg *ociscfg.Config) suture.Service { return func(cfg *occfg.Config) suture.Service {
return SutureService{ return SutureService{
exec: func(ctx context.Context) error { exec: func(ctx context.Context) error {
return f(ctx, cfg) return f(ctx, cfg)
pkg/config/parser/parse.go
+4 -4
View File
@@ -121,19 +121,19 @@ func EnsureCommons(cfg *config.Config) {
// is missing an error will be returned. // is missing an error will be returned.
func Validate(cfg *config.Config) error { func Validate(cfg *config.Config) error {
if cfg.TokenManager.JWTSecret == "" { if cfg.TokenManager.JWTSecret == "" {
return shared.MissingJWTTokenError("ocis") return shared.MissingJWTTokenError("opencloud")
} }
if cfg.TransferSecret == "" { if cfg.TransferSecret == "" {
return shared.MissingRevaTransferSecretError("ocis") return shared.MissingRevaTransferSecretError("opencloud")
} }
if cfg.MachineAuthAPIKey == "" { if cfg.MachineAuthAPIKey == "" {
return shared.MissingMachineAuthApiKeyError("ocis") return shared.MissingMachineAuthApiKeyError("opencloud")
} }
if cfg.SystemUserID == "" { if cfg.SystemUserID == "" {
return shared.MissingSystemUserID("ocis") return shared.MissingSystemUserID("opencloud")
} }
return nil return nil
pkg/shared/errors.go
+11 -11
View File
@@ -9,7 +9,7 @@ import (
func MissingMachineAuthApiKeyError(service string) error { func MissingMachineAuthApiKeyError(service string) error {
return fmt.Errorf("The Machineauth API key has not been configured for %s. "+ return fmt.Errorf("The Machineauth API key has not been configured for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by using 'ocis init --diff' and applying the patch or setting a value manually in "+ "(e.g. by using 'opencloud init --diff' and applying the patch or setting a value manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
service, defaults.BaseConfigPath()) service, defaults.BaseConfigPath())
} }
@@ -17,7 +17,7 @@ func MissingMachineAuthApiKeyError(service string) error {
func MissingSystemUserApiKeyError(service string) error { func MissingSystemUserApiKeyError(service string) error {
return fmt.Errorf("The SystemUser API key has not been configured for %s. "+ return fmt.Errorf("The SystemUser API key has not been configured for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by using 'ocis init --diff' and applying the patch or setting a value manually in "+ "(e.g. by using 'opencloud init --diff' and applying the patch or setting a value manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
service, defaults.BaseConfigPath()) service, defaults.BaseConfigPath())
} }
@@ -25,7 +25,7 @@ func MissingSystemUserApiKeyError(service string) error {
func MissingJWTTokenError(service string) error { func MissingJWTTokenError(service string) error {
return fmt.Errorf("The jwt_secret has not been set properly in your config for %s. "+ return fmt.Errorf("The jwt_secret has not been set properly in your config for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by using 'ocis init --diff' and applying the patch or setting a value manually in "+ "(e.g. by using 'opencloud init --diff' and applying the patch or setting a value manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
service, defaults.BaseConfigPath()) service, defaults.BaseConfigPath())
} }
@@ -33,7 +33,7 @@ func MissingJWTTokenError(service string) error {
func MissingRevaTransferSecretError(service string) error { func MissingRevaTransferSecretError(service string) error {
return fmt.Errorf("The transfer_secret has not been set properly in your config for %s. "+ return fmt.Errorf("The transfer_secret has not been set properly in your config for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by using 'ocis init --diff' and applying the patch or setting a value manually in "+ "(e.g. by using 'opencloud init --diff' and applying the patch or setting a value manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
service, defaults.BaseConfigPath()) service, defaults.BaseConfigPath())
} }
@@ -41,7 +41,7 @@ func MissingRevaTransferSecretError(service string) error {
func MissingLDAPBindPassword(service string) error { func MissingLDAPBindPassword(service string) error {
return fmt.Errorf("The ldap bind_password has not been set properly in your config for %s. "+ return fmt.Errorf("The ldap bind_password has not been set properly in your config for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by using 'ocis init --diff' and applying the patch or setting a value manually in "+ "(e.g. by using 'opencloud init --diff' and applying the patch or setting a value manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
service, defaults.BaseConfigPath()) service, defaults.BaseConfigPath())
} }
@@ -49,7 +49,7 @@ func MissingLDAPBindPassword(service string) error {
func MissingServiceUserPassword(service, serviceUser string) error { func MissingServiceUserPassword(service, serviceUser string) error {
return fmt.Errorf("The password of service user %s has not been set properly in your config for %s. "+ return fmt.Errorf("The password of service user %s has not been set properly in your config for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by using 'ocis init --diff' and applying the patch or setting a value manually in "+ "(e.g. by using 'opencloud init --diff' and applying the patch or setting a value manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
serviceUser, service, defaults.BaseConfigPath()) serviceUser, service, defaults.BaseConfigPath())
} }
@@ -57,7 +57,7 @@ func MissingServiceUserPassword(service, serviceUser string) error {
func MissingSystemUserID(service string) error { func MissingSystemUserID(service string) error {
return fmt.Errorf("The system user ID has not been configured for %s. "+ return fmt.Errorf("The system user ID has not been configured for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by using 'ocis init --diff' and applying the patch or setting a value manually in "+ "(e.g. by using 'opencloud init --diff' and applying the patch or setting a value manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
service, defaults.BaseConfigPath()) service, defaults.BaseConfigPath())
} }
@@ -65,7 +65,7 @@ func MissingSystemUserID(service string) error {
func MissingAdminUserID(service string) error { func MissingAdminUserID(service string) error {
return fmt.Errorf("The admin user ID has not been configured for %s. "+ return fmt.Errorf("The admin user ID has not been configured for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by using 'ocis init --diff' and applying the patch or setting a value manually in "+ "(e.g. by using 'opencloud init --diff' and applying the patch or setting a value manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
service, defaults.BaseConfigPath()) service, defaults.BaseConfigPath())
} }
@@ -73,7 +73,7 @@ func MissingAdminUserID(service string) error {
func MissingServiceAccountID(service string) error { func MissingServiceAccountID(service string) error {
return fmt.Errorf("The service account id has not been configured for %s. "+ return fmt.Errorf("The service account id has not been configured for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by using 'ocis init --diff' and applying the patch or setting a value manually in "+ "(e.g. by using 'opencloud init --diff' and applying the patch or setting a value manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
service, defaults.BaseConfigPath()) service, defaults.BaseConfigPath())
} }
@@ -81,7 +81,7 @@ func MissingServiceAccountID(service string) error {
func MissingServiceAccountSecret(service string) error { func MissingServiceAccountSecret(service string) error {
return fmt.Errorf("The service account secret has not been configured for %s. "+ return fmt.Errorf("The service account secret has not been configured for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by using 'ocis init --diff' and applying the patch or setting a value manually in "+ "(e.g. by using 'opencloud init --diff' and applying the patch or setting a value manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
service, defaults.BaseConfigPath()) service, defaults.BaseConfigPath())
} }
@@ -89,7 +89,7 @@ func MissingServiceAccountSecret(service string) error {
func MissingWOPISecretError(service string) error { func MissingWOPISecretError(service string) error {
return fmt.Errorf("The WOPI secret has not been set properly in your config for %s. "+ return fmt.Errorf("The WOPI secret has not been set properly in your config for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by using 'ocis init --diff' and applying the patch or setting a value manually in "+ "(e.g. by using 'opencloud init --diff' and applying the patch or setting a value manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
service, defaults.BaseConfigPath()) service, defaults.BaseConfigPath())
} }
services/activitylog/pkg/config/config.go
+3 -3
View File
@@ -40,9 +40,9 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"5.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
// Store configures the store to use // Store configures the store to use
services/activitylog/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config"
"github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/antivirus/pkg/config/config.go
+3 -3
View File
@@ -55,9 +55,9 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;ANTIVIRUS_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;ANTIVIRUS_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;ANTIVIRUS_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;ANTIVIRUS_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;ANTIVIRUS_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided ANTIVIRUS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;ANTIVIRUS_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided ANTIVIRUS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;ANTIVIRUS_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;ANTIVIRUS_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;ANTIVIRUS_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;ANTIVIRUS_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;ANTIVIRUS_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;ANTIVIRUS_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
// Scanner provides configuration options for the virus scanner // Scanner provides configuration options for the virus scanner
services/antivirus/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config"
"github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/app-provider/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config"
"github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/app-registry/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config"
"github.com/opencloud-eu/opencloud/services/app-registry/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/audit/pkg/config/config.go
+3 -3
View File
@@ -28,9 +28,9 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;AUDIT_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;AUDIT_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;AUDIT_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;AUDIT_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;AUDIT_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided AUDIT_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;AUDIT_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided AUDIT_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;AUDIT_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;AUDIT_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;AUDIT_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;AUDIT_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;AUDIT_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;AUDIT_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
// Auditlog holds audit log information // Auditlog holds audit log information
services/audit/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/audit/pkg/config" "github.com/opencloud-eu/opencloud/services/audit/pkg/config"
"github.com/opencloud-eu/opencloud/services/audit/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/audit/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/auth-app/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config"
"github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/auth-basic/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config"
"github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/auth-bearer/pkg/command/root.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"os" "os"
"github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/pkg/clihelper"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config"
"github.com/thejerf/suture/v4" "github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
@@ -42,7 +42,7 @@ type SutureService struct {
} }
// NewSutureService creates a new auth-bearer.SutureService // NewSutureService creates a new auth-bearer.SutureService
func NewSutureService(cfg *ociscfg.Config) suture.Service { func NewSutureService(cfg *occfg.Config) suture.Service {
cfg.AuthBearer.Commons = cfg.Commons cfg.AuthBearer.Commons = cfg.Commons
return SutureService{ return SutureService{
cfg: cfg.AuthBearer, cfg: cfg.AuthBearer,
services/auth-bearer/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config"
"github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/auth-machine/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config"
"github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/auth-service/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config"
"github.com/opencloud-eu/opencloud/services/auth-service/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/clientlog/pkg/config/config.go
+3 -3
View File
@@ -34,9 +34,9 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;CLIENTLOG_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"5.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;CLIENTLOG_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;CLIENTLOG_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;CLIENTLOG_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;CLIENTLOG_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;CLIENTLOG_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;CLIENTLOG_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;CLIENTLOG_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;CLIENTLOG_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;CLIENTLOG_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;CLIENTLOG_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;CLIENTLOG_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
// TokenManager is the config for using the reva token manager // TokenManager is the config for using the reva token manager
services/clientlog/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config"
"github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/collaboration/pkg/config/parser/parse.go
+4 -4
View File
@@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"net/url" "net/url"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
ocisdefaults "github.com/opencloud-eu/opencloud/pkg/config/defaults" ocisdefaults "github.com/opencloud-eu/opencloud/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode" "github.com/opencloud-eu/opencloud/pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
@@ -15,7 +15,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
@@ -47,14 +47,14 @@ func Validate(cfg *config.Config) error {
if err != nil { if err != nil {
return fmt.Errorf("The WOPI Src has not been set properly in your config for %s. "+ return fmt.Errorf("The WOPI Src has not been set properly in your config for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by running ocis init or setting it manually in "+ "(e.g. by running opencloud init or setting it manually in "+
"the config/corresponding environment variable): %s", "the config/corresponding environment variable): %s",
cfg.Service.Name, ocisdefaults.BaseConfigPath(), err.Error()) cfg.Service.Name, ocisdefaults.BaseConfigPath(), err.Error())
} }
if url.Path != "" { if url.Path != "" {
return fmt.Errorf("The WOPI Src must not contain a path in your config for %s. "+ return fmt.Errorf("The WOPI Src must not contain a path in your config for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by running ocis init or setting it manually in "+ "(e.g. by running opencloud init or setting it manually in "+
"the config/corresponding environment variable)", "the config/corresponding environment variable)",
cfg.Service.Name, ocisdefaults.BaseConfigPath()) cfg.Service.Name, ocisdefaults.BaseConfigPath())
} }
services/eventhistory/pkg/config/config.go
+3 -3
View File
@@ -52,7 +52,7 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;EVENTHISTORY_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;EVENTHISTORY_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;EVENTHISTORY_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;EVENTHISTORY_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;EVENTHISTORY_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. Will be seen as empty if NOTIFICATIONS_EVENTS_TLS_INSECURE is provided." introductionVersion:"pre5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;EVENTHISTORY_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. Will be seen as empty if NOTIFICATIONS_EVENTS_TLS_INSECURE is provided." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;EVENTHISTORY_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;EVENTHISTORY_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;EVENTHISTORY_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;EVENTHISTORY_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;EVENTHISTORY_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;EVENTHISTORY_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
services/eventhistory/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config"
"github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/frontend/pkg/config/config.go
+3 -3
View File
@@ -172,9 +172,9 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;FRONTEND_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"5.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;FRONTEND_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;FRONTEND_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;FRONTEND_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"FRONTEND_EVENTS_TLS_ROOT_CA_CERTIFICATE;OCS_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"FRONTEND_EVENTS_TLS_ROOT_CA_CERTIFICATE;OCS_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;FRONTEND_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;FRONTEND_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;FRONTEND_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;FRONTEND_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;FRONTEND_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;FRONTEND_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
// ServiceAccount is the configuration for the used service account // ServiceAccount is the configuration for the used service account
services/frontend/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/pkg/structs"
"github.com/opencloud-eu/opencloud/services/frontend/pkg/config" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config"
@@ -14,7 +14,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/gateway/pkg/config/parser/parse.go
+3 -3
View File
@@ -4,7 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults" defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode" "github.com/opencloud-eu/opencloud/pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
@@ -14,7 +14,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
@@ -46,7 +46,7 @@ func Validate(cfg *config.Config) error {
if cfg.StorageRegistry.StorageUsersMountID == "" { if cfg.StorageRegistry.StorageUsersMountID == "" {
return fmt.Errorf("The storage users mount ID has not been configured for %s. "+ return fmt.Errorf("The storage users mount ID has not been configured for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by running ocis init or setting it manually in "+ "(e.g. by running opencloud init or setting it manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
"gateway", defaults2.BaseConfigPath()) "gateway", defaults2.BaseConfigPath())
} }
services/graph/pkg/config/config.go
+3 -3
View File
@@ -125,9 +125,9 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;GRAPH_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture." introductionVersion:"pre5.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;GRAPH_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture." introductionVersion:"pre5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;GRAPH_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;GRAPH_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;GRAPH_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided GRAPH_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;GRAPH_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided GRAPH_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;GRAPH_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;GRAPH_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;GRAPH_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;GRAPH_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;GRAPH_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;GRAPH_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
// CORS defines the available cors configuration. // CORS defines the available cors configuration.
services/graph/pkg/config/parser/parse.go
+4 -4
View File
@@ -6,7 +6,7 @@ import (
"github.com/go-ldap/ldap/v3" "github.com/go-ldap/ldap/v3"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults" defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode" "github.com/opencloud-eu/opencloud/pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
@@ -17,7 +17,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
@@ -51,7 +51,7 @@ func Validate(cfg *config.Config) error {
if cfg.Application.ID == "" { if cfg.Application.ID == "" {
return fmt.Errorf("The application ID has not been configured for %s. "+ return fmt.Errorf("The application ID has not been configured for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by running ocis init or setting it manually in "+ "(e.g. by running opencloud init or setting it manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
"graph", defaults2.BaseConfigPath()) "graph", defaults2.BaseConfigPath())
} }
@@ -61,7 +61,7 @@ func Validate(cfg *config.Config) error {
default: default:
return fmt.Errorf("The username match validator is invalid for %s. "+ return fmt.Errorf("The username match validator is invalid for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by running ocis init or setting it manually in "+ "(e.g. by running opencloud init or setting it manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
"graph", defaults2.BaseConfigPath()) "graph", defaults2.BaseConfigPath())
} }
services/groups/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/groups/pkg/config" "github.com/opencloud-eu/opencloud/services/groups/pkg/config"
"github.com/opencloud-eu/opencloud/services/groups/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/groups/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/idm/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/idm/pkg/config" "github.com/opencloud-eu/opencloud/services/idm/pkg/config"
"github.com/opencloud-eu/opencloud/services/idm/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/idm/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/idp/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/idp/pkg/config" "github.com/opencloud-eu/opencloud/services/idp/pkg/config"
"github.com/opencloud-eu/opencloud/services/idp/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/idp/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/invitations/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/invitations/pkg/config" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config"
"github.com/opencloud-eu/opencloud/services/invitations/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/nats/pkg/config/config.go
+1 -1
View File
@@ -28,7 +28,7 @@ type Nats struct {
TLSCert string `yaml:"tls_cert" env:"NATS_TLS_CERT" desc:"Path/File name of the TLS server certificate (in PEM format) for the NATS listener. If not defined, the root directory derives from $OC_BASE_DATA_PATH/nats." introductionVersion:"pre5.0"` TLSCert string `yaml:"tls_cert" env:"NATS_TLS_CERT" desc:"Path/File name of the TLS server certificate (in PEM format) for the NATS listener. If not defined, the root directory derives from $OC_BASE_DATA_PATH/nats." introductionVersion:"pre5.0"`
TLSKey string `yaml:"tls_key" env:"NATS_TLS_KEY" desc:"Path/File name for the TLS certificate key (in PEM format) for the NATS listener. If not defined, the root directory derives from $OC_BASE_DATA_PATH/nats." introductionVersion:"pre5.0"` TLSKey string `yaml:"tls_key" env:"NATS_TLS_KEY" desc:"Path/File name for the TLS certificate key (in PEM format) for the NATS listener. If not defined, the root directory derives from $OC_BASE_DATA_PATH/nats." introductionVersion:"pre5.0"`
TLSSkipVerifyClientCert bool `yaml:"tls_skip_verify_client_cert" env:"OC_INSECURE;NATS_TLS_SKIP_VERIFY_CLIENT_CERT" desc:"Whether the NATS server should skip the client certificate verification during the TLS handshake." introductionVersion:"pre5.0"` TLSSkipVerifyClientCert bool `yaml:"tls_skip_verify_client_cert" env:"OC_INSECURE;NATS_TLS_SKIP_VERIFY_CLIENT_CERT" desc:"Whether the NATS server should skip the client certificate verification during the TLS handshake." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;NATS_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;NATS_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
} }
// Tracing is the tracing config // Tracing is the tracing config
services/nats/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/nats/pkg/config" "github.com/opencloud-eu/opencloud/services/nats/pkg/config"
"github.com/opencloud-eu/opencloud/services/nats/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/nats/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/notifications/pkg/config/config.go
+3 -3
View File
@@ -58,9 +58,9 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;NOTIFICATIONS_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;NOTIFICATIONS_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;NOTIFICATIONS_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;NOTIFICATIONS_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;NOTIFICATIONS_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;NOTIFICATIONS_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;NOTIFICATIONS_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;NOTIFICATIONS_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;NOTIFICATIONS_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;NOTIFICATIONS_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;NOTIFICATIONS_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;NOTIFICATIONS_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
// ServiceAccount is the configuration for the used service account // ServiceAccount is the configuration for the used service account
services/notifications/pkg/config/parser/parse.go
+2 -2
View File
@@ -6,7 +6,7 @@ import (
"net/mail" "net/mail"
"strings" "strings"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/config" "github.com/opencloud-eu/opencloud/services/notifications/pkg/config"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/notifications/pkg/config/defaults"
@@ -17,7 +17,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/ocdav/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config"
"github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/ocm/pkg/config/config.go
+3 -3
View File
@@ -155,7 +155,7 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;OCM_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;OCM_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;OCM_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;OCM_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;OCM_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided OCM_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;OCM_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided OCM_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;OCM_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;OCM_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;OCM_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;OCM_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;OCM_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;OCM_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
services/ocm/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/pkg/structs"
"github.com/opencloud-eu/opencloud/services/ocm/pkg/config" "github.com/opencloud-eu/opencloud/services/ocm/pkg/config"
@@ -14,7 +14,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/ocs/pkg/config/parser/parse.go
+2 -2
View File
@@ -6,7 +6,7 @@ import (
"github.com/opencloud-eu/opencloud/services/ocs/pkg/config" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config"
"github.com/opencloud-eu/opencloud/services/ocs/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config/defaults"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode" "github.com/opencloud-eu/opencloud/pkg/config/envdecode"
@@ -14,7 +14,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/policies/pkg/config/config.go
+3 -3
View File
@@ -53,9 +53,9 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;POLICIES_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;POLICIES_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;POLICIES_EVENTS_TLS_INSECURE" desc:"Whether the server should skip the client certificate verification during the TLS handshake." introductionVersion:"pre5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;POLICIES_EVENTS_TLS_INSECURE" desc:"Whether the server should skip the client certificate verification during the TLS handshake." introductionVersion:"pre5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;POLICIES_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided POLICIES_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;POLICIES_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided POLICIES_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;POLICIES_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;POLICIES_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;POLICIES_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;POLICIES_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;POLICIES_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;POLICIES_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
// Log defines the available log configuration. // Log defines the available log configuration.
services/policies/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/policies/pkg/config" "github.com/opencloud-eu/opencloud/services/policies/pkg/config"
"github.com/opencloud-eu/opencloud/services/policies/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/policies/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/postprocessing/pkg/config/config.go
+3 -3
View File
@@ -42,9 +42,9 @@ type Events struct {
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;POSTPROCESSING_EVENTS_TLS_INSECURE" desc:"Whether the ocis server should skip the client certificate verification during the TLS handshake." introductionVersion:"pre5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;POSTPROCESSING_EVENTS_TLS_INSECURE" desc:"Whether the ocis server should skip the client certificate verification during the TLS handshake." introductionVersion:"pre5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;POSTPROCESSING_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided POSTPROCESSING_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;POSTPROCESSING_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided POSTPROCESSING_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;POSTPROCESSING_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;POSTPROCESSING_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;POSTPROCESSING_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;POSTPROCESSING_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;POSTPROCESSING_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;POSTPROCESSING_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
// Debug defines the available debug configuration. // Debug defines the available debug configuration.
services/postprocessing/pkg/config/parser/parse.go
+2 -2
View File
@@ -6,7 +6,7 @@ import (
"strings" "strings"
"github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/events"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config"
"github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config/defaults"
@@ -15,7 +15,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/proxy/pkg/config/config.go
+3 -3
View File
@@ -226,7 +226,7 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;PROXY_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture." introductionVersion:"7.0.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;PROXY_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture." introductionVersion:"7.0.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;PROXY_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"7.0.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;PROXY_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"7.0.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;PROXY_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided PROXY_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"7.0.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;PROXY_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided PROXY_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"7.0.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;PROXY_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"7.0.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;PROXY_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"7.0.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;PROXY_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"7.0.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;PROXY_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"7.0.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;PROXY_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"7.0.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;PROXY_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"7.0.0"`
} }
services/proxy/pkg/config/parser/parse.go
+2 -2
View File
@@ -4,7 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults"
@@ -14,7 +14,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/search/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/search/pkg/config" "github.com/opencloud-eu/opencloud/services/search/pkg/config"
"github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/search/pkg/config/search.go
+3 -3
View File
@@ -10,7 +10,7 @@ type Events struct {
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;SEARCH_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;SEARCH_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;SEARCH_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided SEARCH_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;SEARCH_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided SEARCH_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;SEARCH_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;SEARCH_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;SEARCH_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;SEARCH_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;SEARCH_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;SEARCH_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
services/settings/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config" "github.com/opencloud-eu/opencloud/services/settings/pkg/config"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/settings/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/sharing/pkg/config/config.go
+1 -1
View File
@@ -152,7 +152,7 @@ type Events struct {
ClusterID string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;SHARING_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"` ClusterID string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;SHARING_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;SHARING_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;SHARING_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"`
TLSRootCaCertPath string `yaml:"tls_root_ca_cert_path" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;SHARING_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided SHARING_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"` TLSRootCaCertPath string `yaml:"tls_root_ca_cert_path" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;SHARING_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided SHARING_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;SHARING_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;SHARING_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
AuthUsername string `yaml:"auth_username" env:"OC_EVENTS_AUTH_USERNAME;SHARING_EVENTS_AUTH_USERNAME" desc:"Username for the events broker." introductionVersion:"5.0"` AuthUsername string `yaml:"auth_username" env:"OC_EVENTS_AUTH_USERNAME;SHARING_EVENTS_AUTH_USERNAME" desc:"Username for the events broker." introductionVersion:"5.0"`
AuthPassword string `yaml:"auth_password" env:"OC_EVENTS_AUTH_PASSWORD;SHARING_EVENTS_AUTH_PASSWORD" desc:"Password for the events broker." introductionVersion:"5.0"` AuthPassword string `yaml:"auth_password" env:"OC_EVENTS_AUTH_PASSWORD;SHARING_EVENTS_AUTH_PASSWORD" desc:"Password for the events broker." introductionVersion:"5.0"`
} }
services/sharing/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/sharing/pkg/config" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config"
"github.com/opencloud-eu/opencloud/services/sharing/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/defaults"
@@ -17,7 +17,7 @@ const (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/sse/pkg/config/config.go
+3 -3
View File
@@ -52,9 +52,9 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;SSE_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"5.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;SSE_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;SSE_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;SSE_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;SSE_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided SSE_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;SSE_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided SSE_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;SSE_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;SSE_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;SSE_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;SSE_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;SSE_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;SSE_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
// CORS defines the available cors configuration. // CORS defines the available cors configuration.
services/sse/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/sse/pkg/config" "github.com/opencloud-eu/opencloud/services/sse/pkg/config"
"github.com/opencloud-eu/opencloud/services/sse/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/sse/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/storage-publiclink/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config"
"github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/storage-shares/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config"
"github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/storage-system/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config"
"github.com/opencloud-eu/opencloud/services/storage-system/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/storage-users/pkg/config/config.go
+3 -3
View File
@@ -213,10 +213,10 @@ type Events struct {
ClusterID string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;STORAGE_USERS_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"` ClusterID string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;STORAGE_USERS_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;STORAGE_USERS_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;STORAGE_USERS_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"`
TLSRootCaCertPath string `yaml:"tls_root_ca_cert_path" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;STORAGE_USERS_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided STORAGE_USERS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"` TLSRootCaCertPath string `yaml:"tls_root_ca_cert_path" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;STORAGE_USERS_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided STORAGE_USERS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;STORAGE_USERS_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;STORAGE_USERS_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
NumConsumers int `yaml:"num_consumers" env:"STORAGE_USERS_EVENTS_NUM_CONSUMERS" desc:"The amount of concurrent event consumers to start. Event consumers are used for post-processing files. Multiple consumers increase parallelisation, but will also increase CPU and memory demands. The setting has no effect when the OC_ASYNC_UPLOADS is set to false. The default and minimum value is 1." introductionVersion:"pre5.0"` NumConsumers int `yaml:"num_consumers" env:"STORAGE_USERS_EVENTS_NUM_CONSUMERS" desc:"The amount of concurrent event consumers to start. Event consumers are used for post-processing files. Multiple consumers increase parallelisation, but will also increase CPU and memory demands. The setting has no effect when the OC_ASYNC_UPLOADS is set to false. The default and minimum value is 1." introductionVersion:"pre5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;STORAGE_USERS_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;STORAGE_USERS_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;STORAGE_USERS_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;STORAGE_USERS_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
// FilemetadataCache holds cache config // FilemetadataCache holds cache config
services/storage-users/pkg/config/parser/parse.go
+3 -3
View File
@@ -4,7 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults" defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config"
@@ -15,7 +15,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
@@ -43,7 +43,7 @@ func Validate(cfg *config.Config) error {
if cfg.MountID == "" { if cfg.MountID == "" {
return fmt.Errorf("The storage users mount ID has not been configured for %s. "+ return fmt.Errorf("The storage users mount ID has not been configured for %s. "+
"Make sure your %s config contains the proper values "+ "Make sure your %s config contains the proper values "+
"(e.g. by running ocis init or setting it manually in "+ "(e.g. by running opencloud init or setting it manually in "+
"the config/corresponding environment variable).", "the config/corresponding environment variable).",
"storage-users", defaults2.BaseConfigPath()) "storage-users", defaults2.BaseConfigPath())
} }
services/thumbnails/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/userlog/pkg/config/config.go
+3 -3
View File
@@ -55,9 +55,9 @@ type Events struct {
Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;USERLOG_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"` Cluster string `yaml:"cluster" env:"OC_EVENTS_CLUSTER;USERLOG_EVENTS_CLUSTER" desc:"The clusterID of the event system. The event system is the message queuing service. It is used as message broker for the microservice architecture. Mandatory when using NATS as event system." introductionVersion:"pre5.0"`
TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;USERLOG_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"` TLSInsecure bool `yaml:"tls_insecure" env:"OC_INSECURE;USERLOG_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates." introductionVersion:"pre5.0"`
TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;USERLOG_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"` TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"OC_EVENTS_TLS_ROOT_CA_CERTIFICATE;USERLOG_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false." introductionVersion:"pre5.0"`
EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;USERLOG_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"pre5.0"` EnableTLS bool `yaml:"enable_tls" env:"OC_EVENTS_ENABLE_TLS;USERLOG_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"pre5.0"`
AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;USERLOG_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthUsername string `yaml:"username" env:"OC_EVENTS_AUTH_USERNAME;USERLOG_EVENTS_AUTH_USERNAME" desc:"The username to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;USERLOG_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services." introductionVersion:"5.0"` AuthPassword string `yaml:"password" env:"OC_EVENTS_AUTH_PASSWORD;USERLOG_EVENTS_AUTH_PASSWORD" desc:"The password to authenticate with the events broker. The events broker is the OpenCloud service which receives and delivers events between the services." introductionVersion:"5.0"`
} }
// CORS defines the available cors configuration. // CORS defines the available cors configuration.
services/userlog/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config" "github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/userlog/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/users/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/users/pkg/config" "github.com/opencloud-eu/opencloud/services/users/pkg/config"
"github.com/opencloud-eu/opencloud/services/users/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/users/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/web/pkg/config/parser/parse.go
+3 -3
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode" "github.com/opencloud-eu/opencloud/pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/web/pkg/config" "github.com/opencloud-eu/opencloud/services/web/pkg/config"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
@@ -28,7 +28,7 @@ func ParseConfig(cfg *config.Config) error {
} }
// apps are a special case, as they are not part of the main config, but are loaded from a separate config file // apps are a special case, as they are not part of the main config, but are loaded from a separate config file
err = ociscfg.BindSourcesToStructs("apps", &cfg.Apps) err = occfg.BindSourcesToStructs("apps", &cfg.Apps)
if err != nil { if err != nil {
return err return err
} }
services/webdav/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/webdav/pkg/config" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config"
"github.com/opencloud-eu/opencloud/services/webdav/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }
services/webfinger/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import ( import (
"errors" "errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config" occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config"
"github.com/opencloud-eu/opencloud/services/webfinger/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths. // ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error { func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil { if err != nil {
return err return err
} }