Merge pull request #6428 from kobergj/RefactorOcisPKG

[tests-only][full-ci] Cleanup ocis runtime

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
-}