drop store service in favor of a micro store implementation

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
owncloud · Feb 9, 2024 · 85cc735 · 85cc735
1 parent 33e2119
commit 85cc735
Show file tree

Hide file tree

Showing 51 changed files with 112 additions and 4,113 deletions.
diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go
@@ -35,7 +35,6 @@ import (
 	storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/config"
 	storagesystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/config"
 	storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/config"
-	store "github.com/owncloud/ocis/v2/services/store/pkg/config"
 	thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config"
 	userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/config"
 	users "github.com/owncloud/ocis/v2/services/users/pkg/config"
@@ -111,7 +110,6 @@ type Config struct {
 	StoragePublicLink *storagepublic.Config  `yaml:"storage_public"`
 	StorageShares     *storageshares.Config  `yaml:"storage_shares"`
 	StorageUsers      *storageusers.Config   `yaml:"storage_users"`
-	Store             *store.Config          `yaml:"store"`
 	Thumbnails        *thumbnails.Config     `yaml:"thumbnails"`
 	Userlog           *userlog.Config        `yaml:"userlog"`
 	Users             *users.Config          `yaml:"users"`

diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go
@@ -34,7 +34,6 @@ import (
 	storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/config/defaults"
 	storageSystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/config/defaults"
 	storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/config/defaults"
-	store "github.com/owncloud/ocis/v2/services/store/pkg/config/defaults"
 	thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config/defaults"
 	userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/config/defaults"
 	users "github.com/owncloud/ocis/v2/services/users/pkg/config/defaults"
@@ -84,7 +83,6 @@ func DefaultConfig() *Config {
 		StorageShares:     storageshares.DefaultConfig(),
 		StorageSystem:     storageSystem.DefaultConfig(),
 		StorageUsers:      storageusers.DefaultConfig(),
-		Store:             store.DefaultConfig(),
 		Thumbnails:        thumbnails.DefaultConfig(),
 		Userlog:           userlog.DefaultConfig(),
 		Users:             users.DefaultConfig(),

diff --git a/ocis/pkg/command/services.go b/ocis/pkg/command/services.go
@@ -41,7 +41,6 @@ import (
 	storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/command"
 	storagesystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/command"
 	storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/command"
-	store "github.com/owncloud/ocis/v2/services/store/pkg/command"
 	thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/command"
 	userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/command"
 	users "github.com/owncloud/ocis/v2/services/users/pkg/command"
@@ -216,11 +215,6 @@ var svccmds = []register.Command{
 			cfg.StorageUsers.Commons = cfg.Commons
 		})
 	},
-	func(cfg *config.Config) *cli.Command {
-		return ServiceCommand(cfg, cfg.Store.Service.Name, store.GetCommands(cfg.Store), func(c *config.Config) {
-			cfg.Store.Commons = cfg.Commons
-		})
-	},
 	func(cfg *config.Config) *cli.Command {
 		return ServiceCommand(cfg, cfg.Thumbnails.Service.Name, thumbnails.GetCommands(cfg.Thumbnails), func(c *config.Config) {
 			cfg.Thumbnails.Commons = cfg.Commons

diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go
@@ -52,7 +52,6 @@ import (
 	storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/command"
 	storageSystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/command"
 	storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/command"
-	store "github.com/owncloud/ocis/v2/services/store/pkg/command"
 	thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/command"
 	userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/command"
 	users "github.com/owncloud/ocis/v2/services/users/pkg/command"
@@ -241,11 +240,6 @@ func NewService(options ...Option) (*Service, error) {
 		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