From 5aa5ab843adfccfa78d3eceb82d07dc8b1bd3bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 14 Jan 2025 12:44:00 +0100 Subject: [PATCH] ociscfg -> occfg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- opencloud/pkg/runtime/service/service.go | 104 +++++++++--------- .../pkg/runtime/service/sutureservice.go | 6 +- .../activitylog/pkg/config/parser/parse.go | 4 +- services/antivirus/pkg/config/parser/parse.go | 4 +- .../app-provider/pkg/config/parser/parse.go | 4 +- .../app-registry/pkg/config/parser/parse.go | 4 +- services/audit/pkg/config/parser/parse.go | 4 +- services/auth-app/pkg/config/parser/parse.go | 4 +- .../auth-basic/pkg/config/parser/parse.go | 4 +- services/auth-bearer/pkg/command/root.go | 4 +- .../auth-bearer/pkg/config/parser/parse.go | 4 +- .../auth-machine/pkg/config/parser/parse.go | 4 +- .../auth-service/pkg/config/parser/parse.go | 4 +- services/clientlog/pkg/config/parser/parse.go | 4 +- .../collaboration/pkg/config/parser/parse.go | 4 +- .../eventhistory/pkg/config/parser/parse.go | 4 +- services/frontend/pkg/config/parser/parse.go | 4 +- services/gateway/pkg/config/parser/parse.go | 4 +- services/graph/pkg/config/parser/parse.go | 4 +- services/groups/pkg/config/parser/parse.go | 4 +- services/idm/pkg/config/parser/parse.go | 4 +- services/idp/pkg/config/parser/parse.go | 4 +- .../invitations/pkg/config/parser/parse.go | 4 +- services/nats/pkg/config/parser/parse.go | 4 +- .../notifications/pkg/config/parser/parse.go | 4 +- services/ocdav/pkg/config/parser/parse.go | 4 +- services/ocm/pkg/config/parser/parse.go | 4 +- services/ocs/pkg/config/parser/parse.go | 4 +- services/policies/pkg/config/parser/parse.go | 4 +- .../postprocessing/pkg/config/parser/parse.go | 4 +- services/proxy/pkg/config/parser/parse.go | 4 +- services/search/pkg/config/parser/parse.go | 4 +- services/settings/pkg/config/parser/parse.go | 4 +- services/sharing/pkg/config/parser/parse.go | 4 +- services/sse/pkg/config/parser/parse.go | 4 +- .../pkg/config/parser/parse.go | 4 +- .../storage-shares/pkg/config/parser/parse.go | 4 +- .../storage-system/pkg/config/parser/parse.go | 4 +- .../storage-users/pkg/config/parser/parse.go | 4 +- .../thumbnails/pkg/config/parser/parse.go | 4 +- services/userlog/pkg/config/parser/parse.go | 4 +- services/users/pkg/config/parser/parse.go | 4 +- services/web/pkg/config/parser/parse.go | 6 +- services/webdav/pkg/config/parser/parse.go | 4 +- services/webfinger/pkg/config/parser/parse.go | 4 +- 45 files changed, 142 insertions(+), 142 deletions(-) diff --git a/opencloud/pkg/runtime/service/service.go b/opencloud/pkg/runtime/service/service.go index 4569c0308c..dfa15e61a8 100644 --- a/opencloud/pkg/runtime/service/service.go +++ b/opencloud/pkg/runtime/service/service.go @@ -22,7 +22,7 @@ import ( notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/command" "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" ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" "github.com/opencloud-eu/opencloud/pkg/shared" @@ -71,10 +71,10 @@ var ( runset map[string]struct{} // 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. type Service struct { @@ -86,7 +86,7 @@ type Service struct { serviceToken map[string][]suture.ServiceToken context context.Context cancel context.CancelFunc - cfg *ociscfg.Config + cfg *occfg.Config } // 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 - 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 { 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 - 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.Commons = cfg.Commons return nats.Execute(cfg.Nats) }) // 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.Commons = cfg.Commons 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 // 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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 // this is not reproducible locally, it can start when nats and gateway are already running // 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.Commons = cfg.Commons return frontend.Execute(cfg.Frontend) }) // 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) } - 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.Commons = cfg.Commons // antivirus holds no Commons atm 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons 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.Commons = cfg.Commons return notifications.Execute(cfg.Notifications) @@ -447,13 +447,13 @@ func scheduleServiceTokens(s *Service, funcSet serviceFuncMap) { } 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 // the runtime. -func (s *Service) generateRunSet(cfg *ociscfg.Config) { +func (s *Service) generateRunSet(cfg *occfg.Config) { runset = make(map[string]struct{}) if cfg.Runtime.Services != nil { 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 -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. evcfg := cfg.Postprocessing.Postprocessing.Events _, err := stream.NatsFromConfig("initial", true, stream.NatsConfig(evcfg)) return err } -func pingGateway(cfg *ociscfg.Config) error { +func pingGateway(cfg *occfg.Config) error { // init grpc connection _, err := ogrpc.NewClient() if err != nil { @@ -548,8 +548,8 @@ func pingGateway(cfg *ociscfg.Config) error { return err } -func wait(d time.Duration) func(cfg *ociscfg.Config) error { - return func(cfg *ociscfg.Config) error { +func wait(d time.Duration) func(cfg *occfg.Config) error { + return func(cfg *occfg.Config) error { time.Sleep(d) return nil } diff --git a/opencloud/pkg/runtime/service/sutureservice.go b/opencloud/pkg/runtime/service/sutureservice.go index 15700e6e72..2a54566876 100644 --- a/opencloud/pkg/runtime/service/sutureservice.go +++ b/opencloud/pkg/runtime/service/sutureservice.go @@ -3,7 +3,7 @@ package service import ( "context" - ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + occfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/thejerf/suture/v4" ) @@ -13,8 +13,8 @@ type SutureService struct { } // NewSutureServiceBuilder creates a new suture service -func NewSutureServiceBuilder(f func(context.Context, *ociscfg.Config) error) func(*ociscfg.Config) suture.Service { - return func(cfg *ociscfg.Config) suture.Service { +func NewSutureServiceBuilder(f func(context.Context, *occfg.Config) error) func(*occfg.Config) suture.Service { + return func(cfg *occfg.Config) suture.Service { return SutureService{ exec: func(ctx context.Context) error { return f(ctx, cfg) diff --git a/services/activitylog/pkg/config/parser/parse.go b/services/activitylog/pkg/config/parser/parse.go index 1484df748d..853ea4c8de 100644 --- a/services/activitylog/pkg/config/parser/parse.go +++ b/services/activitylog/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/defaults" @@ -12,7 +12,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/antivirus/pkg/config/parser/parse.go b/services/antivirus/pkg/config/parser/parse.go index 30b46f7215..086d1b52d6 100644 --- a/services/antivirus/pkg/config/parser/parse.go +++ b/services/antivirus/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/defaults" @@ -12,7 +12,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/app-provider/pkg/config/parser/parse.go b/services/app-provider/pkg/config/parser/parse.go index d16cd072e6..be01f72898 100644 --- a/services/app-provider/pkg/config/parser/parse.go +++ b/services/app-provider/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/app-provider/pkg/config" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/app-registry/pkg/config/parser/parse.go b/services/app-registry/pkg/config/parser/parse.go index 8c91c476e3..56dd62bef3 100644 --- a/services/app-registry/pkg/config/parser/parse.go +++ b/services/app-registry/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/app-registry/pkg/config" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/audit/pkg/config/parser/parse.go b/services/audit/pkg/config/parser/parse.go index 077ee2c8cd..d3bce8b044 100644 --- a/services/audit/pkg/config/parser/parse.go +++ b/services/audit/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/defaults" @@ -12,7 +12,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/auth-app/pkg/config/parser/parse.go b/services/auth-app/pkg/config/parser/parse.go index 92a53af5b6..f91cbfc340 100644 --- a/services/auth-app/pkg/config/parser/parse.go +++ b/services/auth-app/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/auth-app/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/auth-basic/pkg/config/parser/parse.go b/services/auth-basic/pkg/config/parser/parse.go index aade530c6e..554d44e8b9 100644 --- a/services/auth-basic/pkg/config/parser/parse.go +++ b/services/auth-basic/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/auth-basic/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/auth-bearer/pkg/command/root.go b/services/auth-bearer/pkg/command/root.go index 2233d1b1b9..a41c909f3a 100644 --- a/services/auth-bearer/pkg/command/root.go +++ b/services/auth-bearer/pkg/command/root.go @@ -5,7 +5,7 @@ import ( "os" "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/thejerf/suture/v4" "github.com/urfave/cli/v2" @@ -42,7 +42,7 @@ type SutureService struct { } // 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 return SutureService{ cfg: cfg.AuthBearer, diff --git a/services/auth-bearer/pkg/config/parser/parse.go b/services/auth-bearer/pkg/config/parser/parse.go index a2bdf29de9..c72e48cadf 100644 --- a/services/auth-bearer/pkg/config/parser/parse.go +++ b/services/auth-bearer/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/auth-bearer/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/auth-machine/pkg/config/parser/parse.go b/services/auth-machine/pkg/config/parser/parse.go index ae9bcea8e4..fbe79ade58 100644 --- a/services/auth-machine/pkg/config/parser/parse.go +++ b/services/auth-machine/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/auth-machine/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/auth-service/pkg/config/parser/parse.go b/services/auth-service/pkg/config/parser/parse.go index 512986aaee..e4f4a74e6f 100644 --- a/services/auth-service/pkg/config/parser/parse.go +++ b/services/auth-service/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/auth-service/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/clientlog/pkg/config/parser/parse.go b/services/clientlog/pkg/config/parser/parse.go index 85fcc4f802..ac4d4a2533 100644 --- a/services/clientlog/pkg/config/parser/parse.go +++ b/services/clientlog/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/clientlog/pkg/config" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/collaboration/pkg/config/parser/parse.go b/services/collaboration/pkg/config/parser/parse.go index 14388670cc..44802dda28 100644 --- a/services/collaboration/pkg/config/parser/parse.go +++ b/services/collaboration/pkg/config/parser/parse.go @@ -5,7 +5,7 @@ import ( "fmt" "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" "github.com/opencloud-eu/opencloud/pkg/config/envdecode" "github.com/opencloud-eu/opencloud/pkg/shared" @@ -15,7 +15,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/eventhistory/pkg/config/parser/parse.go b/services/eventhistory/pkg/config/parser/parse.go index a241a80102..9d30851e8a 100644 --- a/services/eventhistory/pkg/config/parser/parse.go +++ b/services/eventhistory/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/defaults" @@ -12,7 +12,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/frontend/pkg/config/parser/parse.go b/services/frontend/pkg/config/parser/parse.go index 4df2b8d5a9..3be57266c8 100644 --- a/services/frontend/pkg/config/parser/parse.go +++ b/services/frontend/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/structs" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" @@ -14,7 +14,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/gateway/pkg/config/parser/parse.go b/services/gateway/pkg/config/parser/parse.go index fc0e72a84d..33bb9d6341 100644 --- a/services/gateway/pkg/config/parser/parse.go +++ b/services/gateway/pkg/config/parser/parse.go @@ -4,7 +4,7 @@ import ( "errors" "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" "github.com/opencloud-eu/opencloud/pkg/config/envdecode" "github.com/opencloud-eu/opencloud/pkg/shared" @@ -14,7 +14,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/graph/pkg/config/parser/parse.go b/services/graph/pkg/config/parser/parse.go index 009f194d2b..238694cae5 100644 --- a/services/graph/pkg/config/parser/parse.go +++ b/services/graph/pkg/config/parser/parse.go @@ -6,7 +6,7 @@ import ( "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" "github.com/opencloud-eu/opencloud/pkg/config/envdecode" "github.com/opencloud-eu/opencloud/pkg/shared" @@ -17,7 +17,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/groups/pkg/config/parser/parse.go b/services/groups/pkg/config/parser/parse.go index feafc0a8b8..94dd50d233 100644 --- a/services/groups/pkg/config/parser/parse.go +++ b/services/groups/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/groups/pkg/config" "github.com/opencloud-eu/opencloud/services/groups/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/idm/pkg/config/parser/parse.go b/services/idm/pkg/config/parser/parse.go index 6c5bcc89a6..11e5ff20ff 100644 --- a/services/idm/pkg/config/parser/parse.go +++ b/services/idm/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/idm/pkg/config" "github.com/opencloud-eu/opencloud/services/idm/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/idp/pkg/config/parser/parse.go b/services/idp/pkg/config/parser/parse.go index e423ecf19b..8c00d4c8a9 100644 --- a/services/idp/pkg/config/parser/parse.go +++ b/services/idp/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/idp/pkg/config" "github.com/opencloud-eu/opencloud/services/idp/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/invitations/pkg/config/parser/parse.go b/services/invitations/pkg/config/parser/parse.go index 50f826b6b4..8a52e48b33 100644 --- a/services/invitations/pkg/config/parser/parse.go +++ b/services/invitations/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/defaults" @@ -12,7 +12,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/nats/pkg/config/parser/parse.go b/services/nats/pkg/config/parser/parse.go index dccadbf56e..d0c371637c 100644 --- a/services/nats/pkg/config/parser/parse.go +++ b/services/nats/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/defaults" @@ -12,7 +12,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/notifications/pkg/config/parser/parse.go b/services/notifications/pkg/config/parser/parse.go index bbf83a2b57..57e78886c7 100644 --- a/services/notifications/pkg/config/parser/parse.go +++ b/services/notifications/pkg/config/parser/parse.go @@ -6,7 +6,7 @@ import ( "net/mail" "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/services/notifications/pkg/config" "github.com/opencloud-eu/opencloud/services/notifications/pkg/config/defaults" @@ -17,7 +17,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/ocdav/pkg/config/parser/parse.go b/services/ocdav/pkg/config/parser/parse.go index a045d36f16..fd2f72096b 100644 --- a/services/ocdav/pkg/config/parser/parse.go +++ b/services/ocdav/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/ocdav/pkg/config" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/ocm/pkg/config/parser/parse.go b/services/ocm/pkg/config/parser/parse.go index 3a2b363ab4..29f90388df 100644 --- a/services/ocm/pkg/config/parser/parse.go +++ b/services/ocm/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/structs" "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" @@ -14,7 +14,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/ocs/pkg/config/parser/parse.go b/services/ocs/pkg/config/parser/parse.go index f0e858cc72..a7387661ec 100644 --- a/services/ocs/pkg/config/parser/parse.go +++ b/services/ocs/pkg/config/parser/parse.go @@ -6,7 +6,7 @@ import ( "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" "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/config/envdecode" @@ -14,7 +14,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/policies/pkg/config/parser/parse.go b/services/policies/pkg/config/parser/parse.go index 89a0f48364..38c25c1ca3 100644 --- a/services/policies/pkg/config/parser/parse.go +++ b/services/policies/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/defaults" @@ -12,7 +12,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/postprocessing/pkg/config/parser/parse.go b/services/postprocessing/pkg/config/parser/parse.go index 8e1ae2220e..aa59eee617 100644 --- a/services/postprocessing/pkg/config/parser/parse.go +++ b/services/postprocessing/pkg/config/parser/parse.go @@ -6,7 +6,7 @@ import ( "strings" "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/defaults" @@ -15,7 +15,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/proxy/pkg/config/parser/parse.go b/services/proxy/pkg/config/parser/parse.go index 9115ab9ef8..e571fb8942 100644 --- a/services/proxy/pkg/config/parser/parse.go +++ b/services/proxy/pkg/config/parser/parse.go @@ -4,7 +4,7 @@ import ( "errors" "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/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults" @@ -14,7 +14,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/search/pkg/config/parser/parse.go b/services/search/pkg/config/parser/parse.go index 07e1f9ea4e..28610ae3ba 100644 --- a/services/search/pkg/config/parser/parse.go +++ b/services/search/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/search/pkg/config" "github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/settings/pkg/config/parser/parse.go b/services/settings/pkg/config/parser/parse.go index 78e6209f86..04222a09a4 100644 --- a/services/settings/pkg/config/parser/parse.go +++ b/services/settings/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/settings/pkg/config" "github.com/opencloud-eu/opencloud/services/settings/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/sharing/pkg/config/parser/parse.go b/services/sharing/pkg/config/parser/parse.go index c72d67276b..678f50d256 100644 --- a/services/sharing/pkg/config/parser/parse.go +++ b/services/sharing/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/sharing/pkg/config" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/defaults" @@ -17,7 +17,7 @@ const ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/sse/pkg/config/parser/parse.go b/services/sse/pkg/config/parser/parse.go index 565feaf5c9..2c017696ce 100644 --- a/services/sse/pkg/config/parser/parse.go +++ b/services/sse/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/defaults" @@ -12,7 +12,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/storage-publiclink/pkg/config/parser/parse.go b/services/storage-publiclink/pkg/config/parser/parse.go index ca1aeda1ff..ac605270f3 100644 --- a/services/storage-publiclink/pkg/config/parser/parse.go +++ b/services/storage-publiclink/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/storage-publiclink/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/storage-shares/pkg/config/parser/parse.go b/services/storage-shares/pkg/config/parser/parse.go index 5cd9a9a92b..1ab1908a78 100644 --- a/services/storage-shares/pkg/config/parser/parse.go +++ b/services/storage-shares/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/storage-shares/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/storage-system/pkg/config/parser/parse.go b/services/storage-system/pkg/config/parser/parse.go index 9e5b7ab7a7..efd2524ae7 100644 --- a/services/storage-system/pkg/config/parser/parse.go +++ b/services/storage-system/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/storage-system/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/storage-users/pkg/config/parser/parse.go b/services/storage-users/pkg/config/parser/parse.go index 1289cc01dc..76affaa5d9 100644 --- a/services/storage-users/pkg/config/parser/parse.go +++ b/services/storage-users/pkg/config/parser/parse.go @@ -4,7 +4,7 @@ import ( "errors" "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" "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" @@ -15,7 +15,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/thumbnails/pkg/config/parser/parse.go b/services/thumbnails/pkg/config/parser/parse.go index 3cac8829b1..2c16149df2 100644 --- a/services/thumbnails/pkg/config/parser/parse.go +++ b/services/thumbnails/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/defaults" @@ -12,7 +12,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/userlog/pkg/config/parser/parse.go b/services/userlog/pkg/config/parser/parse.go index 1b3ec86524..a034d0a920 100644 --- a/services/userlog/pkg/config/parser/parse.go +++ b/services/userlog/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/userlog/pkg/config" "github.com/opencloud-eu/opencloud/services/userlog/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/users/pkg/config/parser/parse.go b/services/users/pkg/config/parser/parse.go index e736f301d6..45a9a2073d 100644 --- a/services/users/pkg/config/parser/parse.go +++ b/services/users/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/services/users/pkg/config" "github.com/opencloud-eu/opencloud/services/users/pkg/config/defaults" @@ -13,7 +13,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/web/pkg/config/parser/parse.go b/services/web/pkg/config/parser/parse.go index a74b4e2079..6601ed6e15 100644 --- a/services/web/pkg/config/parser/parse.go +++ b/services/web/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/shared" "github.com/opencloud-eu/opencloud/services/web/pkg/config" @@ -12,7 +12,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { 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 - err = ociscfg.BindSourcesToStructs("apps", &cfg.Apps) + err = occfg.BindSourcesToStructs("apps", &cfg.Apps) if err != nil { return err } diff --git a/services/webdav/pkg/config/parser/parse.go b/services/webdav/pkg/config/parser/parse.go index 11be3cdabe..e2650458bc 100644 --- a/services/webdav/pkg/config/parser/parse.go +++ b/services/webdav/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/defaults" @@ -12,7 +12,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err } diff --git a/services/webfinger/pkg/config/parser/parse.go b/services/webfinger/pkg/config/parser/parse.go index 4ef917c859..b0642594de 100644 --- a/services/webfinger/pkg/config/parser/parse.go +++ b/services/webfinger/pkg/config/parser/parse.go @@ -3,7 +3,7 @@ package parser import ( "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/defaults" @@ -12,7 +12,7 @@ import ( // ParseConfig loads configuration from known paths. func ParseConfig(cfg *config.Config) error { - err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg) + err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg) if err != nil { return err }