remove duplicated sutureservice code

Signed-off-by: jkoberg <jkoberg@owncloud.com>

ocis/pkg/runtime/service/service.go

@@ -109,45 +109,195 @@ func NewService(options ...Option) (*Service, error) {
 		cfg:          opts.Config,
 	}
 
-	s.ServicesRegistry[opts.Config.Settings.Service.Name] = settings.NewSutureService
-	s.ServicesRegistry[opts.Config.Nats.Service.Name] = nats.NewSutureService
-	s.ServicesRegistry[opts.Config.StorageSystem.Service.Name] = storageSystem.NewSutureService
-	s.ServicesRegistry[opts.Config.Graph.Service.Name] = graph.NewSutureService
-	s.ServicesRegistry[opts.Config.IDM.Service.Name] = idm.NewSutureService
-	s.ServicesRegistry[opts.Config.Invitations.Service.Name] = invitations.NewSutureService
-	s.ServicesRegistry[opts.Config.OCS.Service.Name] = ocs.NewSutureService
-	s.ServicesRegistry[opts.Config.Store.Service.Name] = store.NewSutureService
-	s.ServicesRegistry[opts.Config.Thumbnails.Service.Name] = thumbnails.NewSutureService
-	s.ServicesRegistry[opts.Config.Web.Service.Name] = web.NewSutureService
-	s.ServicesRegistry[opts.Config.WebDAV.Service.Name] = webdav.NewSutureService
-	s.ServicesRegistry[opts.Config.Webfinger.Service.Name] = webfinger.NewSutureService
-	s.ServicesRegistry[opts.Config.Frontend.Service.Name] = frontend.NewSutureService
-	s.ServicesRegistry[opts.Config.OCDav.Service.Name] = ocdav.NewSutureService
-	s.ServicesRegistry[opts.Config.Gateway.Service.Name] = gateway.NewSutureService
-	s.ServicesRegistry[opts.Config.AppRegistry.Service.Name] = appRegistry.NewSutureService
-	s.ServicesRegistry[opts.Config.Users.Service.Name] = users.NewSutureService
-	s.ServicesRegistry[opts.Config.Groups.Service.Name] = groups.NewSutureService
-	s.ServicesRegistry[opts.Config.AuthBasic.Service.Name] = authbasic.NewSutureService
-	s.ServicesRegistry[opts.Config.AuthMachine.Service.Name] = authmachine.NewSutureService
-	s.ServicesRegistry[opts.Config.StorageUsers.Service.Name] = storageusers.NewSutureService
-	s.ServicesRegistry[opts.Config.StorageShares.Service.Name] = storageshares.NewSutureService
-	s.ServicesRegistry[opts.Config.StoragePublicLink.Service.Name] = storagepublic.NewSutureService
-	s.ServicesRegistry[opts.Config.AppProvider.Service.Name] = appProvider.NewSutureService
-	s.ServicesRegistry[opts.Config.Notifications.Service.Name] = notifications.NewSutureService
-	s.ServicesRegistry[opts.Config.Search.Service.Name] = search.NewSutureService
-	s.ServicesRegistry[opts.Config.Postprocessing.Service.Name] = postprocessing.NewSutureService
-	s.ServicesRegistry[opts.Config.EventHistory.Service.Name] = eventhistory.NewSutureService
-	s.ServicesRegistry[opts.Config.Userlog.Service.Name] = userlog.NewSutureService
+	// populate services
+	reg := func(name string, exec func(context.Context, *ociscfg.Config) error) {
+		s.ServicesRegistry[name] = NewSutureServiceBuilder(exec)
+	}
+	reg(opts.Config.AppProvider.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.AppProvider.Context = ctx
+		cfg.AppProvider.Commons = cfg.Commons
+		return appProvider.Execute(cfg.AppProvider)
+	})
+	reg(opts.Config.AppRegistry.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.AppRegistry.Context = ctx
+		cfg.AppRegistry.Commons = cfg.Commons
+		return appRegistry.Execute(cfg.AppRegistry)
+	})
+	reg(opts.Config.AuthBasic.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.AuthBasic.Context = ctx
+		cfg.AuthBasic.Commons = cfg.Commons
+		return authbasic.Execute(cfg.AuthBasic)
+	})
+	reg(opts.Config.AuthMachine.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.AuthMachine.Context = ctx
+		cfg.AuthMachine.Commons = cfg.Commons
+		return authmachine.Execute(cfg.AuthMachine)
+	})
+	reg(opts.Config.EventHistory.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.EventHistory.Context = ctx
+		cfg.EventHistory.Commons = cfg.Commons
+		return eventhistory.Execute(cfg.EventHistory)
+	})
+	reg(opts.Config.Frontend.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Frontend.Context = ctx
+		cfg.Frontend.Commons = cfg.Commons
+		return frontend.Execute(cfg.Frontend)
+	})
+	reg(opts.Config.Gateway.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Gateway.Context = ctx
+		cfg.Gateway.Commons = cfg.Commons
+		return gateway.Execute(cfg.Gateway)
+	})
+	reg(opts.Config.Graph.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Graph.Context = ctx
+		cfg.Graph.Commons = cfg.Commons
+		return graph.Execute(cfg.Graph)
+	})
+	reg(opts.Config.Groups.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Groups.Context = ctx
+		cfg.Groups.Commons = cfg.Commons
+		return groups.Execute(cfg.Groups)
+	})
+	reg(opts.Config.IDM.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.IDM.Context = ctx
+		cfg.IDM.Commons = cfg.Commons
+		return idm.Execute(cfg.IDM)
+	})
+	reg(opts.Config.Invitations.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Invitations.Context = ctx
+		cfg.Invitations.Commons = cfg.Commons
+		return invitations.Execute(cfg.Invitations)
+	})
+	reg(opts.Config.Nats.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Nats.Context = ctx
+		cfg.Nats.Commons = cfg.Commons
+		return nats.Execute(cfg.Nats)
+	})
+	reg(opts.Config.Notifications.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Notifications.Context = ctx
+		cfg.Notifications.Commons = cfg.Commons
+		return notifications.Execute(cfg.Notifications)
+	})
+	reg(opts.Config.OCDav.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.OCDav.Context = ctx
+		cfg.OCDav.Commons = cfg.Commons
+		return ocdav.Execute(cfg.OCDav)
+	})
+	reg(opts.Config.OCS.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.OCS.Context = ctx
+		cfg.OCS.Commons = cfg.Commons
+		return ocs.Execute(cfg.OCS)
+	})
+	reg(opts.Config.Postprocessing.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Postprocessing.Context = ctx
+		cfg.Postprocessing.Commons = cfg.Commons
+		return postprocessing.Execute(cfg.Postprocessing)
+	})
+	reg(opts.Config.Search.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Search.Context = ctx
+		cfg.Search.Commons = cfg.Commons
+		return search.Execute(cfg.Search)
+	})
+	reg(opts.Config.Settings.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Settings.Context = ctx
+		cfg.Settings.Commons = cfg.Commons
+		return settings.Execute(cfg.Settings)
+	})
+	reg(opts.Config.StoragePublicLink.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.StoragePublicLink.Context = ctx
+		cfg.StoragePublicLink.Commons = cfg.Commons
+		return storagepublic.Execute(cfg.StoragePublicLink)
+	})
+	reg(opts.Config.StorageShares.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.StorageShares.Context = ctx
+		cfg.StorageShares.Commons = cfg.Commons
+		return storageshares.Execute(cfg.StorageShares)
+	})
+	reg(opts.Config.StorageSystem.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.StorageSystem.Context = ctx
+		cfg.StorageSystem.Commons = cfg.Commons
+		return storageSystem.Execute(cfg.StorageSystem)
+	})
+	reg(opts.Config.StorageUsers.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.StorageUsers.Context = ctx
+		cfg.StorageUsers.Commons = cfg.Commons
+		return storageusers.Execute(cfg.StorageUsers)
+	})
+	reg(opts.Config.Store.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Store.Context = ctx
+		cfg.Store.Commons = cfg.Commons
+		return store.Execute(cfg.Store)
+	})
+	reg(opts.Config.Thumbnails.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Thumbnails.Context = ctx
+		cfg.Thumbnails.Commons = cfg.Commons
+		return thumbnails.Execute(cfg.Thumbnails)
+	})
+	reg(opts.Config.Userlog.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Userlog.Context = ctx
+		cfg.Userlog.Commons = cfg.Commons
+		return userlog.Execute(cfg.Userlog)
+	})
+	reg(opts.Config.Users.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Users.Context = ctx
+		cfg.Users.Commons = cfg.Commons
+		return users.Execute(cfg.Users)
+	})
+	reg(opts.Config.Web.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Web.Context = ctx
+		cfg.Web.Commons = cfg.Commons
+		return web.Execute(cfg.Web)
+	})
+	reg(opts.Config.WebDAV.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.WebDAV.Context = ctx
+		cfg.WebDAV.Commons = cfg.Commons
+		return webdav.Execute(cfg.WebDAV)
+	})
+	reg(opts.Config.Webfinger.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Webfinger.Context = ctx
+		cfg.Webfinger.Commons = cfg.Commons
+		return webfinger.Execute(cfg.Webfinger)
+	})
 
 	// populate optional services
-	s.Additional[opts.Config.Antivirus.Service.Name] = antivirus.NewSutureService
-	s.Additional[opts.Config.Audit.Service.Name] = audit.NewSutureService
-	s.Additional[opts.Config.Policies.Service.Name] = policies.NewSutureService
+	areg := func(name string, exec func(context.Context, *ociscfg.Config) error) {
+		s.Additional[name] = NewSutureServiceBuilder(exec)
+	}
+	areg(opts.Config.Antivirus.Service.Name, func(ctx context.Context, cfg *ociscfg.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 {
+		cfg.Audit.Context = ctx
+		cfg.Audit.Commons = cfg.Commons
+		return audit.Execute(cfg.Audit)
+	})
+	areg(opts.Config.Policies.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Policies.Context = ctx
+		cfg.Policies.Commons = cfg.Commons
+		return policies.Execute(cfg.Policies)
+	})
 
 	// populate delayed services
-	s.Delayed[opts.Config.Sharing.Service.Name] = sharing.NewSutureService
-	s.Delayed[opts.Config.Proxy.Service.Name] = proxy.NewSutureService
-	s.Delayed[opts.Config.IDP.Service.Name] = idp.NewSutureService
+	dreg := func(name string, exec func(context.Context, *ociscfg.Config) error) {
+		s.Delayed[name] = NewSutureServiceBuilder(exec)
+	}
+	dreg(opts.Config.IDP.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.IDP.Context = ctx
+		cfg.IDP.Commons = cfg.Commons
+		return idp.Execute(cfg.IDP)
+	})
+	dreg(opts.Config.Proxy.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Proxy.Context = ctx
+		cfg.Proxy.Commons = cfg.Commons
+		return proxy.Execute(cfg.Proxy)
+	})
+	dreg(opts.Config.Sharing.Service.Name, func(ctx context.Context, cfg *ociscfg.Config) error {
+		cfg.Sharing.Context = ctx
+		cfg.Sharing.Commons = cfg.Commons
+		return sharing.Execute(cfg.Sharing)
+	})
 
 	return s, nil
 }

ocis/pkg/runtime/service/sutureservice.go

@@ -0,0 +1,29 @@
+package service
+
+import (
+	"context"
+
+	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
+	"github.com/thejerf/suture/v4"
+)
+
+// SutureService allows for the settings command to be embedded and supervised by a suture supervisor tree.
+type SutureService struct {
+	exec func(ctx context.Context) error
+}
+
+// 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 {
+		return SutureService{
+			exec: func(ctx context.Context) error {
+				return f(ctx, cfg)
+			},
+		}
+	}
+}
+
+// Serve to fullfil Server interface
+func (s SutureService) Serve(ctx context.Context) error {
+	return s.exec(ctx)
+}

services/antivirus/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/antivirus/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -30,25 +27,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the web command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new web.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Policies.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Antivirus,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/app-provider/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/app-provider/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the app-provider command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new app-provider.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.AppProvider.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.AppProvider,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/app-registry/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/app-registry/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the app-registry command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new app-registry.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.AppRegistry.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.AppRegistry,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/audit/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/audit/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,26 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the audit command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new audit.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Audit.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Audit,
-	}
-}
-
-// Serve implements Server interface
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/auth-basic/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/auth-basic/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the auth-basic command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new auth-basic.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.AuthBasic.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.AuthBasic,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/auth-machine/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/auth-machine/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the auth-machine command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new auth-machine.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.AuthMachine.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.AuthMachine,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/eventhistory/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/eventhistory/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the eventhistory command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new eventhistory.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.EventHistory.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.EventHistory,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/frontend/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/frontend/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the frontend command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new frontend.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Frontend.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Frontend,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/gateway/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/gateway/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the gateway command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new gateway.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Gateway.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Gateway,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/graph/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	"github.com/thejerf/suture/v4"
 
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/graph/pkg/config"
 	"github.com/urfave/cli/v2"
 )
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 	})
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the graph command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new graph.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Graph.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Graph,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/groups/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/groups/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the group command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new group.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Groups.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Groups,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/idm/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/idm/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -36,25 +33,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the idm command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new idm.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.IDM.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.IDM,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/idp/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/idp/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the idp command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new idp.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.IDP.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.IDP,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/invitations/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/invitations/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the webdav command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new webdav.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Invitations.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Invitations,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/nats/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/nats/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the nats command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new nats.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Nats.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Nats,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/notifications/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/notifications/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the notifications command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new notifications.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Notifications.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Notifications,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/ocdav/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/ocdav/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the ocdav command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new ocdav.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.OCDav.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.OCDav,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/ocs/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/ocs/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the ocs command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new ocs.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.OCS.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.OCS,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/policies/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/policies/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -30,25 +27,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the web command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new web.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Policies.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Policies,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/postprocessing/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/postprocessing/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,22 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the postprocessing command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new postprocessing.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Postprocessing.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Postprocessing,
-	}
-}
-
-// Serve to implement Server interface
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	return Execute(s.cfg)
-}

services/proxy/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the proxy command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new proxy.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Proxy.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Proxy,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/search/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	"github.com/thejerf/suture/v4"
 
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/search/pkg/config"
 	"github.com/urfave/cli/v2"
 )
@@ -36,25 +33,3 @@ func Execute(cfg *config.Config) error {
 	})
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the search command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new search.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Search.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Search,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/settings/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/settings/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the settings command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new settings.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Settings.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Settings,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/sharing/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/sharing/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the sharing command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new sharing.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Sharing.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Sharing,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/storage-publiclink/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the accounts command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new accounts.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.StoragePublicLink.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.StoragePublicLink,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/storage-shares/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/storage-shares/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the accounts command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new storage-shares.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.StorageShares.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.StorageShares,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/storage-system/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/storage-system/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the storage-system command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new storage-system.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.StorageSystem.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.StorageSystem,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/storage-users/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/storage-users/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -37,25 +34,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the accounts command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new storage-users.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.StorageUsers.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.StorageUsers,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/store/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the store command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new store.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Store.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Store,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/thumbnails/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/thumbnails/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the thumbnails command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new thumbnails.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Thumbnails.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Thumbnails,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/userlog/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the userlog command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new userlog.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Userlog.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Userlog,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/users/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/users/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the user command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new user.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Users.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Users,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/web/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/web/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the web command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new web.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Web.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Web,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/webdav/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/webdav/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the webdav command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new webdav.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.WebDAV.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.WebDAV,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}

services/webfinger/pkg/command/root.go

@@ -1,13 +1,10 @@
 package command
 
 import (
-	"context"
 	"os"
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/services/webfinger/pkg/config"
-	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
 
@@ -35,25 +32,3 @@ func Execute(cfg *config.Config) error {
 
 	return app.Run(os.Args)
 }
-
-// SutureService allows for the webdav command to be embedded and supervised by a suture supervisor tree.
-type SutureService struct {
-	cfg *config.Config
-}
-
-// NewSutureService creates a new webdav.SutureService
-func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Webfinger.Commons = cfg.Commons
-	return SutureService{
-		cfg: cfg.Webfinger,
-	}
-}
-
-func (s SutureService) Serve(ctx context.Context) error {
-	s.cfg.Context = ctx
-	if err := Execute(s.cfg); err != nil {
-		return err
-	}
-
-	return nil
-}