From 4347b2672fc31b4a125e508885845f7da014a1e0 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Wed, 13 Apr 2022 10:44:57 +0200 Subject: [PATCH] refactor store Signed-off-by: Christian Richter --- {store => extensions/store}/.golangci.yaml | 0 {store => extensions/store}/Makefile | 14 +++++++------- {store => extensions/store}/cmd/store/main.go | 4 ++-- .../store}/docker/Dockerfile.linux.amd64 | 0 .../store}/docker/Dockerfile.linux.arm | 0 .../store}/docker/Dockerfile.linux.arm64 | 0 {store => extensions/store}/docker/manifest.tmpl | 0 {store => extensions/store}/pkg/command/health.go | 6 +++--- {store => extensions/store}/pkg/command/root.go | 2 +- {store => extensions/store}/pkg/command/server.go | 14 +++++++------- {store => extensions/store}/pkg/command/version.go | 2 +- {store => extensions/store}/pkg/config/config.go | 0 {store => extensions/store}/pkg/config/debug.go | 0 .../store}/pkg/config/defaults/defaultconfig.go | 2 +- {store => extensions/store}/pkg/config/grpc.go | 0 {store => extensions/store}/pkg/config/log.go | 0 .../store}/pkg/config/parser/parse.go | 4 ++-- {store => extensions/store}/pkg/config/service.go | 0 {store => extensions/store}/pkg/config/tracing.go | 0 {store => extensions/store}/pkg/logging/logging.go | 2 +- {store => extensions/store}/pkg/metrics/metrics.go | 0 .../store}/pkg/server/debug/option.go | 2 +- .../store}/pkg/server/debug/server.go | 2 +- .../store}/pkg/server/grpc/option.go | 4 ++-- .../store}/pkg/server/grpc/server.go | 2 +- .../store}/pkg/service/v0/option.go | 2 +- .../store}/pkg/service/v0/service.go | 2 +- {store => extensions/store}/pkg/tracing/tracing.go | 2 +- {store => extensions/store}/reflex.conf | 0 ocis-pkg/config/config.go | 2 +- ocis-pkg/config/defaultconfig.go | 2 +- ocis/pkg/command/store.go | 2 +- ocis/pkg/runtime/service/service.go | 2 +- 33 files changed, 37 insertions(+), 37 deletions(-) rename {store => extensions/store}/.golangci.yaml (100%) rename {store => extensions/store}/Makefile (78%) rename {store => extensions/store}/cmd/store/main.go (51%) rename {store => extensions/store}/docker/Dockerfile.linux.amd64 (100%) rename {store => extensions/store}/docker/Dockerfile.linux.arm (100%) rename {store => extensions/store}/docker/Dockerfile.linux.arm64 (100%) rename {store => extensions/store}/docker/manifest.tmpl (100%) rename {store => extensions/store}/pkg/command/health.go (84%) rename {store => extensions/store}/pkg/command/root.go (96%) rename {store => extensions/store}/pkg/command/server.go (80%) rename {store => extensions/store}/pkg/command/version.go (95%) rename {store => extensions/store}/pkg/config/config.go (100%) rename {store => extensions/store}/pkg/config/debug.go (100%) rename {store => extensions/store}/pkg/config/defaults/defaultconfig.go (96%) rename {store => extensions/store}/pkg/config/grpc.go (100%) rename {store => extensions/store}/pkg/config/log.go (100%) rename {store => extensions/store}/pkg/config/parser/parse.go (85%) rename {store => extensions/store}/pkg/config/service.go (100%) rename {store => extensions/store}/pkg/config/tracing.go (100%) rename {store => extensions/store}/pkg/logging/logging.go (85%) rename {store => extensions/store}/pkg/metrics/metrics.go (100%) rename {store => extensions/store}/pkg/server/debug/option.go (94%) rename {store => extensions/store}/pkg/server/debug/server.go (96%) rename {store => extensions/store}/pkg/server/grpc/option.go (92%) rename {store => extensions/store}/pkg/server/grpc/server.go (93%) rename {store => extensions/store}/pkg/service/v0/option.go (95%) rename {store => extensions/store}/pkg/service/v0/service.go (99%) rename {store => extensions/store}/pkg/tracing/tracing.go (90%) rename {store => extensions/store}/reflex.conf (100%) diff --git a/store/.golangci.yaml b/extensions/store/.golangci.yaml similarity index 100% rename from store/.golangci.yaml rename to extensions/store/.golangci.yaml diff --git a/store/Makefile b/extensions/store/Makefile similarity index 78% rename from store/Makefile rename to extensions/store/Makefile index 3e913805b..70cef069d 100644 --- a/store/Makefile +++ b/extensions/store/Makefile @@ -1,28 +1,28 @@ SHELL := bash NAME := store -include ../.make/recursion.mk +include ../../.make/recursion.mk ############ tooling ############ ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI -include ../.bingo/Variables.mk +include ../../.bingo/Variables.mk endif ############ go tooling ############ -include ../.make/go.mk +include ../../.make/go.mk ############ release ############ -include ../.make/release.mk +include ../../.make/release.mk ############ docs generate ############ -include ../.make/docs.mk +include ../../.make/docs.mk .PHONY: docs-generate docs-generate: config-docs-generate \ grpc-docs-generate ############ generate ############ -include ../.make/generate.mk +include ../../.make/generate.mk .PHONY: ci-go-generate ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target @@ -32,7 +32,7 @@ ci-node-generate: ############ protobuf ############ -include ../.make/protobuf.mk +include ../../.make/protobuf.mk .PHONY: protobuf protobuf: buf-generate diff --git a/store/cmd/store/main.go b/extensions/store/cmd/store/main.go similarity index 51% rename from store/cmd/store/main.go rename to extensions/store/cmd/store/main.go index 06cc58efa..c520658d5 100644 --- a/store/cmd/store/main.go +++ b/extensions/store/cmd/store/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/store/pkg/command" - "github.com/owncloud/ocis/store/pkg/config/defaults" + "github.com/owncloud/ocis/extensions/store/pkg/command" + "github.com/owncloud/ocis/extensions/store/pkg/config/defaults" ) func main() { diff --git a/store/docker/Dockerfile.linux.amd64 b/extensions/store/docker/Dockerfile.linux.amd64 similarity index 100% rename from store/docker/Dockerfile.linux.amd64 rename to extensions/store/docker/Dockerfile.linux.amd64 diff --git a/store/docker/Dockerfile.linux.arm b/extensions/store/docker/Dockerfile.linux.arm similarity index 100% rename from store/docker/Dockerfile.linux.arm rename to extensions/store/docker/Dockerfile.linux.arm diff --git a/store/docker/Dockerfile.linux.arm64 b/extensions/store/docker/Dockerfile.linux.arm64 similarity index 100% rename from store/docker/Dockerfile.linux.arm64 rename to extensions/store/docker/Dockerfile.linux.arm64 diff --git a/store/docker/manifest.tmpl b/extensions/store/docker/manifest.tmpl similarity index 100% rename from store/docker/manifest.tmpl rename to extensions/store/docker/manifest.tmpl diff --git a/store/pkg/command/health.go b/extensions/store/pkg/command/health.go similarity index 84% rename from store/pkg/command/health.go rename to extensions/store/pkg/command/health.go index fafc60e02..7bf3ba8f4 100644 --- a/store/pkg/command/health.go +++ b/extensions/store/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/store/pkg/config" - "github.com/owncloud/ocis/store/pkg/config/parser" - "github.com/owncloud/ocis/store/pkg/logging" + "github.com/owncloud/ocis/extensions/store/pkg/config" + "github.com/owncloud/ocis/extensions/store/pkg/config/parser" + "github.com/owncloud/ocis/extensions/store/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/store/pkg/command/root.go b/extensions/store/pkg/command/root.go similarity index 96% rename from store/pkg/command/root.go rename to extensions/store/pkg/command/root.go index add49da6f..9dc06b0e7 100644 --- a/store/pkg/command/root.go +++ b/extensions/store/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" + "github.com/owncloud/ocis/extensions/store/pkg/config" "github.com/owncloud/ocis/ocis-pkg/clihelper" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/store/pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/store/pkg/command/server.go b/extensions/store/pkg/command/server.go similarity index 80% rename from store/pkg/command/server.go rename to extensions/store/pkg/command/server.go index eb0b7f8d6..ac14affd2 100644 --- a/store/pkg/command/server.go +++ b/extensions/store/pkg/command/server.go @@ -6,14 +6,14 @@ import ( "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/store/pkg/config" + "github.com/owncloud/ocis/extensions/store/pkg/config/parser" + "github.com/owncloud/ocis/extensions/store/pkg/logging" + "github.com/owncloud/ocis/extensions/store/pkg/metrics" + "github.com/owncloud/ocis/extensions/store/pkg/server/debug" + "github.com/owncloud/ocis/extensions/store/pkg/server/grpc" + "github.com/owncloud/ocis/extensions/store/pkg/tracing" "github.com/owncloud/ocis/ocis-pkg/version" - "github.com/owncloud/ocis/store/pkg/config" - "github.com/owncloud/ocis/store/pkg/config/parser" - "github.com/owncloud/ocis/store/pkg/logging" - "github.com/owncloud/ocis/store/pkg/metrics" - "github.com/owncloud/ocis/store/pkg/server/debug" - "github.com/owncloud/ocis/store/pkg/server/grpc" - "github.com/owncloud/ocis/store/pkg/tracing" "github.com/urfave/cli/v2" ) diff --git a/store/pkg/command/version.go b/extensions/store/pkg/command/version.go similarity index 95% rename from store/pkg/command/version.go rename to extensions/store/pkg/command/version.go index e976ef727..099101772 100644 --- a/store/pkg/command/version.go +++ b/extensions/store/pkg/command/version.go @@ -8,7 +8,7 @@ import ( "github.com/owncloud/ocis/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/store/pkg/config" + "github.com/owncloud/ocis/extensions/store/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/store/pkg/config/config.go b/extensions/store/pkg/config/config.go similarity index 100% rename from store/pkg/config/config.go rename to extensions/store/pkg/config/config.go diff --git a/store/pkg/config/debug.go b/extensions/store/pkg/config/debug.go similarity index 100% rename from store/pkg/config/debug.go rename to extensions/store/pkg/config/debug.go diff --git a/store/pkg/config/defaults/defaultconfig.go b/extensions/store/pkg/config/defaults/defaultconfig.go similarity index 96% rename from store/pkg/config/defaults/defaultconfig.go rename to extensions/store/pkg/config/defaults/defaultconfig.go index 2381ceb4a..1d84c1c47 100644 --- a/store/pkg/config/defaults/defaultconfig.go +++ b/extensions/store/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path" + "github.com/owncloud/ocis/extensions/store/pkg/config" "github.com/owncloud/ocis/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/store/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/store/pkg/config/grpc.go b/extensions/store/pkg/config/grpc.go similarity index 100% rename from store/pkg/config/grpc.go rename to extensions/store/pkg/config/grpc.go diff --git a/store/pkg/config/log.go b/extensions/store/pkg/config/log.go similarity index 100% rename from store/pkg/config/log.go rename to extensions/store/pkg/config/log.go diff --git a/store/pkg/config/parser/parse.go b/extensions/store/pkg/config/parser/parse.go similarity index 85% rename from store/pkg/config/parser/parse.go rename to extensions/store/pkg/config/parser/parse.go index 3538a608f..7c9f02bda 100644 --- a/store/pkg/config/parser/parse.go +++ b/extensions/store/pkg/config/parser/parse.go @@ -3,9 +3,9 @@ package parser import ( "errors" + "github.com/owncloud/ocis/extensions/store/pkg/config" + "github.com/owncloud/ocis/extensions/store/pkg/config/defaults" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/store/pkg/config" - "github.com/owncloud/ocis/store/pkg/config/defaults" "github.com/owncloud/ocis/ocis-pkg/config/envdecode" ) diff --git a/store/pkg/config/service.go b/extensions/store/pkg/config/service.go similarity index 100% rename from store/pkg/config/service.go rename to extensions/store/pkg/config/service.go diff --git a/store/pkg/config/tracing.go b/extensions/store/pkg/config/tracing.go similarity index 100% rename from store/pkg/config/tracing.go rename to extensions/store/pkg/config/tracing.go diff --git a/store/pkg/logging/logging.go b/extensions/store/pkg/logging/logging.go similarity index 85% rename from store/pkg/logging/logging.go rename to extensions/store/pkg/logging/logging.go index c5c6d4520..ae9008b4e 100644 --- a/store/pkg/logging/logging.go +++ b/extensions/store/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( + "github.com/owncloud/ocis/extensions/store/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/store/pkg/config" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/store/pkg/metrics/metrics.go b/extensions/store/pkg/metrics/metrics.go similarity index 100% rename from store/pkg/metrics/metrics.go rename to extensions/store/pkg/metrics/metrics.go diff --git a/store/pkg/server/debug/option.go b/extensions/store/pkg/server/debug/option.go similarity index 94% rename from store/pkg/server/debug/option.go rename to extensions/store/pkg/server/debug/option.go index 416777bde..c911ff703 100644 --- a/store/pkg/server/debug/option.go +++ b/extensions/store/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" + "github.com/owncloud/ocis/extensions/store/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/store/pkg/config" ) // Option defines a single option function. diff --git a/store/pkg/server/debug/server.go b/extensions/store/pkg/server/debug/server.go similarity index 96% rename from store/pkg/server/debug/server.go rename to extensions/store/pkg/server/debug/server.go index 874071c71..b82ec6a2f 100644 --- a/store/pkg/server/debug/server.go +++ b/extensions/store/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" + "github.com/owncloud/ocis/extensions/store/pkg/config" "github.com/owncloud/ocis/ocis-pkg/service/debug" "github.com/owncloud/ocis/ocis-pkg/version" - "github.com/owncloud/ocis/store/pkg/config" ) // Server initializes the debug service and server. diff --git a/store/pkg/server/grpc/option.go b/extensions/store/pkg/server/grpc/option.go similarity index 92% rename from store/pkg/server/grpc/option.go rename to extensions/store/pkg/server/grpc/option.go index 389c2918b..4e4bc9c88 100644 --- a/store/pkg/server/grpc/option.go +++ b/extensions/store/pkg/server/grpc/option.go @@ -3,9 +3,9 @@ package grpc import ( "context" + "github.com/owncloud/ocis/extensions/store/pkg/config" + "github.com/owncloud/ocis/extensions/store/pkg/metrics" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/store/pkg/config" - "github.com/owncloud/ocis/store/pkg/metrics" "github.com/urfave/cli/v2" ) diff --git a/store/pkg/server/grpc/server.go b/extensions/store/pkg/server/grpc/server.go similarity index 93% rename from store/pkg/server/grpc/server.go rename to extensions/store/pkg/server/grpc/server.go index d17a40ea2..cf75ac3a2 100644 --- a/store/pkg/server/grpc/server.go +++ b/extensions/store/pkg/server/grpc/server.go @@ -1,10 +1,10 @@ package grpc import ( + svc "github.com/owncloud/ocis/extensions/store/pkg/service/v0" "github.com/owncloud/ocis/ocis-pkg/service/grpc" "github.com/owncloud/ocis/ocis-pkg/version" storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0" - svc "github.com/owncloud/ocis/store/pkg/service/v0" ) // Server initializes a new go-micro service ready to run diff --git a/store/pkg/service/v0/option.go b/extensions/store/pkg/service/v0/option.go similarity index 95% rename from store/pkg/service/v0/option.go rename to extensions/store/pkg/service/v0/option.go index 5b44f70fc..5b53e01ee 100644 --- a/store/pkg/service/v0/option.go +++ b/extensions/store/pkg/service/v0/option.go @@ -1,8 +1,8 @@ package service import ( + "github.com/owncloud/ocis/extensions/store/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/store/pkg/config" ) // Option defines a single option function. diff --git a/store/pkg/service/v0/service.go b/extensions/store/pkg/service/v0/service.go similarity index 99% rename from store/pkg/service/v0/service.go rename to extensions/store/pkg/service/v0/service.go index 2373d3b4a..72dcf6170 100644 --- a/store/pkg/service/v0/service.go +++ b/extensions/store/pkg/service/v0/service.go @@ -9,10 +9,10 @@ import ( "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/analysis/analyzer/keyword" + "github.com/owncloud/ocis/extensions/store/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" storemsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/store/v0" storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0" - "github.com/owncloud/ocis/store/pkg/config" merrors "go-micro.dev/v4/errors" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/store/pkg/tracing/tracing.go b/extensions/store/pkg/tracing/tracing.go similarity index 90% rename from store/pkg/tracing/tracing.go rename to extensions/store/pkg/tracing/tracing.go index 54eef8ca3..1c67fa097 100644 --- a/store/pkg/tracing/tracing.go +++ b/extensions/store/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( + "github.com/owncloud/ocis/extensions/store/pkg/config" pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" - "github.com/owncloud/ocis/store/pkg/config" "go.opentelemetry.io/otel/trace" ) diff --git a/store/reflex.conf b/extensions/store/reflex.conf similarity index 100% rename from store/reflex.conf rename to extensions/store/reflex.conf diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go index 913e4d81c..33b7732c3 100644 --- a/ocis-pkg/config/config.go +++ b/ocis-pkg/config/config.go @@ -16,7 +16,7 @@ import ( proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config" settings "github.com/owncloud/ocis/extensions/settings/pkg/config" storage "github.com/owncloud/ocis/extensions/storage/pkg/config" - store "github.com/owncloud/ocis/store/pkg/config" + store "github.com/owncloud/ocis/extensions/store/pkg/config" thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config" web "github.com/owncloud/ocis/web/pkg/config" webdav "github.com/owncloud/ocis/webdav/pkg/config" diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go index be726305a..431286548 100644 --- a/ocis-pkg/config/defaultconfig.go +++ b/ocis-pkg/config/defaultconfig.go @@ -14,7 +14,7 @@ import ( proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults" settings "github.com/owncloud/ocis/extensions/settings/pkg/config/defaults" storage "github.com/owncloud/ocis/extensions/storage/pkg/config/defaults" - store "github.com/owncloud/ocis/store/pkg/config/defaults" + store "github.com/owncloud/ocis/extensions/store/pkg/config/defaults" thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config/defaults" web "github.com/owncloud/ocis/web/pkg/config/defaults" webdav "github.com/owncloud/ocis/webdav/pkg/config/defaults" diff --git a/ocis/pkg/command/store.go b/ocis/pkg/command/store.go index 7e10d3628..e37d5ab79 100644 --- a/ocis/pkg/command/store.go +++ b/ocis/pkg/command/store.go @@ -1,10 +1,10 @@ package command import ( + "github.com/owncloud/ocis/extensions/store/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/config/parser" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/store/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go index c12e6e076..06b38eb81 100644 --- a/ocis/pkg/runtime/service/service.go +++ b/ocis/pkg/runtime/service/service.go @@ -31,10 +31,10 @@ import ( proxy "github.com/owncloud/ocis/extensions/proxy/pkg/command" settings "github.com/owncloud/ocis/extensions/settings/pkg/command" storage "github.com/owncloud/ocis/extensions/storage/pkg/command" + store "github.com/owncloud/ocis/extensions/store/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - store "github.com/owncloud/ocis/store/pkg/command" thumbnails "github.com/owncloud/ocis/thumbnails/pkg/command" web "github.com/owncloud/ocis/web/pkg/command" webdav "github.com/owncloud/ocis/webdav/pkg/command"