diff --git a/storage/.dockerignore b/extensions/storage/.dockerignore similarity index 100% rename from storage/.dockerignore rename to extensions/storage/.dockerignore diff --git a/storage/Makefile b/extensions/storage/Makefile similarity index 78% rename from storage/Makefile rename to extensions/storage/Makefile index ac9af7fe10..bb9471219d 100644 --- a/storage/Makefile +++ b/extensions/storage/Makefile @@ -1,27 +1,27 @@ SHELL := bash NAME := storage -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 ############ generate ############ -include ../.make/generate.mk +include ../../.make/generate.mk .PHONY: ci-go-generate ci-go-generate: # CI runs ci-node-generate automatically before this target diff --git a/storage/cmd/storage/main.go b/extensions/storage/cmd/storage/main.go similarity index 51% rename from storage/cmd/storage/main.go rename to extensions/storage/cmd/storage/main.go index 4503dac725..2941f76e77 100644 --- a/storage/cmd/storage/main.go +++ b/extensions/storage/cmd/storage/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/storage/pkg/command" - "github.com/owncloud/ocis/storage/pkg/config/defaults" + "github.com/owncloud/ocis/extensions/storage/pkg/command" + "github.com/owncloud/ocis/extensions/storage/pkg/config/defaults" ) func main() { diff --git a/storage/docker/Dockerfile.linux.amd64 b/extensions/storage/docker/Dockerfile.linux.amd64 similarity index 100% rename from storage/docker/Dockerfile.linux.amd64 rename to extensions/storage/docker/Dockerfile.linux.amd64 diff --git a/storage/docker/Dockerfile.linux.arm b/extensions/storage/docker/Dockerfile.linux.arm similarity index 100% rename from storage/docker/Dockerfile.linux.arm rename to extensions/storage/docker/Dockerfile.linux.arm diff --git a/storage/docker/Dockerfile.linux.arm64 b/extensions/storage/docker/Dockerfile.linux.arm64 similarity index 100% rename from storage/docker/Dockerfile.linux.arm64 rename to extensions/storage/docker/Dockerfile.linux.arm64 diff --git a/storage/docker/manifest.tmpl b/extensions/storage/docker/manifest.tmpl similarity index 100% rename from storage/docker/manifest.tmpl rename to extensions/storage/docker/manifest.tmpl diff --git a/storage/pkg/command/appprovider.go b/extensions/storage/pkg/command/appprovider.go similarity index 96% rename from storage/pkg/command/appprovider.go rename to extensions/storage/pkg/command/appprovider.go index 94b0cafe26..54bf2e54c2 100644 --- a/storage/pkg/command/appprovider.go +++ b/extensions/storage/pkg/command/appprovider.go @@ -9,11 +9,11 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" - "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/authbasic.go b/extensions/storage/pkg/command/authbasic.go similarity index 96% rename from storage/pkg/command/authbasic.go rename to extensions/storage/pkg/command/authbasic.go index 30b0945a96..7b6d9be99f 100644 --- a/storage/pkg/command/authbasic.go +++ b/extensions/storage/pkg/command/authbasic.go @@ -10,11 +10,11 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" - "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/authbearer.go b/extensions/storage/pkg/command/authbearer.go similarity index 95% rename from storage/pkg/command/authbearer.go rename to extensions/storage/pkg/command/authbearer.go index b98f39a4b2..be81f0a223 100644 --- a/storage/pkg/command/authbearer.go +++ b/extensions/storage/pkg/command/authbearer.go @@ -9,11 +9,11 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" - "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/authmachine.go b/extensions/storage/pkg/command/authmachine.go similarity index 95% rename from storage/pkg/command/authmachine.go rename to extensions/storage/pkg/command/authmachine.go index 8812ca6865..431b9e055f 100644 --- a/storage/pkg/command/authmachine.go +++ b/extensions/storage/pkg/command/authmachine.go @@ -9,11 +9,11 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" - "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/frontend.go b/extensions/storage/pkg/command/frontend.go similarity index 98% rename from storage/pkg/command/frontend.go rename to extensions/storage/pkg/command/frontend.go index 06be385308..a0f47142b2 100644 --- a/storage/pkg/command/frontend.go +++ b/extensions/storage/pkg/command/frontend.go @@ -12,12 +12,12 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/conversions" "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" - "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/gateway.go b/extensions/storage/pkg/command/gateway.go similarity index 98% rename from storage/pkg/command/gateway.go rename to extensions/storage/pkg/command/gateway.go index 0001637aa5..944d39d750 100644 --- a/storage/pkg/command/gateway.go +++ b/extensions/storage/pkg/command/gateway.go @@ -13,15 +13,15 @@ import ( "github.com/gofrs/uuid" "github.com/mitchellh/mapstructure" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" + "github.com/owncloud/ocis/extensions/storage/pkg/service/external" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/shared" "github.com/owncloud/ocis/ocis-pkg/sync" "github.com/owncloud/ocis/ocis-pkg/version" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" - "github.com/owncloud/ocis/storage/pkg/service/external" - "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/groups.go b/extensions/storage/pkg/command/groups.go similarity index 96% rename from storage/pkg/command/groups.go rename to extensions/storage/pkg/command/groups.go index 07a628ed82..e2e0747aa0 100644 --- a/storage/pkg/command/groups.go +++ b/extensions/storage/pkg/command/groups.go @@ -10,11 +10,11 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" - "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/health.go b/extensions/storage/pkg/command/health.go similarity index 94% rename from storage/pkg/command/health.go rename to extensions/storage/pkg/command/health.go index 7ba232a1c0..3582a7731c 100644 --- a/storage/pkg/command/health.go +++ b/extensions/storage/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/ldapcfg.go b/extensions/storage/pkg/command/ldapcfg.go similarity index 97% rename from storage/pkg/command/ldapcfg.go rename to extensions/storage/pkg/command/ldapcfg.go index 9d9e394132..054cb023a2 100644 --- a/storage/pkg/command/ldapcfg.go +++ b/extensions/storage/pkg/command/ldapcfg.go @@ -5,8 +5,8 @@ import ( "os" "time" + "github.com/owncloud/ocis/extensions/storage/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/storage/pkg/config" ) const caTimeout = 5 diff --git a/storage/pkg/command/root.go b/extensions/storage/pkg/command/root.go similarity index 95% rename from storage/pkg/command/root.go rename to extensions/storage/pkg/command/root.go index 29c5b6a384..8493f125c6 100644 --- a/storage/pkg/command/root.go +++ b/extensions/storage/pkg/command/root.go @@ -3,9 +3,9 @@ package command import ( "os" + "github.com/owncloud/ocis/extensions/storage/pkg/config" "github.com/owncloud/ocis/ocis-pkg/clihelper" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/storage/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/sharing.go b/extensions/storage/pkg/command/sharing.go similarity index 97% rename from storage/pkg/command/sharing.go rename to extensions/storage/pkg/command/sharing.go index a3c17879df..f472e362d0 100644 --- a/storage/pkg/command/sharing.go +++ b/extensions/storage/pkg/command/sharing.go @@ -7,16 +7,16 @@ import ( "path" "path/filepath" - "github.com/owncloud/ocis/storage/pkg/tracing" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" "github.com/owncloud/ocis/ocis-pkg/sync" "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/storagedrivers/metadata.go b/extensions/storage/pkg/command/storagedrivers/metadata.go similarity index 98% rename from storage/pkg/command/storagedrivers/metadata.go rename to extensions/storage/pkg/command/storagedrivers/metadata.go index 445d386c2c..5e80e8981e 100644 --- a/storage/pkg/command/storagedrivers/metadata.go +++ b/extensions/storage/pkg/command/storagedrivers/metadata.go @@ -1,7 +1,7 @@ package storagedrivers import ( - "github.com/owncloud/ocis/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/config" ) func MetadataDrivers(cfg *config.Config) map[string]interface{} { diff --git a/storage/pkg/command/storagedrivers/user.go b/extensions/storage/pkg/command/storagedrivers/user.go similarity index 99% rename from storage/pkg/command/storagedrivers/user.go rename to extensions/storage/pkg/command/storagedrivers/user.go index a15527344c..83a80c3546 100644 --- a/storage/pkg/command/storagedrivers/user.go +++ b/extensions/storage/pkg/command/storagedrivers/user.go @@ -1,7 +1,7 @@ package storagedrivers import ( - "github.com/owncloud/ocis/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/config" ) func UserDrivers(cfg *config.Config) map[string]interface{} { diff --git a/storage/pkg/command/storagemetadata.go b/extensions/storage/pkg/command/storagemetadata.go similarity index 94% rename from storage/pkg/command/storagemetadata.go rename to extensions/storage/pkg/command/storagemetadata.go index b57c466cf0..946a5e6258 100644 --- a/storage/pkg/command/storagemetadata.go +++ b/extensions/storage/pkg/command/storagemetadata.go @@ -11,13 +11,13 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/command/storagedrivers" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" + "github.com/owncloud/ocis/extensions/storage/pkg/service/external" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/version" - "github.com/owncloud/ocis/storage/pkg/command/storagedrivers" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" - "github.com/owncloud/ocis/storage/pkg/service/external" - "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/storagepubliclink.go b/extensions/storage/pkg/command/storagepubliclink.go similarity index 95% rename from storage/pkg/command/storagepubliclink.go rename to extensions/storage/pkg/command/storagepubliclink.go index a8c605b103..b2acc05748 100644 --- a/storage/pkg/command/storagepubliclink.go +++ b/extensions/storage/pkg/command/storagepubliclink.go @@ -9,11 +9,11 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" - "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/storageshares.go b/extensions/storage/pkg/command/storageshares.go similarity index 95% rename from storage/pkg/command/storageshares.go rename to extensions/storage/pkg/command/storageshares.go index bc15a30dd6..a4092bac42 100644 --- a/storage/pkg/command/storageshares.go +++ b/extensions/storage/pkg/command/storageshares.go @@ -11,10 +11,10 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" - "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/storageusers.go b/extensions/storage/pkg/command/storageusers.go similarity index 95% rename from storage/pkg/command/storageusers.go rename to extensions/storage/pkg/command/storageusers.go index 0ebd681176..05b697d815 100644 --- a/storage/pkg/command/storageusers.go +++ b/extensions/storage/pkg/command/storageusers.go @@ -9,12 +9,12 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/command/storagedrivers" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/storage/pkg/command/storagedrivers" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" - "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/command/users.go b/extensions/storage/pkg/command/users.go similarity index 97% rename from storage/pkg/command/users.go rename to extensions/storage/pkg/command/users.go index 2a8a191b04..c1662b7235 100644 --- a/storage/pkg/command/users.go +++ b/extensions/storage/pkg/command/users.go @@ -10,11 +10,11 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/storage/pkg/config" + "github.com/owncloud/ocis/extensions/storage/pkg/server/debug" + "github.com/owncloud/ocis/extensions/storage/pkg/tracing" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/storage/pkg/config" - "github.com/owncloud/ocis/storage/pkg/server/debug" - "github.com/owncloud/ocis/storage/pkg/tracing" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/storage/pkg/config/config.go b/extensions/storage/pkg/config/config.go similarity index 100% rename from storage/pkg/config/config.go rename to extensions/storage/pkg/config/config.go diff --git a/storage/pkg/config/defaults/defaultconfig.go b/extensions/storage/pkg/config/defaults/defaultconfig.go similarity index 99% rename from storage/pkg/config/defaults/defaultconfig.go rename to extensions/storage/pkg/config/defaults/defaultconfig.go index cdf9741dcf..11a9e36bbf 100644 --- a/storage/pkg/config/defaults/defaultconfig.go +++ b/extensions/storage/pkg/config/defaults/defaultconfig.go @@ -4,8 +4,8 @@ import ( "os" "path" + "github.com/owncloud/ocis/extensions/storage/pkg/config" "github.com/owncloud/ocis/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/storage/pkg/config" ) const ( diff --git a/storage/pkg/server/debug/option.go b/extensions/storage/pkg/server/debug/option.go similarity index 95% rename from storage/pkg/server/debug/option.go rename to extensions/storage/pkg/server/debug/option.go index 7da0000714..4cafd4120c 100644 --- a/storage/pkg/server/debug/option.go +++ b/extensions/storage/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" + "github.com/owncloud/ocis/extensions/storage/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/storage/pkg/config" ) // Option defines a single option function. diff --git a/storage/pkg/server/debug/server.go b/extensions/storage/pkg/server/debug/server.go similarity index 96% rename from storage/pkg/server/debug/server.go rename to extensions/storage/pkg/server/debug/server.go index 29ea57b0a7..8b27597919 100644 --- a/storage/pkg/server/debug/server.go +++ b/extensions/storage/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" + "github.com/owncloud/ocis/extensions/storage/pkg/config" "github.com/owncloud/ocis/ocis-pkg/service/debug" "github.com/owncloud/ocis/ocis-pkg/version" - "github.com/owncloud/ocis/storage/pkg/config" ) // Server initializes the debug service and server. @@ -56,4 +56,4 @@ func ready(cfg *config.Config) func(http.ResponseWriter, *http.Request) { panic(err) } } -} \ No newline at end of file +} diff --git a/storage/pkg/service/external/external.go b/extensions/storage/pkg/service/external/external.go similarity index 100% rename from storage/pkg/service/external/external.go rename to extensions/storage/pkg/service/external/external.go diff --git a/storage/pkg/service/external/external_test.go b/extensions/storage/pkg/service/external/external_test.go similarity index 100% rename from storage/pkg/service/external/external_test.go rename to extensions/storage/pkg/service/external/external_test.go diff --git a/storage/pkg/tracing/tracing.go b/extensions/storage/pkg/tracing/tracing.go similarity index 93% rename from storage/pkg/tracing/tracing.go rename to extensions/storage/pkg/tracing/tracing.go index 2670283e80..c952d5df52 100644 --- a/storage/pkg/tracing/tracing.go +++ b/extensions/storage/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( + "github.com/owncloud/ocis/extensions/storage/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/storage/pkg/config" ) // Configure for Reva serves only as informational / instructive log messages. Tracing config will be delegated directly diff --git a/storage/reflex.conf b/extensions/storage/reflex.conf similarity index 100% rename from storage/reflex.conf rename to extensions/storage/reflex.conf diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go index f754ca4e2a..913e4d81c6 100644 --- a/ocis-pkg/config/config.go +++ b/ocis-pkg/config/config.go @@ -15,7 +15,7 @@ import ( ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config" proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config" settings "github.com/owncloud/ocis/extensions/settings/pkg/config" - storage "github.com/owncloud/ocis/storage/pkg/config" + storage "github.com/owncloud/ocis/extensions/storage/pkg/config" store "github.com/owncloud/ocis/store/pkg/config" thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config" web "github.com/owncloud/ocis/web/pkg/config" diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go index 9b981037bf..be726305ae 100644 --- a/ocis-pkg/config/defaultconfig.go +++ b/ocis-pkg/config/defaultconfig.go @@ -13,7 +13,7 @@ import ( ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults" 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/storage/pkg/config/defaults" + storage "github.com/owncloud/ocis/extensions/storage/pkg/config/defaults" store "github.com/owncloud/ocis/store/pkg/config/defaults" thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config/defaults" web "github.com/owncloud/ocis/web/pkg/config/defaults" diff --git a/ocis/pkg/command/storageappprovider.go b/ocis/pkg/command/storageappprovider.go index 48744bff50..39444d4926 100644 --- a/ocis/pkg/command/storageappprovider.go +++ b/ocis/pkg/command/storageappprovider.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storageauthbasic.go b/ocis/pkg/command/storageauthbasic.go index 3523c40b7b..5059fd1e0a 100644 --- a/ocis/pkg/command/storageauthbasic.go +++ b/ocis/pkg/command/storageauthbasic.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storageauthbearer.go b/ocis/pkg/command/storageauthbearer.go index 8486373a8f..f9b1912f50 100644 --- a/ocis/pkg/command/storageauthbearer.go +++ b/ocis/pkg/command/storageauthbearer.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storageauthmachine.go b/ocis/pkg/command/storageauthmachine.go index 2f3392caf5..64bded070c 100644 --- a/ocis/pkg/command/storageauthmachine.go +++ b/ocis/pkg/command/storageauthmachine.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storagefrontend.go b/ocis/pkg/command/storagefrontend.go index 9079e268ce..0bc98cbbdb 100644 --- a/ocis/pkg/command/storagefrontend.go +++ b/ocis/pkg/command/storagefrontend.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storagegateway.go b/ocis/pkg/command/storagegateway.go index 615490fdd5..fb96d116d5 100644 --- a/ocis/pkg/command/storagegateway.go +++ b/ocis/pkg/command/storagegateway.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storagegroupprovider.go b/ocis/pkg/command/storagegroupprovider.go index ed7907f4ed..a3703ac795 100644 --- a/ocis/pkg/command/storagegroupprovider.go +++ b/ocis/pkg/command/storagegroupprovider.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storagemetadata.go b/ocis/pkg/command/storagemetadata.go index cab4a7a08f..ef3d4d205d 100644 --- a/ocis/pkg/command/storagemetadata.go +++ b/ocis/pkg/command/storagemetadata.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storagepubliclink.go b/ocis/pkg/command/storagepubliclink.go index 653d7baf6b..516bc6c72d 100644 --- a/ocis/pkg/command/storagepubliclink.go +++ b/ocis/pkg/command/storagepubliclink.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storageshares.go b/ocis/pkg/command/storageshares.go index 1ae1c2a5e5..e906cb20e0 100644 --- a/ocis/pkg/command/storageshares.go +++ b/ocis/pkg/command/storageshares.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storagesharing.go b/ocis/pkg/command/storagesharing.go index 1a2e5f7914..4a70baa80a 100644 --- a/ocis/pkg/command/storagesharing.go +++ b/ocis/pkg/command/storagesharing.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storageuserprovider.go b/ocis/pkg/command/storageuserprovider.go index 6115924525..896d057206 100644 --- a/ocis/pkg/command/storageuserprovider.go +++ b/ocis/pkg/command/storageuserprovider.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storageusers.go b/ocis/pkg/command/storageusers.go index a6b57ceffe..0c2a62c77c 100644 --- a/ocis/pkg/command/storageusers.go +++ b/ocis/pkg/command/storageusers.go @@ -1,9 +1,9 @@ package command import ( + "github.com/owncloud/ocis/extensions/storage/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/storage/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go index e52fa23e4b..c12e6e0761 100644 --- a/ocis/pkg/runtime/service/service.go +++ b/ocis/pkg/runtime/service/service.go @@ -30,10 +30,10 @@ import ( ocs "github.com/owncloud/ocis/extensions/ocs/pkg/command" 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" "github.com/owncloud/ocis/ocis-pkg/config" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - storage "github.com/owncloud/ocis/storage/pkg/command" store "github.com/owncloud/ocis/store/pkg/command" thumbnails "github.com/owncloud/ocis/thumbnails/pkg/command" web "github.com/owncloud/ocis/web/pkg/command"