fix imports

This commit is contained in:
A.Unger
2020-09-18 13:40:05 +02:00
parent d6694bcc3e
commit 1a0ddd2190
47 changed files with 82 additions and 79 deletions

View File

@@ -3,7 +3,7 @@ package main
import (
"os"
"github.com/owncloud/ocis/ocis-revapkg/command"
"github.com/owncloud/ocis/ocis-reva/pkg/command"
)
func main() {

View File

@@ -11,9 +11,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// AuthBasic is the entrypoint for the auth-basic command.

View File

@@ -11,9 +11,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// AuthBearer is the entrypoint for the auth-bearer command.

View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
func drivers(cfg *config.Config) map[string]interface{} {

View File

@@ -13,9 +13,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// Frontend is the entrypoint for the frontend command.

View File

@@ -12,10 +12,10 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-revapkg/service/external"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/service/external"
)
// Gateway is the entrypoint for the gateway command.

View File

@@ -5,8 +5,8 @@ import (
"net/http"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
)
// Health is the entrypoint for the health command.

View File

@@ -6,9 +6,9 @@ import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/version"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/version"
"github.com/spf13/viper"
)

View File

@@ -11,9 +11,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// Sharing is the entrypoint for the sharing command.

View File

@@ -11,9 +11,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// StorageEOS is the entrypoint for the storage-eos command.

View File

@@ -11,9 +11,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// StorageEOSData is the entrypoint for the storage-oc-data command.

View File

@@ -11,9 +11,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// StorageHome is the entrypoint for the storage-home command.

View File

@@ -11,9 +11,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// StorageHomeData is the entrypoint for the storage-home-data command.

View File

@@ -11,9 +11,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// StorageOC is the entrypoint for the storage-oc command.

View File

@@ -11,9 +11,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// StorageOCData is the entrypoint for the storage-oc-data command.

View File

@@ -11,9 +11,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// StoragePublicLink is the entrypoint for the reva-storage-public-link command.

View File

@@ -11,9 +11,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// StorageRoot is the entrypoint for the storage-root command.

View File

@@ -11,9 +11,9 @@ import (
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/flagset"
"github.com/owncloud/ocis/ocis-revapkg/server/debug"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
)
// Users is the entrypoint for the sharing command.

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// AuthBasicWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// AuthBearerWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// DebugWithConfig applies common debug config cfg to the flagset

View File

@@ -4,7 +4,7 @@ import (
"os"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// DriverEOSWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// DriverLocalWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// DriverOCISWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// DriverOwnCloudWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// FrontendWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// GatewayWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// HealthWithConfig applies cfg to the health flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// LDAPWithConfig applies LDAP cfg to the flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// RootWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// SecretWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// SharingWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// StorageEOSWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// StorageEOSDataWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// StorageHomeWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// StorageHomeDataWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// StorageOCWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// StorageOCDataWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// StoragePublicLink applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// StorageRootWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// TracingWithConfig applies cfg to the root flagset

View File

@@ -2,7 +2,7 @@ package flagset
import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// UsersWithConfig applies cfg to the root flagset

View File

@@ -4,7 +4,7 @@ import (
"context"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
)
// Option defines a single option function.

View File

@@ -5,8 +5,8 @@ import (
"net/http"
"github.com/owncloud/ocis-pkg/v2/service/debug"
"github.com/owncloud/ocis/ocis-revapkg/config"
"github.com/owncloud/ocis/ocis-revapkg/version"
"github.com/owncloud/ocis/ocis-reva/pkg/config"
"github.com/owncloud/ocis/ocis-reva/pkg/version"
)
// Server initializes the debug service and server.

View File

@@ -26,6 +26,7 @@ require (
github.com/owncloud/ocis/ocis-reva v0.0.0-00010101000000-000000000000
github.com/owncloud/ocis/ocs v0.0.0-00010101000000-000000000000
github.com/owncloud/ocis/proxy v0.0.0-00010101000000-000000000000
github.com/owncloud/ocis/ocis-phoenix v0.0.0-00010101000000-000000000000
github.com/owncloud/ocis/settings v0.0.0-20200914113019-7c3cfd3f8756
github.com/owncloud/ocis/store v0.0.0-20200914113019-7c3cfd3f8756
github.com/owncloud/ocis/thumbnails v0.1.6
@@ -38,10 +39,11 @@ require (
replace (
github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.2
github.com/owncloud/ocis/accounts => ../accounts
github.com/owncloud/ocis/ocis-reva => ../ocis-reva
github.com/owncloud/ocis/glauth => ../glauth
github.com/owncloud/ocis/konnectd => ../konnectd
github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg
github.com/owncloud/ocis/ocis-reva => ../ocis-reva
github.com/owncloud/ocis/ocis-phoenix => ../ocis-phoenix
github.com/owncloud/ocis/ocs => ../ocs
github.com/owncloud/ocis/proxy => ../proxy
github.com/owncloud/ocis/settings => ../settings

View File

@@ -689,6 +689,7 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw=
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=

View File

@@ -8,7 +8,7 @@ import (
hello "github.com/owncloud/ocis-hello/pkg/config"
konnectd "github.com/owncloud/ocis/konnectd/pkg/config"
ocs "github.com/owncloud/ocis/ocs/pkg/config"
phoenix "github.com/owncloud/ocis-phoenix/pkg/config"
phoenix "github.com/owncloud/ocis/ocis-phoenix/pkg/config"
proxy "github.com/owncloud/ocis/proxy/pkg/config"
reva "github.com/owncloud/ocis/ocis-reva/pkg/config"
settings "github.com/owncloud/ocis/settings/pkg/config"