remove code for store service

Signed-off-by: Christian Richter <crichter@owncloud.com>

ocis-pkg/config/config.go

@@ -38,7 +38,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"
@@ -117,7 +116,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"`

ocis-pkg/config/defaultconfig.go

@@ -37,7 +37,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"
@@ -90,7 +89,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(),

ocis/pkg/command/services.go

@@ -44,7 +44,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"
@@ -234,11 +233,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

services/ocs/pkg/server/http/server.go

@@ -9,7 +9,6 @@ import (
 	"github.com/owncloud/ocis/v2/ocis-pkg/service/http"
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 	svc "github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0"
-	ocisstore "github.com/owncloud/ocis/v2/services/store/pkg/store"
 	"go-micro.dev/v4"
 	microstore "go-micro.dev/v4/store"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
@@ -38,22 +37,14 @@ func Server(opts ...Option) (http.Service, error) {
 	}
 
 	var signingKeyStore microstore.Store
-	if options.Config.SigningKeys.Store == "ocisstoreservice" {
+	signingKeyStore = store.Create(
-		signingKeyStore = ocisstore.NewStore(
+		store.Store(options.Config.SigningKeys.Store),
-			microstore.Nodes(options.Config.SigningKeys.Nodes...),
+		store.TTL(options.Config.SigningKeys.TTL),
-			microstore.Database("proxy"),
+		microstore.Nodes(options.Config.SigningKeys.Nodes...),
-			microstore.Table("signing-keys"),
+		microstore.Database("proxy"),
-		)
+		microstore.Table("signing-keys"),
-	} else {
+		store.Authentication(options.Config.SigningKeys.AuthUsername, options.Config.SigningKeys.AuthPassword),
-		signingKeyStore = store.Create(
+	)
-			store.Store(options.Config.SigningKeys.Store),
-			store.TTL(options.Config.SigningKeys.TTL),
-			microstore.Nodes(options.Config.SigningKeys.Nodes...),
-			microstore.Database("proxy"),
-			microstore.Table("signing-keys"),
-			store.Authentication(options.Config.SigningKeys.AuthUsername, options.Config.SigningKeys.AuthPassword),
-		)
-	}
 
 	handle := svc.NewService(
 		svc.Logger(options.Logger),

services/proxy/pkg/command/server.go

@@ -37,7 +37,6 @@ import (
 	"github.com/owncloud/ocis/v2/services/proxy/pkg/staticroutes"
 	"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend"
 	"github.com/owncloud/ocis/v2/services/proxy/pkg/userroles"
-	ocisstore "github.com/owncloud/ocis/v2/services/store/pkg/store"
 	"github.com/urfave/cli/v2"
 	"go-micro.dev/v4/selector"
 	microstore "go-micro.dev/v4/store"
@@ -67,22 +66,14 @@ func Server(cfg *config.Config) *cli.Command {
 			)
 
 			var signingKeyStore microstore.Store
-			if cfg.PreSignedURL.SigningKeys.Store == "ocisstoreservice" {
+			signingKeyStore = store.Create(
-				signingKeyStore = ocisstore.NewStore(
+				store.Store(cfg.PreSignedURL.SigningKeys.Store),
-					microstore.Nodes(cfg.PreSignedURL.SigningKeys.Nodes...),
+				store.TTL(cfg.PreSignedURL.SigningKeys.TTL),
-					microstore.Database("proxy"),
+				microstore.Nodes(cfg.PreSignedURL.SigningKeys.Nodes...),
-					microstore.Table("signing-keys"),
+				microstore.Database("proxy"),
-				)
+				microstore.Table("signing-keys"),
-			} else {
+				store.Authentication(cfg.PreSignedURL.SigningKeys.AuthUsername, cfg.PreSignedURL.SigningKeys.AuthPassword),
-				signingKeyStore = store.Create(
+			)
-					store.Store(cfg.PreSignedURL.SigningKeys.Store),
-					store.TTL(cfg.PreSignedURL.SigningKeys.TTL),
-					microstore.Nodes(cfg.PreSignedURL.SigningKeys.Nodes...),
-					microstore.Database("proxy"),
-					microstore.Table("signing-keys"),
-					store.Authentication(cfg.PreSignedURL.SigningKeys.AuthUsername, cfg.PreSignedURL.SigningKeys.AuthPassword),
-				)
-			}
 
 			logger := logging.Configure(cfg.Service.Name, cfg.Log)
 			traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name)

services/store/Makefile

@@ -1,45 +0,0 @@
-SHELL := bash
-NAME := store
-
-include ../../.make/recursion.mk
-
-############ tooling ############
-ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
-include ../../.bingo/Variables.mk
-endif
-
-############ go tooling ############
-include ../../.make/go.mk
-
-############ release ############
-include ../../.make/release.mk
-
-############ docs generate ############
-include ../../.make/docs.mk
-
-.PHONY: docs-generate
-docs-generate: config-docs-generate \
-			   grpc-docs-generate
-
-############ generate ############
-include ../../.make/generate.mk
-
-.PHONY: ci-go-generate
-ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
-
-.PHONY: ci-node-generate
-ci-node-generate:
-
-
-############ protobuf ############
-include ../../.make/protobuf.mk
-
-.PHONY: protobuf
-protobuf: buf-generate
-
-############ licenses ############
-.PHONY: ci-node-check-licenses
-ci-node-check-licenses:
-
-.PHONY: ci-node-save-licenses
-ci-node-save-licenses:

services/store/cmd/store/main.go

@@ -1,19 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/owncloud/ocis/v2/services/store/pkg/command"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config/defaults"
-)
-
-func main() {
-	cfg := defaults.DefaultConfig()
-	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
-	if err := command.Execute(cfg); err != nil {
-		os.Exit(1)
-	}
-}

services/store/docker/Dockerfile.linux.amd64

@@ -1,19 +0,0 @@
-FROM amd64/alpine:latest
-
-RUN apk update && \
-	apk upgrade && \
-	apk add ca-certificates mailcap && \
-	rm -rf /var/cache/apk/* && \
-	echo 'hosts: files dns' >| /etc/nsswitch.conf
-
-LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
-  org.label-schema.name="oCIS Store" \
-  org.label-schema.vendor="ownCloud GmbH" \
-  org.label-schema.schema-version="1.0"
-
-EXPOSE 9460
-
-ENTRYPOINT ["/usr/bin/ocis-store"]
-CMD ["server"]
-
-COPY bin/ocis-store /usr/bin/ocis-store

services/store/docker/Dockerfile.linux.arm

@@ -1,19 +0,0 @@
-FROM arm32v6/alpine:latest
-
-RUN apk update && \
-	apk upgrade && \
-	apk add ca-certificates mailcap && \
-	rm -rf /var/cache/apk/* && \
-	echo 'hosts: files dns' >| /etc/nsswitch.conf
-
-LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
-  org.label-schema.name="oCIS Store" \
-  org.label-schema.vendor="ownCloud GmbH" \
-  org.label-schema.schema-version="1.0"
-
-EXPOSE 9460
-
-ENTRYPOINT ["/usr/bin/ocis-store"]
-CMD ["server"]
-
-COPY bin/ocis-store /usr/bin/ocis-store

services/store/docker/Dockerfile.linux.arm64

@@ -1,19 +0,0 @@
-FROM arm64v8/alpine:latest
-
-RUN apk update && \
-	apk upgrade && \
-	apk add ca-certificates mailcap && \
-	rm -rf /var/cache/apk/* && \
-	echo 'hosts: files dns' >| /etc/nsswitch.conf
-
-LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
-  org.label-schema.name="oCIS Store" \
-  org.label-schema.vendor="ownCloud GmbH" \
-  org.label-schema.schema-version="1.0"
-
-EXPOSE 9460
-
-ENTRYPOINT ["/usr/bin/ocis-store"]
-CMD ["server"]
-
-COPY bin/ocis-store /usr/bin/ocis-store

services/store/docker/manifest.tmpl

@@ -1,22 +0,0 @@
-image: owncloud/ocis-store:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
-{{#if build.tags}}
-tags:
-{{#each build.tags}}
-  - {{this}}
-{{/each}}
-{{/if}}
-manifests:
-  - image: owncloud/ocis-store:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
-    platform:
-      architecture: amd64
-      os: linux
-  - image: owncloud/ocis-store:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
-    platform:
-      architecture: arm64
-      variant: v8
-      os: linux
-  - image: owncloud/ocis-store:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
-    platform:
-      architecture: arm
-      variant: v6
-      os: linux

services/store/pkg/command/health.go

@@ -1,54 +0,0 @@
-package command
-
-import (
-	"fmt"
-	"net/http"
-
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config/parser"
-	"github.com/owncloud/ocis/v2/services/store/pkg/logging"
-	"github.com/urfave/cli/v2"
-)
-
-// Health is the entrypoint for the health command.
-func Health(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     "health",
-		Usage:    "check health status",
-		Category: "info",
-		Before: func(c *cli.Context) error {
-			return configlog.ReturnError(parser.ParseConfig(cfg))
-		},
-		Action: func(c *cli.Context) error {
-			logger := logging.Configure(cfg.Service.Name, cfg.Log)
-
-			resp, err := http.Get(
-				fmt.Sprintf(
-					"http://%s/healthz",
-					cfg.Debug.Addr,
-				),
-			)
-
-			if err != nil {
-				logger.Fatal().
-					Err(err).
-					Msg("Failed to request health check")
-			}
-
-			defer resp.Body.Close()
-
-			if resp.StatusCode != http.StatusOK {
-				logger.Fatal().
-					Int("code", resp.StatusCode).
-					Msg("Health seems to be in bad state")
-			}
-
-			logger.Debug().
-				Int("code", resp.StatusCode).
-				Msg("Health got a good state")
-
-			return nil
-		},
-	}
-}

services/store/pkg/command/root.go

@@ -1,34 +0,0 @@
-package command
-
-import (
-	"os"
-
-	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-	"github.com/urfave/cli/v2"
-)
-
-// GetCommands provides all commands for this service
-func GetCommands(cfg *config.Config) cli.Commands {
-	return []*cli.Command{
-		// start this service
-		Server(cfg),
-
-		// interaction with this service
-
-		// infos about this service
-		Health(cfg),
-		Version(cfg),
-	}
-}
-
-// Execute is the entry point for the ocis-store command.
-func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultApp(&cli.App{
-		Name:     "store",
-		Usage:    "Service to store values for ocis services",
-		Commands: GetCommands(cfg),
-	})
-
-	return app.RunContext(cfg.Context, os.Args)
-}

services/store/pkg/command/server.go

@@ -1,94 +0,0 @@
-package command
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/oklog/run"
-
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	ogrpc "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
-	"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
-	"github.com/owncloud/ocis/v2/ocis-pkg/version"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config/parser"
-	"github.com/owncloud/ocis/v2/services/store/pkg/logging"
-	"github.com/owncloud/ocis/v2/services/store/pkg/metrics"
-	"github.com/owncloud/ocis/v2/services/store/pkg/server/debug"
-	"github.com/owncloud/ocis/v2/services/store/pkg/server/grpc"
-	"github.com/urfave/cli/v2"
-)
-
-// Server is the entrypoint for the server command.
-func Server(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     "server",
-		Usage:    fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
-		Category: "server",
-		Before: func(c *cli.Context) error {
-			return configlog.ReturnFatal(parser.ParseConfig(cfg))
-		},
-		Action: func(c *cli.Context) error {
-			logger := logging.Configure(cfg.Service.Name, cfg.Log)
-			traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name)
-			if err != nil {
-				return err
-			}
-			cfg.GrpcClient, err = ogrpc.NewClient(
-				append(ogrpc.GetClientOptions(cfg.GRPCClientTLS), ogrpc.WithTraceProvider(traceProvider))...,
-			)
-			if err != nil {
-				return err
-			}
-
-			var (
-				gr          = run.Group{}
-				ctx, cancel = context.WithCancel(c.Context)
-				metrics     = metrics.New()
-			)
-
-			defer cancel()
-
-			metrics.BuildInfo.WithLabelValues(version.GetString()).Set(1)
-
-			{
-				server := grpc.Server(
-					grpc.Logger(logger),
-					grpc.Context(ctx),
-					grpc.Config(cfg),
-					grpc.Metrics(metrics),
-					grpc.TraceProvider(traceProvider),
-				)
-
-				gr.Add(server.Run, func(err error) {
-					logger.Error().
-						Err(err).
-						Str("server", "grpc").
-						Msg("Shutting down server")
-
-					cancel()
-				})
-			}
-
-			{
-				server, err := debug.Server(
-					debug.Logger(logger),
-					debug.Context(ctx),
-					debug.Config(cfg),
-				)
-
-				if err != nil {
-					logger.Error().Err(err).Str("server", "debug").Msg("Failed to initialize server")
-					return err
-				}
-
-				gr.Add(server.ListenAndServe, func(_ error) {
-					_ = server.Shutdown(ctx)
-					cancel()
-				})
-			}
-
-			return gr.Run()
-		},
-	}
-}

services/store/pkg/command/version.go

@@ -1,50 +0,0 @@
-package command
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/owncloud/ocis/v2/ocis-pkg/registry"
-	"github.com/owncloud/ocis/v2/ocis-pkg/version"
-
-	tw "github.com/olekukonko/tablewriter"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-	"github.com/urfave/cli/v2"
-)
-
-// Version prints the service versions of all running instances.
-func Version(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     "version",
-		Usage:    "print the version of this binary and the running service instances",
-		Category: "info",
-		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.GetString())
-			fmt.Printf("Compiled: %s\n", version.Compiled())
-			fmt.Println("")
-
-			reg := registry.GetRegistry()
-			services, err := reg.GetService(cfg.GRPC.Namespace + "." + cfg.Service.Name)
-			if err != nil {
-				fmt.Println(fmt.Errorf("could not get %s services from the registry: %v", cfg.Service.Name, err))
-				return err
-			}
-
-			if len(services) == 0 {
-				fmt.Println("No running " + cfg.Service.Name + " service found.")
-				return nil
-			}
-
-			table := tw.NewWriter(os.Stdout)
-			table.SetHeader([]string{"Version", "Address", "Id"})
-			table.SetAutoFormatHeaders(false)
-			for _, s := range services {
-				for _, n := range s.Nodes {
-					table.Append([]string{s.Version, n.Address, n.Id})
-				}
-			}
-			table.Render()
-			return nil
-		},
-	}
-}

services/store/pkg/config/config.go

@@ -1,28 +0,0 @@
-package config
-
-import (
-	"context"
-
-	"github.com/owncloud/ocis/v2/ocis-pkg/shared"
-	"go-micro.dev/v4/client"
-)
-
-// Config combines all available configuration parts.
-type Config struct {
-	Commons *shared.Commons `yaml:"-"` // don't use this directly as configuration for a service
-
-	Service Service `yaml:"-"`
-
-	Tracing *Tracing `yaml:"tracing"`
-	Log     *Log     `yaml:"log"`
-	Debug   Debug    `yaml:"debug"`
-
-	GRPC GRPCConfig `yaml:"grpc"`
-
-	GRPCClientTLS *shared.GRPCClientTLS `yaml:"grpc_client_tls"`
-	GrpcClient    client.Client         `yaml:"-"`
-
-	Datapath string `yaml:"data_path" env:"STORE_DATA_PATH" desc:"The directory where the filesystem storage will store ocis settings. If not defined, the root directory derives from $OCIS_BASE_DATA_PATH:/store." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-
-	Context context.Context `yaml:"-"`
-}

services/store/pkg/config/debug.go

@@ -1,9 +0,0 @@
-package config
-
-// Debug defines the available debug configuration.
-type Debug struct {
-	Addr   string `yaml:"addr" env:"STORE_DEBUG_ADDR" desc:"Bind address of the debug server, where metrics, health, config and debug endpoints will be exposed." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-	Token  string `yaml:"token" env:"STORE_DEBUG_TOKEN" desc:"Token to secure the metrics endpoint." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-	Pprof  bool   `yaml:"pprof" env:"STORE_DEBUG_PPROF" desc:"Enables pprof, which can be used for profiling." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-	Zpages bool   `yaml:"zpages" env:"STORE_DEBUG_ZPAGES" desc:"Enables zpages, which can be used for collecting and viewing in-memory traces." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-}

services/store/pkg/config/defaults/defaultconfig.go

@@ -1,75 +0,0 @@
-package defaults
-
-import (
-	"path"
-
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
-	"github.com/owncloud/ocis/v2/ocis-pkg/structs"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-)
-
-// FullDefaultConfig returns a fully initialized default configuration
-func FullDefaultConfig() *config.Config {
-	cfg := DefaultConfig()
-	EnsureDefaults(cfg)
-	Sanitize(cfg)
-	return cfg
-}
-
-// DefaultConfig returns a basic default configuration
-func DefaultConfig() *config.Config {
-	return &config.Config{
-		Debug: config.Debug{
-			Addr:   "127.0.0.1:9464",
-			Token:  "",
-			Pprof:  false,
-			Zpages: false,
-		},
-		GRPC: config.GRPCConfig{
-			Addr:      "127.0.0.1:9460",
-			Namespace: "com.owncloud.api",
-		},
-		Service: config.Service{
-			Name: "store",
-		},
-		Datapath: path.Join(defaults.BaseDataPath(), "store"),
-	}
-}
-
-// EnsureDefaults adds default values to the configuration if they are not set yet
-func EnsureDefaults(cfg *config.Config) {
-	// provide with defaults for shared logging, since we need a valid destination address for "envdecode".
-	if cfg.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
-		cfg.Log = &config.Log{
-			Level:  cfg.Commons.Log.Level,
-			Pretty: cfg.Commons.Log.Pretty,
-			Color:  cfg.Commons.Log.Color,
-			File:   cfg.Commons.Log.File,
-		}
-	} else if cfg.Log == nil {
-		cfg.Log = &config.Log{}
-	}
-	// provide with defaults for shared tracing, since we need a valid destination address for "envdecode".
-	if cfg.Tracing == nil && cfg.Commons != nil && cfg.Commons.Tracing != nil {
-		cfg.Tracing = &config.Tracing{
-			Enabled:   cfg.Commons.Tracing.Enabled,
-			Type:      cfg.Commons.Tracing.Type,
-			Endpoint:  cfg.Commons.Tracing.Endpoint,
-			Collector: cfg.Commons.Tracing.Collector,
-		}
-	} else if cfg.Tracing == nil {
-		cfg.Tracing = &config.Tracing{}
-	}
-
-	if cfg.GRPCClientTLS == nil && cfg.Commons != nil {
-		cfg.GRPCClientTLS = structs.CopyOrZeroValue(cfg.Commons.GRPCClientTLS)
-	}
-	if cfg.GRPC.TLS == nil && cfg.Commons != nil {
-		cfg.GRPC.TLS = structs.CopyOrZeroValue(cfg.Commons.GRPCServiceTLS)
-	}
-}
-
-// Sanitize sanitized the configuration
-func Sanitize(cfg *config.Config) {
-	// nothing to sanitize here atm
-}

services/store/pkg/config/grpc.go

@@ -1,10 +0,0 @@
-package config
-
-import "github.com/owncloud/ocis/v2/ocis-pkg/shared"
-
-// GRPCConfig defines the available grpc configuration.
-type GRPCConfig struct {
-	Addr      string                 `yaml:"addr" env:"STORE_GRPC_ADDR" desc:"The bind address of the GRPC service." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-	Namespace string                 `yaml:"-"`
-	TLS       *shared.GRPCServiceTLS `yaml:"tls"`
-}

services/store/pkg/config/log.go

@@ -1,9 +0,0 @@
-package config
-
-// Log defines the available log configuration.
-type Log struct {
-	Level  string `mapstructure:"level" env:"OCIS_LOG_LEVEL;STORE_LOG_LEVEL" desc:"The log level. Valid values are: 'panic', 'fatal', 'error', 'warn', 'info', 'debug', 'trace'." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-	Pretty bool   `mapstructure:"pretty" env:"OCIS_LOG_PRETTY;STORE_LOG_PRETTY" desc:"Activates pretty log output." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-	Color  bool   `mapstructure:"color" env:"OCIS_LOG_COLOR;STORE_LOG_COLOR" desc:"Activates colorized log output." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-	File   string `mapstructure:"file" env:"OCIS_LOG_FILE;STORE_LOG_FILE" desc:"The path to the log file. Activates logging to this file if set." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-}

services/store/pkg/config/parser/parse.go

@@ -1,38 +0,0 @@
-package parser
-
-import (
-	"errors"
-
-	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config/defaults"
-
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
-)
-
-// ParseConfig loads configuration from known paths.
-func ParseConfig(cfg *config.Config) error {
-	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
-	if err != nil {
-		return err
-	}
-
-	defaults.EnsureDefaults(cfg)
-
-	// load all env variables relevant to the config in the current context.
-	if err := envdecode.Decode(cfg); err != nil {
-		// no environment variable set for this config is an expected "error"
-		if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
-			return err
-		}
-	}
-
-	// sanitize config
-	defaults.Sanitize(cfg)
-
-	return Validate(cfg)
-}
-
-func Validate(cfg *config.Config) error {
-	return nil
-}

services/store/pkg/config/service.go

@@ -1,6 +0,0 @@
-package config
-
-// Service defines the available service configuration.
-type Service struct {
-	Name string `yaml:"-"`
-}

services/store/pkg/config/tracing.go

@@ -1,21 +0,0 @@
-package config
-
-import "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
-
-// Tracing defines the available tracing configuration.
-type Tracing struct {
-	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;STORE_TRACING_ENABLED" desc:"Activates tracing." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;STORE_TRACING_TYPE" desc:"The type of tracing. Defaults to '', which is the same as 'jaeger'. Allowed tracing types are 'jaeger' and '' as of now." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;STORE_TRACING_ENDPOINT" desc:"The endpoint of the tracing agent." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;STORE_TRACING_COLLECTOR" desc:"The HTTP endpoint for sending spans directly to a collector, i.e. http://jaeger-collector:14268/api/traces. Only used if the tracing endpoint is unset." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"7.0.0" deprecationInfo:"The store service is optional and will be removed."`
-}
-
-// Convert Tracing to the tracing package's Config struct.
-func (t Tracing) Convert() tracing.Config {
-	return tracing.Config{
-		Enabled:   t.Enabled,
-		Type:      t.Type,
-		Endpoint:  t.Endpoint,
-		Collector: t.Collector,
-	}
-}

services/store/pkg/logging/logging.go

@@ -1,17 +0,0 @@
-package logging
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/log"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-)
-
-// Configure initializes a service-specific logger instance.
-func Configure(name string, cfg *config.Log) log.Logger {
-	return log.NewLogger(
-		log.Name(name),
-		log.Level(cfg.Level),
-		log.Pretty(cfg.Pretty),
-		log.Color(cfg.Color),
-		log.File(cfg.File),
-	)
-}

services/store/pkg/metrics/metrics.go

@@ -1,45 +0,0 @@
-package metrics
-
-import "github.com/prometheus/client_golang/prometheus"
-
-var (
-	// Namespace defines the namespace for the defines metrics.
-	Namespace = "ocis"
-
-	// Subsystem defines the subsystem for the defines metrics.
-	Subsystem = "store"
-)
-
-// Metrics defines the available metrics of this service.
-type Metrics struct {
-	// Counter  *prometheus.CounterVec
-	BuildInfo *prometheus.GaugeVec
-}
-
-// New initializes the available metrics.
-func New() *Metrics {
-	m := &Metrics{
-		// Counter: prometheus.NewCounterVec(prometheus.CounterOpts{
-		// 	Namespace: Namespace,
-		// 	Subsystem: Subsystem,
-		// 	Name:      "greet_total",
-		// 	Help:      "How many greeting requests processed",
-		// }, []string{}),
-		BuildInfo: prometheus.NewGaugeVec(prometheus.GaugeOpts{
-			Namespace: Namespace,
-			Subsystem: Subsystem,
-			Name:      "build_info",
-			Help:      "Build Information",
-		}, []string{"version"}),
-	}
-
-	// prometheus.Register(
-	// 	m.Counter,
-	// )
-
-	_ = prometheus.Register(
-		m.BuildInfo,
-	)
-
-	return m
-}

services/store/pkg/server/debug/option.go

@@ -1,50 +0,0 @@
-package debug
-
-import (
-	"context"
-
-	"github.com/owncloud/ocis/v2/ocis-pkg/log"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-)
-
-// Option defines a single option function.
-type Option func(o *Options)
-
-// Options defines the available options for this package.
-type Options struct {
-	Logger  log.Logger
-	Context context.Context
-	Config  *config.Config
-}
-
-// newOptions initializes the available default options.
-func newOptions(opts ...Option) Options {
-	opt := Options{}
-
-	for _, o := range opts {
-		o(&opt)
-	}
-
-	return opt
-}
-
-// Logger provides a function to set the logger option.
-func Logger(val log.Logger) Option {
-	return func(o *Options) {
-		o.Logger = val
-	}
-}
-
-// Context provides a function to set the context option.
-func Context(val context.Context) Option {
-	return func(o *Options) {
-		o.Context = val
-	}
-}
-
-// Config provides a function to set the config option.
-func Config(val *config.Config) Option {
-	return func(o *Options) {
-		o.Config = val
-	}
-}

services/store/pkg/server/debug/server.go

@@ -1,59 +0,0 @@
-package debug
-
-import (
-	"io"
-	"net/http"
-
-	"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
-	"github.com/owncloud/ocis/v2/ocis-pkg/version"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-)
-
-// Server initializes the debug service and server.
-func Server(opts ...Option) (*http.Server, error) {
-	options := newOptions(opts...)
-
-	return debug.NewService(
-		debug.Logger(options.Logger),
-		debug.Name(options.Config.Service.Name),
-		debug.Version(version.GetString()),
-		debug.Address(options.Config.Debug.Addr),
-		debug.Token(options.Config.Debug.Token),
-		debug.Pprof(options.Config.Debug.Pprof),
-		debug.Zpages(options.Config.Debug.Zpages),
-		debug.Health(health(options.Config)),
-		debug.Ready(ready(options.Config)),
-	), nil
-}
-
-// health implements the health check.
-func health(cfg *config.Config) func(http.ResponseWriter, *http.Request) {
-	return func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "text/plain")
-		w.WriteHeader(http.StatusOK)
-
-		// TODO: check if services are up and running
-
-		_, err := io.WriteString(w, http.StatusText(http.StatusOK))
-		// io.WriteString should not fail but if it does, we want to know.
-		if err != nil {
-			panic(err)
-		}
-	}
-}
-
-// ready implements the ready check.
-func ready(cfg *config.Config) func(http.ResponseWriter, *http.Request) {
-	return func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "text/plain")
-		w.WriteHeader(http.StatusOK)
-
-		// TODO: check if services are up and running
-
-		_, err := io.WriteString(w, http.StatusText(http.StatusOK))
-		// io.WriteString should not fail but if it does, we want to know.
-		if err != nil {
-			panic(err)
-		}
-	}
-}

services/store/pkg/server/grpc/option.go

@@ -1,80 +0,0 @@
-package grpc
-
-import (
-	"context"
-
-	"github.com/owncloud/ocis/v2/ocis-pkg/log"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-	"github.com/owncloud/ocis/v2/services/store/pkg/metrics"
-	"go.opentelemetry.io/otel/trace"
-)
-
-// Option defines a single option function.
-type Option func(o *Options)
-
-// Options defines the available options for this package.
-type Options struct {
-	Name          string
-	Logger        log.Logger
-	Context       context.Context
-	Config        *config.Config
-	Metrics       *metrics.Metrics
-	TraceProvider trace.TracerProvider
-}
-
-// newOptions initializes the available default options.
-func newOptions(opts ...Option) Options {
-	opt := Options{}
-
-	for _, o := range opts {
-		o(&opt)
-	}
-
-	return opt
-}
-
-// Name provides a name for the service.
-func Name(val string) Option {
-	return func(o *Options) {
-		o.Name = val
-	}
-}
-
-// Logger provides a function to set the logger option.
-func Logger(val log.Logger) Option {
-	return func(o *Options) {
-		o.Logger = val
-	}
-}
-
-// Context provides a function to set the context option.
-func Context(val context.Context) Option {
-	return func(o *Options) {
-		o.Context = val
-	}
-}
-
-// Config provides a function to set the config option.
-func Config(val *config.Config) Option {
-	return func(o *Options) {
-		o.Config = val
-	}
-}
-
-// Metrics provides a function to set the metrics option.
-func Metrics(val *metrics.Metrics) Option {
-	return func(o *Options) {
-		o.Metrics = val
-	}
-}
-
-// TraceProvider provides a function to configure the trace provider
-func TraceProvider(traceProvider trace.TracerProvider) Option {
-	return func(o *Options) {
-		if traceProvider != nil {
-			o.TraceProvider = traceProvider
-		} else {
-			o.TraceProvider = trace.NewNoopTracerProvider()
-		}
-	}
-}

services/store/pkg/server/grpc/server.go

@@ -1,46 +0,0 @@
-package grpc
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
-	"github.com/owncloud/ocis/v2/ocis-pkg/version"
-	storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0"
-	svc "github.com/owncloud/ocis/v2/services/store/pkg/service/v0"
-)
-
-// Server initializes a new go-micro service ready to run
-func Server(opts ...Option) grpc.Service {
-	options := newOptions(opts...)
-
-	service, err := grpc.NewServiceWithClient(
-		options.Config.GrpcClient,
-		grpc.TLSEnabled(options.Config.GRPC.TLS.Enabled),
-		grpc.TLSCert(
-			options.Config.GRPC.TLS.Cert,
-			options.Config.GRPC.TLS.Key,
-		),
-		grpc.Namespace(options.Config.GRPC.Namespace),
-		grpc.Name(options.Config.Service.Name),
-		grpc.Version(version.GetString()),
-		grpc.Context(options.Context),
-		grpc.Address(options.Config.GRPC.Addr),
-		grpc.Logger(options.Logger),
-		grpc.TraceProvider(options.TraceProvider),
-	)
-	if err != nil {
-		options.Logger.Fatal().Err(err).Msg("Error creating store service")
-		return grpc.Service{}
-	}
-
-	hdlr, err := svc.New(
-		svc.Logger(options.Logger),
-		svc.Config(options.Config),
-	)
-	if err != nil {
-		options.Logger.Fatal().Err(err).Msg("could not initialize service handler")
-	}
-	if err = storesvc.RegisterStoreHandler(service.Server(), hdlr); err != nil {
-		options.Logger.Fatal().Err(err).Msg("could not register service handler")
-	}
-
-	return service
-}

services/store/pkg/service/v0/option.go

@@ -1,63 +0,0 @@
-package service
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/log"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-)
-
-// Option defines a single option function.
-type Option func(o *Options)
-
-// Options defines the available options for this package.
-type Options struct {
-	Logger log.Logger
-	Config *config.Config
-
-	Database, Table string
-	Nodes           []string
-}
-
-func newOptions(opts ...Option) Options {
-	opt := Options{}
-
-	for _, o := range opts {
-		o(&opt)
-	}
-
-	return opt
-}
-
-// Logger provides a function to set the logger option.
-func Logger(val log.Logger) Option {
-	return func(o *Options) {
-		o.Logger = val
-	}
-}
-
-// Database configures the database option.
-func Database(val *config.Config) Option {
-	return func(o *Options) {
-		o.Config = val
-	}
-}
-
-// Table configures the Table option.
-func Table(val *config.Config) Option {
-	return func(o *Options) {
-		o.Config = val
-	}
-}
-
-// Nodes configures the Nodes option.
-func Nodes(val *config.Config) Option {
-	return func(o *Options) {
-		o.Config = val
-	}
-}
-
-// Config configures the Config option.
-func Config(val *config.Config) Option {
-	return func(o *Options) {
-		o.Config = val
-	}
-}

services/store/pkg/service/v0/service.go

@@ -1,332 +0,0 @@
-package service
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/blevesearch/bleve/v2"
-	"github.com/blevesearch/bleve/v2/analysis/analyzer/keyword"
-	"github.com/owncloud/ocis/v2/ocis-pkg/log"
-	storemsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0"
-	storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0"
-	"github.com/owncloud/ocis/v2/services/store/pkg/config"
-	merrors "go-micro.dev/v4/errors"
-	"google.golang.org/protobuf/encoding/protojson"
-)
-
-// BleveDocument wraps the generated Record.Metadata and adds a property that is used to distinguish documents in the index.
-type BleveDocument struct {
-	Metadata map[string]*storemsg.Field `json:"metadata"`
-	Database string                     `json:"database"`
-	Table    string                     `json:"table"`
-}
-
-// New returns a new instance of Service
-func New(opts ...Option) (s *Service, err error) {
-	options := newOptions(opts...)
-	logger := options.Logger
-	cfg := options.Config
-
-	recordsDir := filepath.Join(cfg.Datapath, "databases")
-	{
-		var fi os.FileInfo
-		if fi, err = os.Stat(recordsDir); err != nil {
-			if os.IsNotExist(err) {
-				// create store directory
-				if err = os.MkdirAll(recordsDir, 0700); err != nil {
-					return nil, err
-				}
-			}
-		} else if !fi.IsDir() {
-			return nil, fmt.Errorf("%s is not a directory", recordsDir)
-		}
-	}
-
-	indexMapping := bleve.NewIndexMapping()
-	// keep all symbols in terms to allow exact matching, eg. emails
-	indexMapping.DefaultAnalyzer = keyword.Name
-
-	s = &Service{
-		id:     cfg.GRPC.Namespace + "." + cfg.Service.Name,
-		log:    logger,
-		Config: cfg,
-	}
-
-	indexDir := filepath.Join(cfg.Datapath, "index.bleve")
-	// for now recreate index on every start
-	if err = os.RemoveAll(indexDir); err != nil {
-		return nil, err
-	}
-	if s.index, err = bleve.New(indexDir, indexMapping); err != nil {
-		return
-	}
-	if err = s.indexRecords(recordsDir); err != nil {
-		return nil, err
-	}
-	return
-}
-
-// Service implements the AccountsServiceHandler interface
-type Service struct {
-	id     string
-	log    log.Logger
-	Config *config.Config
-	index  bleve.Index
-}
-
-// Read implements the StoreHandler interface.
-func (s *Service) Read(c context.Context, rreq *storesvc.ReadRequest, rres *storesvc.ReadResponse) error {
-	if len(rreq.Key) != 0 {
-		id := getID(rreq.Options.Database, rreq.Options.Table, rreq.Key)
-		file := filepath.Join(s.Config.Datapath, "databases", id)
-
-		var data []byte
-		rec := &storemsg.Record{}
-		data, err := os.ReadFile(file)
-		if err != nil {
-			return merrors.NotFound(s.id, "could not read record")
-		}
-
-		if err = protojson.Unmarshal(data, rec); err != nil {
-			return merrors.InternalServerError(s.id, "could not unmarshal record")
-		}
-
-		rres.Records = append(rres.Records, rec)
-		return nil
-	}
-
-	s.log.Info().Interface("request", rreq).Msg("read request")
-	if rreq.Options.Where != nil {
-		// build bleve query
-		// execute search
-		// fetch the actual record if there's a hit
-		dtq := bleve.NewTermQuery(rreq.Options.Database)
-		ttq := bleve.NewTermQuery(rreq.Options.Table)
-		dtq.SetField("database")
-		ttq.SetField("table")
-
-		query := bleve.NewConjunctionQuery(dtq, ttq)
-		for k, v := range rreq.Options.Where {
-			ntq := bleve.NewTermQuery(v.Value)
-			ntq.SetField("metadata." + k + ".value")
-			query.AddQuery(ntq)
-		}
-
-		searchRequest := bleve.NewSearchRequest(query)
-		var searchResult *bleve.SearchResult
-		searchResult, err := s.index.Search(searchRequest)
-		if err != nil {
-			s.log.Error().Err(err).Msg("could not execute bleve search")
-			return merrors.InternalServerError(s.id, "could not execute bleve search: %v", err.Error())
-		}
-
-		for _, hit := range searchResult.Hits {
-			rec := &storemsg.Record{}
-
-			dest := filepath.Join(s.Config.Datapath, "databases", hit.ID)
-
-			var data []byte
-			data, err := os.ReadFile(dest)
-			s.log.Info().Str("path", dest).Interface("hit", hit).Msgf("hit info")
-			if err != nil {
-				s.log.Info().Str("path", dest).Interface("hit", hit).Msgf("file not found")
-				return merrors.NotFound(s.id, "could not read record")
-			}
-
-			if err = protojson.Unmarshal(data, rec); err != nil {
-				return merrors.InternalServerError(s.id, "could not unmarshal record")
-			}
-
-			rres.Records = append(rres.Records, rec)
-		}
-		return nil
-	}
-
-	return merrors.InternalServerError(s.id, "neither id nor metadata present")
-}
-
-// Write implements the StoreHandler interface.
-func (s *Service) Write(c context.Context, wreq *storesvc.WriteRequest, wres *storesvc.WriteResponse) error {
-	id := getID(wreq.Options.Database, wreq.Options.Table, wreq.Record.Key)
-	file := filepath.Join(s.Config.Datapath, "databases", id)
-
-	var bytes []byte
-	bytes, err := protojson.Marshal(wreq.Record)
-	if err != nil {
-		return merrors.InternalServerError(s.id, "could not marshal record")
-	}
-
-	err = os.MkdirAll(filepath.Dir(file), 0700)
-	if err != nil {
-		return err
-	}
-	err = os.WriteFile(file, bytes, 0600)
-	if err != nil {
-		return merrors.InternalServerError(s.id, "could not write record")
-	}
-
-	doc := BleveDocument{
-		Metadata: wreq.Record.Metadata,
-		Database: wreq.Options.Database,
-		Table:    wreq.Options.Table,
-	}
-	if err := s.index.Index(id, doc); err != nil {
-		s.log.Error().Err(err).Interface("document", doc).Msg("could not index record metadata")
-		return err
-	}
-
-	return nil
-}
-
-// Delete implements the StoreHandler interface.
-func (s *Service) Delete(c context.Context, dreq *storesvc.DeleteRequest, dres *storesvc.DeleteResponse) error {
-	id := getID(dreq.Options.Database, dreq.Options.Table, dreq.Key)
-	file := filepath.Join(s.Config.Datapath, "databases", id)
-	if err := os.Remove(file); err != nil {
-		if os.IsNotExist(err) {
-			return merrors.NotFound(s.id, "could not find record")
-		}
-
-		return merrors.InternalServerError(s.id, "could not delete record")
-	}
-
-	if err := s.index.Delete(id); err != nil {
-		s.log.Error().Err(err).Str("id", id).Msg("could not remove record from index")
-		return merrors.InternalServerError(s.id, "could not remove record from index")
-	}
-
-	return nil
-}
-
-// List implements the StoreHandler interface.
-func (s *Service) List(context.Context, *storesvc.ListRequest, storesvc.Store_ListStream) error {
-	return nil
-}
-
-// Databases implements the StoreHandler interface.
-func (s *Service) Databases(c context.Context, dbreq *storesvc.DatabasesRequest, dbres *storesvc.DatabasesResponse) error {
-	file := filepath.Join(s.Config.Datapath, "databases")
-	f, err := os.Open(file)
-	if err != nil {
-		return merrors.InternalServerError(s.id, "could not open database directory")
-	}
-	defer f.Close()
-
-	dnames, err := f.Readdirnames(0)
-	if err != nil {
-		return merrors.InternalServerError(s.id, "could not read database directory")
-	}
-
-	dbres.Databases = dnames
-	return nil
-}
-
-// Tables implements the StoreHandler interface.
-func (s *Service) Tables(ctx context.Context, in *storesvc.TablesRequest, out *storesvc.TablesResponse) error {
-	file := filepath.Join(s.Config.Datapath, "databases", in.Database)
-	f, err := os.Open(file)
-	if err != nil {
-		return merrors.InternalServerError(s.id, "could not open tables directory")
-	}
-	defer f.Close()
-
-	tnames, err := f.Readdirnames(0)
-	if err != nil {
-		return merrors.InternalServerError(s.id, "could not read tables directory")
-	}
-
-	out.Tables = tnames
-	return nil
-}
-
-// TODO sanitize key. As it may contain invalid characters, such as slashes.
-// file: /tmp/ocis-store/databases/{database}/{table}/{record.key}.
-func getID(database string, table string, key string) string {
-	// TODO sanitize input.
-	return filepath.Join(database, table, key)
-}
-
-func (s Service) indexRecords(recordsDir string) (err error) {
-
-	// TODO use filepath.Walk to clean up code
-	rh, err := os.Open(recordsDir)
-	if err != nil {
-		return merrors.InternalServerError(s.id, "could not open database directory")
-	}
-	defer rh.Close()
-
-	dbs, err := rh.Readdirnames(0)
-	if err != nil {
-		return merrors.InternalServerError(s.id, "could not read databases directory")
-	}
-
-	for i := range dbs {
-		tp := filepath.Join(s.Config.Datapath, "databases", dbs[i])
-		th, err := os.Open(tp)
-		if err != nil {
-			s.log.Error().Err(err).Str("database", dbs[i]).Msg("could not open database directory")
-			continue
-		}
-		defer th.Close()
-
-		tables, err := th.Readdirnames(0)
-		if err != nil {
-			s.log.Error().Err(err).Str("database", dbs[i]).Msg("could not read database directory")
-			continue
-		}
-
-		for j := range tables {
-
-			tp := filepath.Join(s.Config.Datapath, "databases", dbs[i], tables[j])
-			kh, err := os.Open(tp)
-			if err != nil {
-				s.log.Error().Err(err).Str("database", dbs[i]).Str("table", tables[i]).Msg("could not open table directory")
-				continue
-			}
-			defer kh.Close()
-
-			keys, err := kh.Readdirnames(0)
-			if err != nil {
-				s.log.Error().Err(err).Str("database", dbs[i]).Str("table", tables[i]).Msg("could not read table directory")
-				continue
-			}
-
-			for k := range keys {
-
-				id := getID(dbs[i], tables[j], keys[k])
-				kp := filepath.Join(s.Config.Datapath, "databases", id)
-
-				// read record
-				var data []byte
-				rec := &storemsg.Record{}
-				data, err = os.ReadFile(kp)
-				if err != nil {
-					s.log.Error().Err(err).Str("id", id).Msg("could not read record")
-					continue
-				}
-
-				if err = protojson.Unmarshal(data, rec); err != nil {
-					s.log.Error().Err(err).Str("id", id).Msg("could not unmarshal record")
-					continue
-				}
-
-				// index record
-				doc := BleveDocument{
-					Metadata: rec.Metadata,
-					Database: dbs[i],
-					Table:    tables[j],
-				}
-				if err := s.index.Index(id, doc); err != nil {
-					s.log.Error().Err(err).Interface("document", doc).Str("id", id).Msg("could not index record metadata")
-					continue
-				}
-
-				s.log.Debug().Str("id", id).Msg("indexed record")
-			}
-		}
-	}
-
-	return
-}

services/store/pkg/store/options.go

@@ -1,20 +0,0 @@
-package store
-
-import (
-	"context"
-
-	"go-micro.dev/v4/client"
-	"go-micro.dev/v4/store"
-)
-
-type grpcClientContextKey struct{}
-
-// WithGRPCClient sets the grpc client
-func WithGRPCClient(c client.Client) store.Option {
-	return func(o *store.Options) {
-		if o.Context == nil {
-			o.Context = context.Background()
-		}
-		o.Context = context.WithValue(o.Context, grpcClientContextKey{}, c)
-	}
-}

services/store/pkg/store/store.go

@@ -1,189 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-	"net/http"
-	"time"
-
-	"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
-	storemsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0"
-	storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0"
-	"go-micro.dev/v4/client"
-	merrors "go-micro.dev/v4/errors"
-	"go-micro.dev/v4/logger"
-	"go-micro.dev/v4/store"
-	"go-micro.dev/v4/util/cmd"
-)
-
-// DefaultDatabase is the namespace that the store
-// will use if no namespace is provided.
-var (
-	DefaultDatabase = "proxy"
-	DefaultTable    = "signing-keys"
-)
-
-type oss struct {
-	ctx     context.Context
-	options store.Options
-	svc     storesvc.StoreService
-}
-
-func init() {
-	cmd.DefaultStores["ocisstoreservice"] = NewStore
-}
-
-// NewStore returns a micro store.Store wrapper to access the micro store service.
-// It only implements the minimal Read and Write options that are used by the proxy and ocs services
-// Deprecated: use a different micro.Store implementation like nats-js-ks
-func NewStore(opts ...store.Option) store.Store {
-	options := store.Options{
-		Context:  context.Background(),
-		Database: DefaultDatabase,
-		Table:    DefaultTable,
-		Logger:   logger.DefaultLogger,
-		Nodes:    []string{"com.owncloud.api.store"},
-	}
-
-	for _, o := range opts {
-		o(&options)
-	}
-
-	c, ok := options.Context.Value(grpcClientContextKey{}).(client.Client)
-	if !ok {
-		var err error
-		c, err = grpc.NewClient()
-		if err != nil {
-			options.Logger.Fields(map[string]interface{}{"err": err}).Log(logger.FatalLevel, "ocisstoreservice could not create new grpc client")
-		}
-	}
-	svc := storesvc.NewStoreService(options.Nodes[0], c)
-
-	s := &oss{
-		ctx:     context.Background(),
-		options: options,
-		svc:     svc,
-	}
-
-	return s
-}
-
-// Init initializes the store by configuring a storeservice and initializing
-// a grpc client if it has not been passed as a context option.
-func (s *oss) Init(opts ...store.Option) error {
-	for _, o := range opts {
-		o(&s.options)
-	}
-	return s.configure()
-}
-
-func (s *oss) configure() error {
-	c, ok := s.options.Context.Value(grpcClientContextKey{}).(client.Client)
-	if !ok {
-		var err error
-		c, err = grpc.NewClient()
-		if err != nil {
-			logger.Fatal("ocisstoreservice could not create new grpc client:", err)
-		}
-	}
-	if len(s.options.Nodes) < 1 {
-		return errors.New("no node configured")
-	}
-	s.svc = storesvc.NewStoreService(s.options.Nodes[0], c)
-	return nil
-}
-
-// Options allows you to view the current options.
-func (s *oss) Options() store.Options {
-	return s.options
-}
-
-// Read takes a single key name and optional ReadOptions. It returns matching []*Record or an error.
-// Only database and table options are used.
-func (s *oss) Read(key string, opts ...store.ReadOption) ([]*store.Record, error) {
-	options := store.ReadOptions{
-		Database: s.options.Database,
-		Table:    s.options.Table,
-	}
-
-	for _, o := range opts {
-		o(&options)
-	}
-
-	res, err := s.svc.Read(context.Background(), &storesvc.ReadRequest{
-		Options: &storemsg.ReadOptions{
-			Database: options.Database,
-			Table:    options.Table,
-			// Other options ignored
-		},
-		Key: key,
-	})
-
-	if err != nil {
-		e := merrors.Parse(err.Error())
-		if e.Code == http.StatusNotFound {
-			return nil, store.ErrNotFound
-		}
-		return nil, err
-	}
-
-	records := make([]*store.Record, 0, len(res.Records))
-	for _, record := range res.Records {
-		r := &store.Record{
-			Key:      record.Key,
-			Value:    record.Value,
-			Metadata: map[string]interface{}{},
-			Expiry:   time.Duration(record.Expiry),
-		}
-		for k, v := range record.Metadata {
-			r.Metadata[k] = v.Value // we only support string
-		}
-		records = append(records, r)
-	}
-	return records, nil
-}
-
-// Write() writes a record to the store, and returns an error if the record was not written.
-func (s *oss) Write(r *store.Record, opts ...store.WriteOption) error {
-	options := store.WriteOptions{
-		Database: s.options.Database,
-		Table:    s.options.Table,
-	}
-
-	for _, o := range opts {
-		o(&options)
-	}
-	_, err := s.svc.Write(context.Background(), &storesvc.WriteRequest{
-		Options: &storemsg.WriteOptions{
-			Database: options.Database,
-			Table:    options.Table,
-		},
-		Record: &storemsg.Record{
-			Key:   r.Key,
-			Value: r.Value,
-			// No expiry supported
-		},
-	})
-
-	return err
-}
-
-// Delete is not implemented for the ocis service
-func (s *oss) Delete(key string, opts ...store.DeleteOption) error {
-	return errors.ErrUnsupported
-}
-
-// List is not implemented for the ocis service
-func (s *oss) List(opts ...store.ListOption) ([]string, error) {
-	return nil, errors.ErrUnsupported
-}
-
-// Close does nothing
-func (s *oss) Close() error {
-	return nil
-}
-
-// String returns the name of the implementation.
-func (s *oss) String() string {
-	return "ocisstoreservice"
-}

services/store/reflex.conf

@@ -1,3 +0,0 @@
-# backend
--r '^(cmd|pkg)/.*\.go$' -R '^node_modules/' -s -- sh -c 'make bin/ocis-store-debug && bin/ocis-store-debug --log-level debug server --debug-pprof --debug-zpages'
-'