Skip to content

Commit

Permalink
drop store service in favor of a micro store implementation
Browse files Browse the repository at this point in the history
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
  • Loading branch information
butonic committed Feb 9, 2024
1 parent 33e2119 commit 59bc13e
Show file tree
Hide file tree
Showing 60 changed files with 140 additions and 4,153 deletions.
3 changes: 1 addition & 2 deletions Makefile
Expand Up @@ -52,7 +52,6 @@ OCIS_MODULES = \
services/storage-publiclink \
services/storage-shares \
services/storage-users \
services/store \
services/thumbnails \
services/userlog \
services/users \
Expand Down Expand Up @@ -208,7 +207,7 @@ go-coverage:

.PHONY: protobuf
protobuf:
@for mod in ./services/thumbnails ./services/store ./services/settings; do \
@for mod in ./services/thumbnails ./services/settings; do \
echo -n "% protobuf $$mod: "; $(MAKE) --no-print-directory -C $$mod protobuf || exit 1; \
done

Expand Down
5 changes: 5 additions & 0 deletions changelog/unreleased/kill-store-service.md
@@ -0,0 +1,5 @@
Change: Kill the store service

We replaced the store service with configurable micro store backends, defaulting to the built in NATS instance.

https://github.com/owncloud/ocis/pull/8419
2 changes: 1 addition & 1 deletion docs/services/general-info/port-ranges.md
Expand Up @@ -103,7 +103,7 @@ We also suggest to use the last port in your extensions' range as a debug/metric
| 9445-9449 | FREE |
| 9450-9454 | FREE |
| 9455-9459 | FREE |
| 9460-9464 | [store]({{< ref "../store/_index.md" >}}) |
| 9460-9464 | FREE |
| 9465-9469 | FREE |
| 9470-9474 | FREE |
| 9475-9479 | FREE |
Expand Down
1 change: 0 additions & 1 deletion docs/services/store/.gitignore

This file was deleted.

18 changes: 0 additions & 18 deletions docs/services/store/_index.md

This file was deleted.

15 changes: 0 additions & 15 deletions docs/services/store/configuration.md

This file was deleted.

2 changes: 0 additions & 2 deletions ocis-pkg/config/config.go
Expand Up @@ -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"
Expand Down Expand Up @@ -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"`
Expand Down
2 changes: 0 additions & 2 deletions ocis-pkg/config/defaultconfig.go
Expand Up @@ -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"
Expand Down Expand Up @@ -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(),
Expand Down
6 changes: 0 additions & 6 deletions ocis/pkg/command/services.go
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions ocis/pkg/runtime/service/service.go
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions protogen/.mockery.yaml
Expand Up @@ -16,9 +16,6 @@ packages:
github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0:
interfaces:
ValueService:
github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0:
interfaces:
StoreService:
github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0:
interfaces:
ThumbnailService:
Expand Down

0 comments on commit 59bc13e

Please sign in to comment.