Merge pull request #5 from opencloud-eu/naming-is-hard

Naming packages is hard
This commit is contained in:
Jörn Friedrich Dreyer
2025-01-13 14:12:29 +01:00
committed by GitHub
995 changed files with 3044 additions and 3044 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ func RenderTemplates() {
log.Fatal(err) log.Fatal(err)
} }
replacer := strings.NewReplacer( replacer := strings.NewReplacer(
"../../", "github.com/owncloud/ocis/v2/", "../../", "github.com/opencloud-eu/opencloud/",
"/defaultconfig.go", "", "/defaultconfig.go", "",
) )
for i := range paths { for i := range paths {
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"text/template" "text/template"
"time" "time"
"github.com/owncloud/ocis/v2/ocis-pkg/markdown" "github.com/opencloud-eu/opencloud/ocis-pkg/markdown"
) )
var _configMarkdown = `{{< include file="services/_includes/%s-config-example.yaml" language="yaml" >}} var _configMarkdown = `{{< include file="services/_includes/%s-config-example.yaml" language="yaml" >}}
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/owncloud/ocis/v2 module github.com/opencloud-eu/opencloud
go 1.22.7 go 1.22.7
+1 -1
View File
@@ -1,7 +1,7 @@
package account package account
import ( import (
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
) )
// Option defines a single option function. // Option defines a single option function.
+1 -1
View File
@@ -4,7 +4,7 @@ package test
import ( import (
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"
"github.com/owncloud/ocis/v2/ocis-pkg/ast" "github.com/opencloud-eu/opencloud/ocis-pkg/ast"
) )
// DiffAst returns a human-readable report of the differences between two values // DiffAst returns a human-readable report of the differences between two values
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/opencloud-eu/opencloud/ocis-pkg/handlers"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"
) )
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/opencloud-eu/opencloud/ocis-pkg/handlers"
) )
// NewHTTPCheck checks the reachability of a http server. // NewHTTPCheck checks the reachability of a http server.
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"net" "net"
"time" "time"
"github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/opencloud-eu/opencloud/ocis-pkg/handlers"
) )
// NewTCPCheck returns a check that connects to a given tcp endpoint. // NewTCPCheck returns a check that connects to a given tcp endpoint.
+1 -1
View File
@@ -1,7 +1,7 @@
package clihelper package clihelper
import ( import (
"github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/opencloud-eu/opencloud/ocis-pkg/version"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
+43 -43
View File
@@ -1,49 +1,49 @@
package config package config
import ( import (
"github.com/owncloud/ocis/v2/ocis-pkg/shared" "github.com/opencloud-eu/opencloud/ocis-pkg/shared"
activitylog "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config"
antivirus "github.com/owncloud/ocis/v2/services/antivirus/pkg/config" antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config"
appProvider "github.com/owncloud/ocis/v2/services/app-provider/pkg/config" appProvider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config"
appRegistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/config" appRegistry "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config"
audit "github.com/owncloud/ocis/v2/services/audit/pkg/config" audit "github.com/opencloud-eu/opencloud/services/audit/pkg/config"
authapp "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" authapp "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config"
authbasic "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config" authbasic "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config"
authbearer "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config" authbearer "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config"
authmachine "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config" authmachine "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config"
authservice "github.com/owncloud/ocis/v2/services/auth-service/pkg/config" authservice "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config"
clientlog "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" clientlog "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config"
collaboration "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" collaboration "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config"
eventhistory "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" eventhistory "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config"
frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/config" frontend "github.com/opencloud-eu/opencloud/services/frontend/pkg/config"
gateway "github.com/owncloud/ocis/v2/services/gateway/pkg/config" gateway "github.com/opencloud-eu/opencloud/services/gateway/pkg/config"
graph "github.com/owncloud/ocis/v2/services/graph/pkg/config" graph "github.com/opencloud-eu/opencloud/services/graph/pkg/config"
groups "github.com/owncloud/ocis/v2/services/groups/pkg/config" groups "github.com/opencloud-eu/opencloud/services/groups/pkg/config"
idm "github.com/owncloud/ocis/v2/services/idm/pkg/config" idm "github.com/opencloud-eu/opencloud/services/idm/pkg/config"
idp "github.com/owncloud/ocis/v2/services/idp/pkg/config" idp "github.com/opencloud-eu/opencloud/services/idp/pkg/config"
invitations "github.com/owncloud/ocis/v2/services/invitations/pkg/config" invitations "github.com/opencloud-eu/opencloud/services/invitations/pkg/config"
nats "github.com/owncloud/ocis/v2/services/nats/pkg/config" nats "github.com/opencloud-eu/opencloud/services/nats/pkg/config"
notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/config" notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/config"
ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/config" ocdav "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config"
ocm "github.com/owncloud/ocis/v2/services/ocm/pkg/config" ocm "github.com/opencloud-eu/opencloud/services/ocm/pkg/config"
ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/config" ocs "github.com/opencloud-eu/opencloud/services/ocs/pkg/config"
policies "github.com/owncloud/ocis/v2/services/policies/pkg/config" policies "github.com/opencloud-eu/opencloud/services/policies/pkg/config"
postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" postprocessing "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config"
proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/config" proxy "github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
search "github.com/owncloud/ocis/v2/services/search/pkg/config" search "github.com/opencloud-eu/opencloud/services/search/pkg/config"
settings "github.com/owncloud/ocis/v2/services/settings/pkg/config" settings "github.com/opencloud-eu/opencloud/services/settings/pkg/config"
sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/config" sharing "github.com/opencloud-eu/opencloud/services/sharing/pkg/config"
sse "github.com/owncloud/ocis/v2/services/sse/pkg/config" sse "github.com/opencloud-eu/opencloud/services/sse/pkg/config"
storagepublic "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/config" storagepublic "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config"
storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/config" storageshares "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config"
storagesystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/config" storagesystem "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config"
storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/config" storageusers "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config"
thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config" thumbnails "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/config" userlog "github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
users "github.com/owncloud/ocis/v2/services/users/pkg/config" users "github.com/opencloud-eu/opencloud/services/users/pkg/config"
web "github.com/owncloud/ocis/v2/services/web/pkg/config" web "github.com/opencloud-eu/opencloud/services/web/pkg/config"
webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/config" webdav "github.com/opencloud-eu/opencloud/services/webdav/pkg/config"
webfinger "github.com/owncloud/ocis/v2/services/webfinger/pkg/config" webfinger "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config"
) )
type Mode int type Mode int
+1 -1
View File
@@ -3,7 +3,7 @@ package config_test
import ( import (
. "github.com/onsi/ginkgo/v2" . "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )
+43 -43
View File
@@ -1,49 +1,49 @@
package config package config
import ( import (
"github.com/owncloud/ocis/v2/ocis-pkg/shared" "github.com/opencloud-eu/opencloud/ocis-pkg/shared"
activitylog "github.com/owncloud/ocis/v2/services/activitylog/pkg/config/defaults" activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults"
antivirus "github.com/owncloud/ocis/v2/services/antivirus/pkg/config/defaults" antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/defaults"
appProvider "github.com/owncloud/ocis/v2/services/app-provider/pkg/config/defaults" appProvider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/defaults"
appRegistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/config/defaults" appRegistry "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config/defaults"
audit "github.com/owncloud/ocis/v2/services/audit/pkg/config/defaults" audit "github.com/opencloud-eu/opencloud/services/audit/pkg/config/defaults"
authapp "github.com/owncloud/ocis/v2/services/auth-app/pkg/config/defaults" authapp "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/defaults"
authbasic "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config/defaults" authbasic "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config/defaults"
authbearer "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config/defaults" authbearer "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config/defaults"
authmachine "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config/defaults" authmachine "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config/defaults"
authservice "github.com/owncloud/ocis/v2/services/auth-service/pkg/config/defaults" authservice "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config/defaults"
clientlog "github.com/owncloud/ocis/v2/services/clientlog/pkg/config/defaults" clientlog "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/defaults"
collaboration "github.com/owncloud/ocis/v2/services/collaboration/pkg/config/defaults" collaboration "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config/defaults"
eventhistory "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config/defaults" eventhistory "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config/defaults"
frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/config/defaults" frontend "github.com/opencloud-eu/opencloud/services/frontend/pkg/config/defaults"
gateway "github.com/owncloud/ocis/v2/services/gateway/pkg/config/defaults" gateway "github.com/opencloud-eu/opencloud/services/gateway/pkg/config/defaults"
graph "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" graph "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
groups "github.com/owncloud/ocis/v2/services/groups/pkg/config/defaults" groups "github.com/opencloud-eu/opencloud/services/groups/pkg/config/defaults"
idm "github.com/owncloud/ocis/v2/services/idm/pkg/config/defaults" idm "github.com/opencloud-eu/opencloud/services/idm/pkg/config/defaults"
idp "github.com/owncloud/ocis/v2/services/idp/pkg/config/defaults" idp "github.com/opencloud-eu/opencloud/services/idp/pkg/config/defaults"
invitations "github.com/owncloud/ocis/v2/services/invitations/pkg/config/defaults" invitations "github.com/opencloud-eu/opencloud/services/invitations/pkg/config/defaults"
nats "github.com/owncloud/ocis/v2/services/nats/pkg/config/defaults" nats "github.com/opencloud-eu/opencloud/services/nats/pkg/config/defaults"
notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/config/defaults" notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/config/defaults"
ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/config/defaults" ocdav "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/defaults"
ocm "github.com/owncloud/ocis/v2/services/ocm/pkg/config/defaults" ocm "github.com/opencloud-eu/opencloud/services/ocm/pkg/config/defaults"
ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/config/defaults" ocs "github.com/opencloud-eu/opencloud/services/ocs/pkg/config/defaults"
policies "github.com/owncloud/ocis/v2/services/policies/pkg/config/defaults" policies "github.com/opencloud-eu/opencloud/services/policies/pkg/config/defaults"
postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config/defaults" postprocessing "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config/defaults"
proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults" proxy "github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults"
search "github.com/owncloud/ocis/v2/services/search/pkg/config/defaults" search "github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults"
settings "github.com/owncloud/ocis/v2/services/settings/pkg/config/defaults" settings "github.com/opencloud-eu/opencloud/services/settings/pkg/config/defaults"
sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/config/defaults" sharing "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/defaults"
sse "github.com/owncloud/ocis/v2/services/sse/pkg/config/defaults" sse "github.com/opencloud-eu/opencloud/services/sse/pkg/config/defaults"
storagepublic "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/config/defaults" storagepublic "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config/defaults"
storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/config/defaults" storageshares "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config/defaults"
storageSystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/config/defaults" storageSystem "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config/defaults"
storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/config/defaults" storageusers "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config/defaults"
thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config/defaults" thumbnails "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/defaults"
userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/config/defaults" userlog "github.com/opencloud-eu/opencloud/services/userlog/pkg/config/defaults"
users "github.com/owncloud/ocis/v2/services/users/pkg/config/defaults" users "github.com/opencloud-eu/opencloud/services/users/pkg/config/defaults"
web "github.com/owncloud/ocis/v2/services/web/pkg/config/defaults" web "github.com/opencloud-eu/opencloud/services/web/pkg/config/defaults"
webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/config/defaults" webdav "github.com/opencloud-eu/opencloud/services/webdav/pkg/config/defaults"
webfinger "github.com/owncloud/ocis/v2/services/webfinger/pkg/config/defaults" webfinger "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config/defaults"
) )
func DefaultConfig() *Config { func DefaultConfig() *Config {
+1 -1
View File
@@ -8,7 +8,7 @@ import (
gofig "github.com/gookit/config/v2" gofig "github.com/gookit/config/v2"
gooyaml "github.com/gookit/config/v2/yaml" gooyaml "github.com/gookit/config/v2/yaml"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults"
) )
var ( var (
+4 -4
View File
@@ -3,10 +3,10 @@ package parser
import ( import (
"errors" "errors"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode"
"github.com/owncloud/ocis/v2/ocis-pkg/shared" "github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/ocis-pkg/structs" "github.com/opencloud-eu/opencloud/ocis-pkg/structs"
) )
// ParseConfig loads the ocis configuration and // ParseConfig loads the ocis configuration and
+1 -1
View File
@@ -6,7 +6,7 @@ import (
libregraph "github.com/owncloud/libre-graph-api-go" libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/v2/ocis-pkg/conversions" "github.com/opencloud-eu/opencloud/ocis-pkg/conversions"
) )
func checkIdentical[T any](t *testing.T, p T, want string) { func checkIdentical[T any](t *testing.T, p T, want string) {
+1 -1
View File
@@ -1,7 +1,7 @@
package cors package cors
import ( import (
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
) )
// Option defines a single option function. // Option defines a single option function.
+3 -3
View File
@@ -5,11 +5,11 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/owncloud/ocis/v2/ocis-pkg/crypto" "github.com/opencloud-eu/opencloud/ocis-pkg/crypto"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
. "github.com/onsi/ginkgo/v2" . "github.com/onsi/ginkgo/v2"
cfg "github.com/owncloud/ocis/v2/ocis-pkg/config" cfg "github.com/opencloud-eu/opencloud/ocis-pkg/config"
) )
var _ = Describe("Crypto", func() { var _ = Describe("Crypto", func() {
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
mtls "go-micro.dev/v4/util/tls" mtls "go-micro.dev/v4/util/tls"
) )
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
) )
func TestEnsureExistsDir(t *testing.T) { func TestEnsureExistsDir(t *testing.T) {
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
) )
+2 -2
View File
@@ -12,8 +12,8 @@ import (
"github.com/test-go/testify/require" "github.com/test-go/testify/require"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/opencloud-eu/opencloud/ocis-pkg/handlers"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
) )
func TestCheckHandlerConfiguration(t *testing.T) { func TestCheckHandlerConfiguration(t *testing.T) {
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"time" "time"
"github.com/jinzhu/now" "github.com/jinzhu/now"
"github.com/owncloud/ocis/v2/ocis-pkg/ast" "github.com/opencloud-eu/opencloud/ocis-pkg/ast"
"github.com/owncloud/ocis/v2/services/search/pkg/query" "github.com/opencloud-eu/opencloud/services/search/pkg/query"
) )
func toNode[T ast.Node](in interface{}) (T, error) { func toNode[T ast.Node](in interface{}) (T, error) {
+1 -1
View File
@@ -3,7 +3,7 @@ package kql
import ( import (
"strings" "strings"
"github.com/owncloud/ocis/v2/ocis-pkg/ast" "github.com/opencloud-eu/opencloud/ocis-pkg/ast"
) )
// connectNodes connects given nodes // connectNodes connects given nodes
+4 -4
View File
@@ -6,10 +6,10 @@ import (
"time" "time"
"github.com/jinzhu/now" "github.com/jinzhu/now"
"github.com/owncloud/ocis/v2/ocis-pkg/ast" "github.com/opencloud-eu/opencloud/ocis-pkg/ast"
"github.com/owncloud/ocis/v2/ocis-pkg/ast/test" "github.com/opencloud-eu/opencloud/ocis-pkg/ast/test"
"github.com/owncloud/ocis/v2/ocis-pkg/kql" "github.com/opencloud-eu/opencloud/ocis-pkg/kql"
"github.com/owncloud/ocis/v2/services/search/pkg/query" "github.com/opencloud-eu/opencloud/services/search/pkg/query"
tAssert "github.com/stretchr/testify/assert" tAssert "github.com/stretchr/testify/assert"
) )
+1 -1
View File
@@ -3,7 +3,7 @@ package kql
import ( import (
"strings" "strings"
"github.com/owncloud/ocis/v2/ocis-pkg/ast" "github.com/opencloud-eu/opencloud/ocis-pkg/ast"
) )
func base(text []byte, pos position) (*ast.Base, error) { func base(text []byte, pos position) (*ast.Base, error) {
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"errors" "errors"
"time" "time"
"github.com/owncloud/ocis/v2/ocis-pkg/ast" "github.com/opencloud-eu/opencloud/ocis-pkg/ast"
) )
// The operator node value definition // The operator node value definition
+3 -3
View File
@@ -3,9 +3,9 @@ package kql_test
import ( import (
"testing" "testing"
"github.com/owncloud/ocis/v2/ocis-pkg/ast" "github.com/opencloud-eu/opencloud/ocis-pkg/ast"
"github.com/owncloud/ocis/v2/ocis-pkg/kql" "github.com/opencloud-eu/opencloud/ocis-pkg/kql"
"github.com/owncloud/ocis/v2/services/search/pkg/query" "github.com/opencloud-eu/opencloud/services/search/pkg/query"
tAssert "github.com/stretchr/testify/assert" tAssert "github.com/stretchr/testify/assert"
) )
+2 -2
View File
@@ -1,8 +1,8 @@
package kql package kql
import ( import (
"github.com/owncloud/ocis/v2/ocis-pkg/ast" "github.com/opencloud-eu/opencloud/ocis-pkg/ast"
"github.com/owncloud/ocis/v2/services/search/pkg/query" "github.com/opencloud-eu/opencloud/services/search/pkg/query"
) )
func validateAst(a *ast.Ast) error { func validateAst(a *ast.Ast) error {
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"reflect" "reflect"
"github.com/leonelquinteros/gotext" "github.com/leonelquinteros/gotext"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware" "github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
micrometadata "go-micro.dev/v4/metadata" micrometadata "go-micro.dev/v4/metadata"
) )
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"os" "os"
"time" "time"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
) )
const ( const (
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"github.com/onsi/gomega" "github.com/onsi/gomega"
"github.com/owncloud/ocis/v2/internal/testenv" "github.com/opencloud-eu/opencloud/internal/testenv"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
) )
func TestDeprecation(t *testing.T) { func TestDeprecation(t *testing.T) {
+2 -2
View File
@@ -8,7 +8,7 @@ import (
revactx "github.com/cs3org/reva/v2/pkg/ctx" revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/cs3org/reva/v2/pkg/token/manager/jwt"
"github.com/owncloud/ocis/v2/ocis-pkg/account" "github.com/opencloud-eu/opencloud/ocis-pkg/account"
"go-micro.dev/v4/metadata" "go-micro.dev/v4/metadata"
) )
@@ -64,7 +64,7 @@ func ExtractAccountUUID(opts ...account.Option) func(http.Handler) http.Handler
ctx := revactx.ContextSetUser(r.Context(), u) ctx := revactx.ContextSetUser(r.Context(), u)
// Important: user.Id.OpaqueId is the AccountUUID. Set this way in the account uuid middleware in ocis-proxy. // Important: user.Id.OpaqueId is the AccountUUID. Set this way in the account uuid middleware in ocis-proxy.
// https://github.com/owncloud/ocis/v2-proxy/blob/ea254d6036592cf9469d757d1295e0c4309d1e63/pkg/middleware/account_uuid.go#L109 // https://github.com/opencloud-eu/opencloud-proxy/blob/ea254d6036592cf9469d757d1295e0c4309d1e63/pkg/middleware/account_uuid.go#L109
// TODO: implement token manager in cs3org/reva that uses generic metadata instead of access token from header. // TODO: implement token manager in cs3org/reva that uses generic metadata instead of access token from header.
ctx = metadata.Set(ctx, AccountID, u.Id.OpaqueId) ctx = metadata.Set(ctx, AccountID, u.Id.OpaqueId)
if u.Opaque != nil { if u.Opaque != nil {
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/owncloud/ocis/v2/ocis-pkg/cors" "github.com/opencloud-eu/opencloud/ocis-pkg/cors"
rscors "github.com/rs/cors" rscors "github.com/rs/cors"
) )
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"time" "time"
"github.com/go-chi/chi/v5/middleware" "github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
) )
// Logger is a middleware to log http requests. It uses debug level logging and should be used by all services save the proxy (which uses info level logging). // Logger is a middleware to log http requests. It uses debug level logging and should be used by all services save the proxy (which uses info level logging).
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"sync" "sync"
goidc "github.com/coreos/go-oidc/v3/oidc" goidc "github.com/coreos/go-oidc/v3/oidc"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc" "github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"net/http" "net/http"
gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
) )
// Option defines a single option function. // Option defines a single option function.
+2 -2
View File
@@ -20,7 +20,7 @@ func Static(root string, fs http.FileSystem, ttl int) func(http.Handler) http.Ha
), ),
) )
// TODO: investigate broken caching - https://github.com/owncloud/ocis/v2/issues/1094 // TODO: investigate broken caching - https://github.com/opencloud-eu/opencloud/issues/1094
// we don't have a last modification date of the static assets, so we use the service start date // we don't have a last modification date of the static assets, so we use the service start date
//lastModified := time.Now().UTC().Format(http.TimeFormat) //lastModified := time.Now().UTC().Format(http.TimeFormat)
//expires := time.Now().Add(time.Second * time.Duration(ttl)).UTC().Format(http.TimeFormat) //expires := time.Now().Add(time.Second * time.Duration(ttl)).UTC().Format(http.TimeFormat)
@@ -30,7 +30,7 @@ func Static(root string, fs http.FileSystem, ttl int) func(http.Handler) http.Ha
if strings.HasPrefix(r.URL.Path, path.Join(root, "api")) { if strings.HasPrefix(r.URL.Path, path.Join(root, "api")) {
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
} else { } else {
// TODO: investigate broken caching - https://github.com/owncloud/ocis/v2/issues/1094 // TODO: investigate broken caching - https://github.com/opencloud-eu/opencloud/issues/1094
//w.Header().Set("Cache-Control", fmt.Sprintf("max-age=%s, must-revalidate", strconv.Itoa(ttl))) //w.Header().Set("Cache-Control", fmt.Sprintf("max-age=%s, must-revalidate", strconv.Itoa(ttl)))
//w.Header().Set("Expires", expires) //w.Header().Set("Expires", expires)
//w.Header().Set("Last-Modified", lastModified) //w.Header().Set("Last-Modified", lastModified)
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc" "github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
) )
type splitWithEscapingTest struct { type splitWithEscapingTest struct {
+2 -2
View File
@@ -16,8 +16,8 @@ import (
"github.com/MicahParks/keyfunc/v2" "github.com/MicahParks/keyfunc/v2"
goidc "github.com/coreos/go-oidc/v3/oidc" goidc "github.com/coreos/go-oidc/v3/oidc"
"github.com/golang-jwt/jwt/v5" "github.com/golang-jwt/jwt/v5"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/MicahParks/keyfunc/v2" "github.com/MicahParks/keyfunc/v2"
"github.com/golang-jwt/jwt/v5" "github.com/golang-jwt/jwt/v5"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc" "github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
) )
type signingKey struct { type signingKey struct {
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"strings" "strings"
"github.com/golang-jwt/jwt/v5" "github.com/golang-jwt/jwt/v5"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
) )
const wellknownPath = "/.well-known/openid-configuration" const wellknownPath = "/.well-known/openid-configuration"
+1 -1
View File
@@ -10,7 +10,7 @@ import (
oauth2 "golang.org/x/oauth2" oauth2 "golang.org/x/oauth2"
oidc "github.com/owncloud/ocis/v2/ocis-pkg/oidc" oidc "github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
) )
// OIDCClient is an autogenerated mock type for the OIDCClient type // OIDCClient is an autogenerated mock type for the OIDCClient type
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"net/http" "net/http"
"github.com/MicahParks/keyfunc/v2" "github.com/MicahParks/keyfunc/v2"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
goidc "github.com/coreos/go-oidc/v3/oidc" goidc "github.com/coreos/go-oidc/v3/oidc"
) )
+1 -1
View File
@@ -7,7 +7,7 @@ import (
mRegistry "go-micro.dev/v4/registry" mRegistry "go-micro.dev/v4/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
) )
// RegisterService publishes an arbitrary endpoint to the service-registry. This allows querying nodes of // RegisterService publishes an arbitrary endpoint to the service-registry. This allows querying nodes of
+1 -1
View File
@@ -6,7 +6,7 @@ package registry
// "testing" // "testing"
// //
// "github.com/micro/go-micro/v2/registry" // "github.com/micro/go-micro/v2/registry"
// "github.com/owncloud/ocis/v2/ocis-pkg/log" // "github.com/opencloud-eu/opencloud/ocis-pkg/log"
//) //)
// //
//func TestRegisterGRPCEndpoint(t *testing.T) { //func TestRegisterGRPCEndpoint(t *testing.T) {
+1 -1
View File
@@ -9,7 +9,7 @@ import (
rRegistry "github.com/cs3org/reva/v2/pkg/registry" rRegistry "github.com/cs3org/reva/v2/pkg/registry"
memr "github.com/go-micro/plugins/v4/registry/memory" memr "github.com/go-micro/plugins/v4/registry/memory"
"github.com/owncloud/ocis/v2/ocis-pkg/natsjsregistry" "github.com/opencloud-eu/opencloud/ocis-pkg/natsjsregistry"
mRegistry "go-micro.dev/v4/registry" mRegistry "go-micro.dev/v4/registry"
"go-micro.dev/v4/registry/cache" "go-micro.dev/v4/registry/cache"
) )
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"time" "time"
"github.com/cs3org/reva/v2/pkg/store" "github.com/cs3org/reva/v2/pkg/store"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
microstore "go-micro.dev/v4/store" microstore "go-micro.dev/v4/store"
"google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/encoding/protojson"
) )
+2 -2
View File
@@ -1,8 +1,8 @@
package roles package roles
import ( import (
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"go-micro.dev/v4/store" "go-micro.dev/v4/store"
) )
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware" "github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
"go-micro.dev/v4/metadata" "go-micro.dev/v4/metadata"
) )
+1 -1
View File
@@ -6,7 +6,7 @@ import (
. "github.com/onsi/ginkgo/v2" . "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/owncloud/ocis/v2/ocis-pkg/runner" "github.com/opencloud-eu/opencloud/ocis-pkg/runner"
) )
var _ = Describe("GroupRunner", func() { var _ = Describe("GroupRunner", func() {
+1 -1
View File
@@ -7,7 +7,7 @@ import (
. "github.com/onsi/ginkgo/v2" . "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/owncloud/ocis/v2/ocis-pkg/runner" "github.com/opencloud-eu/opencloud/ocis-pkg/runner"
) )
// TimedTask will create a task with the specified duration // TimedTask will create a task with the specified duration
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context" "context"
"net/http" "net/http"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
) )
// Option defines a single option function. // Option defines a single option function.
+5 -5
View File
@@ -11,11 +11,11 @@ import (
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
"go.opentelemetry.io/contrib/zpages" "go.opentelemetry.io/contrib/zpages"
"github.com/owncloud/ocis/v2/ocis-pkg/cors" "github.com/opencloud-eu/opencloud/ocis-pkg/cors"
"github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/opencloud-eu/opencloud/ocis-pkg/handlers"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware" "github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
graphMiddleware "github.com/owncloud/ocis/v2/services/graph/pkg/middleware" graphMiddleware "github.com/opencloud-eu/opencloud/services/graph/pkg/middleware"
) )
var handleProbe = func(mux *http.ServeMux, pattern string, h http.Handler, name string, logger log.Logger) { var handleProbe = func(mux *http.ServeMux, pattern string, h http.Handler, name string, logger log.Logger) {
+2 -2
View File
@@ -8,8 +8,8 @@ import (
mgrpcc "github.com/go-micro/plugins/v4/client/grpc" mgrpcc "github.com/go-micro/plugins/v4/client/grpc"
mtracer "github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry" mtracer "github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry"
"github.com/owncloud/ocis/v2/ocis-pkg/registry" "github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/shared" "github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"go-micro.dev/v4/client" "go-micro.dev/v4/client"
"go.opentelemetry.io/otel/trace" "go.opentelemetry.io/otel/trace"
"go.opentelemetry.io/otel/trace/noop" "go.opentelemetry.io/otel/trace/noop"
+1 -1
View File
@@ -3,7 +3,7 @@ package grpc
import ( import (
"context" "context"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
"go-micro.dev/v4/server" "go-micro.dev/v4/server"
"go.opentelemetry.io/otel/trace" "go.opentelemetry.io/otel/trace"
) )
+3 -3
View File
@@ -18,9 +18,9 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/keepalive" "google.golang.org/grpc/keepalive"
ociscrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" ociscrypto "github.com/opencloud-eu/opencloud/ocis-pkg/crypto"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/registry" "github.com/opencloud-eu/opencloud/ocis-pkg/registry"
) )
// Service simply wraps the go-micro grpc service. // Service simply wraps the go-micro grpc service.
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"context" "context"
"net/http" "net/http"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/shared" "github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"go.opentelemetry.io/otel/trace" "go.opentelemetry.io/otel/trace"
) )
+3 -3
View File
@@ -5,12 +5,12 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/owncloud/ocis/v2/ocis-pkg/broker" "github.com/opencloud-eu/opencloud/ocis-pkg/broker"
"github.com/owncloud/ocis/v2/ocis-pkg/registry" "github.com/opencloud-eu/opencloud/ocis-pkg/registry"
mhttps "github.com/go-micro/plugins/v4/server/http" mhttps "github.com/go-micro/plugins/v4/server/http"
mtracer "github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry" mtracer "github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry"
ociscrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" ociscrypto "github.com/opencloud-eu/opencloud/ocis-pkg/crypto"
"go-micro.dev/v4" "go-micro.dev/v4"
"go-micro.dev/v4/server" "go-micro.dev/v4/server"
) )
+1 -1
View File
@@ -3,7 +3,7 @@ package shared
import ( import (
"fmt" "fmt"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults"
) )
func MissingMachineAuthApiKeyError(service string) error { func MissingMachineAuthApiKeyError(service string) error {
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/onsi/gomega" "github.com/onsi/gomega"
"github.com/spf13/afero" "github.com/spf13/afero"
"github.com/owncloud/ocis/v2/ocis-pkg/x/io/fsx" "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx"
) )
func TestLayeredFS(t *testing.T) { func TestLayeredFS(t *testing.T) {
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/onsi/gomega" "github.com/onsi/gomega"
"github.com/owncloud/ocis/v2/ocis-pkg/x/io/fsx" "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx"
) )
func TestBase(t *testing.T) { func TestBase(t *testing.T) {
+1 -1
View File
@@ -3,7 +3,7 @@ package filepathx_test
import ( import (
"testing" "testing"
"github.com/owncloud/ocis/v2/ocis-pkg/x/path/filepathx" "github.com/opencloud-eu/opencloud/ocis-pkg/x/path/filepathx"
) )
func TestJailJoin(t *testing.T) { func TestJailJoin(t *testing.T) {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/owncloud/ocis/v2/ocis/pkg/command" "github.com/opencloud-eu/opencloud/ocis/pkg/command"
) )
func main() { func main() {
+1 -1
View File
@@ -3,7 +3,7 @@ package backup_test
import ( import (
"testing" "testing"
"github.com/owncloud/ocis/v2/ocis/pkg/backup" "github.com/opencloud-eu/opencloud/ocis/pkg/backup"
"github.com/test-go/testify/require" "github.com/test-go/testify/require"
) )
+5 -5
View File
@@ -6,11 +6,11 @@ import (
ocisbs "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore" ocisbs "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore"
s3bs "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore" s3bs "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser" "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/backup" "github.com/opencloud-eu/opencloud/ocis/pkg/backup"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
+3 -3
View File
@@ -15,9 +15,9 @@ import (
"time" "time"
tw "github.com/olekukonko/tablewriter" tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/opencloud-eu/opencloud/ocis-pkg/version"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
"github.com/pkg/xattr" "github.com/pkg/xattr"
"github.com/rogpeppe/go-internal/lockedfile" "github.com/rogpeppe/go-internal/lockedfile"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
+2 -2
View File
@@ -22,8 +22,8 @@ import (
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree" "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree"
"github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/cs3org/reva/v2/pkg/store" "github.com/cs3org/reva/v2/pkg/store"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
+4 -4
View File
@@ -7,10 +7,10 @@ import (
"os" "os"
"strings" "strings"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults"
ocisinit "github.com/owncloud/ocis/v2/ocis/pkg/init" ocisinit "github.com/opencloud-eu/opencloud/ocis/pkg/init"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
cli "github.com/urfave/cli/v2" cli "github.com/urfave/cli/v2"
) )
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"net" "net"
"net/rpc" "net/rpc"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
+8 -8
View File
@@ -30,14 +30,14 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser" "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
oclog "github.com/owncloud/ocis/v2/ocis-pkg/log" oclog "github.com/opencloud-eu/opencloud/ocis-pkg/log"
mregistry "github.com/owncloud/ocis/v2/ocis-pkg/registry" mregistry "github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/config" sharing "github.com/opencloud-eu/opencloud/services/sharing/pkg/config"
sharingparser "github.com/owncloud/ocis/v2/services/sharing/pkg/config/parser" sharingparser "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/parser"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
+5 -5
View File
@@ -10,11 +10,11 @@ import (
"github.com/cs3org/reva/v2/pkg/storage/fs/posix/lookup" "github.com/cs3org/reva/v2/pkg/storage/fs/posix/lookup"
s3bs "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore" s3bs "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore"
"github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser" "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
"github.com/owncloud/ocis/v2/ocis/pkg/revisions" "github.com/opencloud-eu/opencloud/ocis/pkg/revisions"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
+3 -3
View File
@@ -6,9 +6,9 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper" "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
+5 -5
View File
@@ -1,11 +1,11 @@
package command package command
import ( import (
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser" "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
"github.com/owncloud/ocis/v2/ocis/pkg/runtime" "github.com/opencloud-eu/opencloud/ocis/pkg/runtime"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
+47 -47
View File
@@ -3,53 +3,53 @@ package command
import ( import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser" "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper" "github.com/opencloud-eu/opencloud/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
activitylog "github.com/owncloud/ocis/v2/services/activitylog/pkg/command" activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/command"
antivirus "github.com/owncloud/ocis/v2/services/antivirus/pkg/command" antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/command"
appprovider "github.com/owncloud/ocis/v2/services/app-provider/pkg/command" appprovider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/command"
appregistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/command" appregistry "github.com/opencloud-eu/opencloud/services/app-registry/pkg/command"
audit "github.com/owncloud/ocis/v2/services/audit/pkg/command" audit "github.com/opencloud-eu/opencloud/services/audit/pkg/command"
authapp "github.com/owncloud/ocis/v2/services/auth-app/pkg/command" authapp "github.com/opencloud-eu/opencloud/services/auth-app/pkg/command"
authbasic "github.com/owncloud/ocis/v2/services/auth-basic/pkg/command" authbasic "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/command"
authbearer "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/command" authbearer "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/command"
authmachine "github.com/owncloud/ocis/v2/services/auth-machine/pkg/command" authmachine "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/command"
authservice "github.com/owncloud/ocis/v2/services/auth-service/pkg/command" authservice "github.com/opencloud-eu/opencloud/services/auth-service/pkg/command"
clientlog "github.com/owncloud/ocis/v2/services/clientlog/pkg/command" clientlog "github.com/opencloud-eu/opencloud/services/clientlog/pkg/command"
collaboration "github.com/owncloud/ocis/v2/services/collaboration/pkg/command" collaboration "github.com/opencloud-eu/opencloud/services/collaboration/pkg/command"
eventhistory "github.com/owncloud/ocis/v2/services/eventhistory/pkg/command" eventhistory "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/command"
frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/command" frontend "github.com/opencloud-eu/opencloud/services/frontend/pkg/command"
gateway "github.com/owncloud/ocis/v2/services/gateway/pkg/command" gateway "github.com/opencloud-eu/opencloud/services/gateway/pkg/command"
graph "github.com/owncloud/ocis/v2/services/graph/pkg/command" graph "github.com/opencloud-eu/opencloud/services/graph/pkg/command"
groups "github.com/owncloud/ocis/v2/services/groups/pkg/command" groups "github.com/opencloud-eu/opencloud/services/groups/pkg/command"
idm "github.com/owncloud/ocis/v2/services/idm/pkg/command" idm "github.com/opencloud-eu/opencloud/services/idm/pkg/command"
idp "github.com/owncloud/ocis/v2/services/idp/pkg/command" idp "github.com/opencloud-eu/opencloud/services/idp/pkg/command"
invitations "github.com/owncloud/ocis/v2/services/invitations/pkg/command" invitations "github.com/opencloud-eu/opencloud/services/invitations/pkg/command"
nats "github.com/owncloud/ocis/v2/services/nats/pkg/command" nats "github.com/opencloud-eu/opencloud/services/nats/pkg/command"
notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/command" notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/command"
ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/command" ocdav "github.com/opencloud-eu/opencloud/services/ocdav/pkg/command"
ocm "github.com/owncloud/ocis/v2/services/ocm/pkg/command" ocm "github.com/opencloud-eu/opencloud/services/ocm/pkg/command"
ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/command" ocs "github.com/opencloud-eu/opencloud/services/ocs/pkg/command"
policies "github.com/owncloud/ocis/v2/services/policies/pkg/command" policies "github.com/opencloud-eu/opencloud/services/policies/pkg/command"
postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/command" postprocessing "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/command"
proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/command" proxy "github.com/opencloud-eu/opencloud/services/proxy/pkg/command"
search "github.com/owncloud/ocis/v2/services/search/pkg/command" search "github.com/opencloud-eu/opencloud/services/search/pkg/command"
settings "github.com/owncloud/ocis/v2/services/settings/pkg/command" settings "github.com/opencloud-eu/opencloud/services/settings/pkg/command"
sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/command" sharing "github.com/opencloud-eu/opencloud/services/sharing/pkg/command"
sse "github.com/owncloud/ocis/v2/services/sse/pkg/command" sse "github.com/opencloud-eu/opencloud/services/sse/pkg/command"
storagepubliclink "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/command" storagepubliclink "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/command"
storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/command" storageshares "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/command"
storagesystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/command" storagesystem "github.com/opencloud-eu/opencloud/services/storage-system/pkg/command"
storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/command" storageusers "github.com/opencloud-eu/opencloud/services/storage-users/pkg/command"
thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/command" thumbnails "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/command"
userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/command" userlog "github.com/opencloud-eu/opencloud/services/userlog/pkg/command"
users "github.com/owncloud/ocis/v2/services/users/pkg/command" users "github.com/opencloud-eu/opencloud/services/users/pkg/command"
web "github.com/owncloud/ocis/v2/services/web/pkg/command" web "github.com/opencloud-eu/opencloud/services/web/pkg/command"
webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/command" webdav "github.com/opencloud-eu/opencloud/services/webdav/pkg/command"
webfinger "github.com/owncloud/ocis/v2/services/webfinger/pkg/command" webfinger "github.com/opencloud-eu/opencloud/services/webfinger/pkg/command"
) )
var svccmds = []register.Command{ var svccmds = []register.Command{
+6 -6
View File
@@ -11,12 +11,12 @@ import (
"github.com/cs3org/reva/v2/pkg/share/manager/registry" "github.com/cs3org/reva/v2/pkg/share/manager/registry"
"github.com/cs3org/reva/v2/pkg/utils" "github.com/cs3org/reva/v2/pkg/utils"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser" "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
mregistry "github.com/owncloud/ocis/v2/ocis-pkg/registry" mregistry "github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
sharingparser "github.com/owncloud/ocis/v2/services/sharing/pkg/config/parser" sharingparser "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/parser"
) )
// SharesCommand is the entrypoint for the groups command. // SharesCommand is the entrypoint for the groups command.
+5 -5
View File
@@ -2,12 +2,12 @@ package command
import ( import (
"fmt" "fmt"
"github.com/owncloud/ocis/v2/ocis/pkg/trash" "github.com/opencloud-eu/opencloud/ocis/pkg/trash"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser" "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
mreg "go-micro.dev/v4/registry" mreg "go-micro.dev/v4/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/registry" "github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/opencloud-eu/opencloud/ocis-pkg/version"
"github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/opencloud-eu/opencloud/ocis/pkg/register"
) )
const ( const (
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"path" "path"
"github.com/gofrs/uuid" "github.com/gofrs/uuid"
"github.com/owncloud/ocis/v2/ocis-pkg/generators" "github.com/opencloud-eu/opencloud/ocis-pkg/generators"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )
+1 -1
View File
@@ -1,7 +1,7 @@
package register package register
import ( import (
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"net" "net"
"net/rpc" "net/rpc"
"github.com/owncloud/ocis/v2/ocis/pkg/runtime/config" "github.com/opencloud-eu/opencloud/ocis/pkg/runtime/config"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
+1 -1
View File
@@ -1,7 +1,7 @@
package runtime package runtime
import ( import (
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
+2 -2
View File
@@ -3,8 +3,8 @@ package runtime
import ( import (
"context" "context"
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis/pkg/runtime/service" "github.com/opencloud-eu/opencloud/ocis/pkg/runtime/service"
) )
// Runtime represents an oCIS runtime environment. // Runtime represents an oCIS runtime environment.
+1 -1
View File
@@ -1,7 +1,7 @@
package service package service
import ( import (
"github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/opencloud-eu/opencloud/ocis-pkg/config"
) )
// Log configures a structure logger. // Log configures a structure logger.
+44 -44
View File
@@ -11,7 +11,7 @@ import (
"strings" "strings"
"time" "time"
authapp "github.com/owncloud/ocis/v2/services/auth-app/pkg/command" authapp "github.com/opencloud-eu/opencloud/services/auth-app/pkg/command"
"github.com/cenkalti/backoff" "github.com/cenkalti/backoff"
"github.com/cs3org/reva/v2/pkg/events/stream" "github.com/cs3org/reva/v2/pkg/events/stream"
@@ -19,51 +19,51 @@ import (
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/mohae/deepcopy" "github.com/mohae/deepcopy"
"github.com/olekukonko/tablewriter" "github.com/olekukonko/tablewriter"
notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/command" notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/command"
"github.com/thejerf/suture/v4" "github.com/thejerf/suture/v4"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/opencloud-eu/opencloud/ocis-pkg/log"
ogrpc "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/v2/ocis-pkg/shared" "github.com/opencloud-eu/opencloud/ocis-pkg/shared"
activitylog "github.com/owncloud/ocis/v2/services/activitylog/pkg/command" activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/command"
antivirus "github.com/owncloud/ocis/v2/services/antivirus/pkg/command" antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/command"
appProvider "github.com/owncloud/ocis/v2/services/app-provider/pkg/command" appProvider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/command"
appRegistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/command" appRegistry "github.com/opencloud-eu/opencloud/services/app-registry/pkg/command"
audit "github.com/owncloud/ocis/v2/services/audit/pkg/command" audit "github.com/opencloud-eu/opencloud/services/audit/pkg/command"
authbasic "github.com/owncloud/ocis/v2/services/auth-basic/pkg/command" authbasic "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/command"
authmachine "github.com/owncloud/ocis/v2/services/auth-machine/pkg/command" authmachine "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/command"
authservice "github.com/owncloud/ocis/v2/services/auth-service/pkg/command" authservice "github.com/opencloud-eu/opencloud/services/auth-service/pkg/command"
clientlog "github.com/owncloud/ocis/v2/services/clientlog/pkg/command" clientlog "github.com/opencloud-eu/opencloud/services/clientlog/pkg/command"
eventhistory "github.com/owncloud/ocis/v2/services/eventhistory/pkg/command" eventhistory "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/command"
frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/command" frontend "github.com/opencloud-eu/opencloud/services/frontend/pkg/command"
gateway "github.com/owncloud/ocis/v2/services/gateway/pkg/command" gateway "github.com/opencloud-eu/opencloud/services/gateway/pkg/command"
graph "github.com/owncloud/ocis/v2/services/graph/pkg/command" graph "github.com/opencloud-eu/opencloud/services/graph/pkg/command"
groups "github.com/owncloud/ocis/v2/services/groups/pkg/command" groups "github.com/opencloud-eu/opencloud/services/groups/pkg/command"
idm "github.com/owncloud/ocis/v2/services/idm/pkg/command" idm "github.com/opencloud-eu/opencloud/services/idm/pkg/command"
idp "github.com/owncloud/ocis/v2/services/idp/pkg/command" idp "github.com/opencloud-eu/opencloud/services/idp/pkg/command"
invitations "github.com/owncloud/ocis/v2/services/invitations/pkg/command" invitations "github.com/opencloud-eu/opencloud/services/invitations/pkg/command"
nats "github.com/owncloud/ocis/v2/services/nats/pkg/command" nats "github.com/opencloud-eu/opencloud/services/nats/pkg/command"
ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/command" ocdav "github.com/opencloud-eu/opencloud/services/ocdav/pkg/command"
ocm "github.com/owncloud/ocis/v2/services/ocm/pkg/command" ocm "github.com/opencloud-eu/opencloud/services/ocm/pkg/command"
ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/command" ocs "github.com/opencloud-eu/opencloud/services/ocs/pkg/command"
policies "github.com/owncloud/ocis/v2/services/policies/pkg/command" policies "github.com/opencloud-eu/opencloud/services/policies/pkg/command"
postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/command" postprocessing "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/command"
proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/command" proxy "github.com/opencloud-eu/opencloud/services/proxy/pkg/command"
search "github.com/owncloud/ocis/v2/services/search/pkg/command" search "github.com/opencloud-eu/opencloud/services/search/pkg/command"
settings "github.com/owncloud/ocis/v2/services/settings/pkg/command" settings "github.com/opencloud-eu/opencloud/services/settings/pkg/command"
sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/command" sharing "github.com/opencloud-eu/opencloud/services/sharing/pkg/command"
sse "github.com/owncloud/ocis/v2/services/sse/pkg/command" sse "github.com/opencloud-eu/opencloud/services/sse/pkg/command"
storagepublic "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/command" storagepublic "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/command"
storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/command" storageshares "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/command"
storageSystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/command" storageSystem "github.com/opencloud-eu/opencloud/services/storage-system/pkg/command"
storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/command" storageusers "github.com/opencloud-eu/opencloud/services/storage-users/pkg/command"
thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/command" thumbnails "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/command"
userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/command" userlog "github.com/opencloud-eu/opencloud/services/userlog/pkg/command"
users "github.com/owncloud/ocis/v2/services/users/pkg/command" users "github.com/opencloud-eu/opencloud/services/users/pkg/command"
web "github.com/owncloud/ocis/v2/services/web/pkg/command" web "github.com/opencloud-eu/opencloud/services/web/pkg/command"
webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/command" webdav "github.com/opencloud-eu/opencloud/services/webdav/pkg/command"
webfinger "github.com/owncloud/ocis/v2/services/webfinger/pkg/command" webfinger "github.com/opencloud-eu/opencloud/services/webfinger/pkg/command"
) )
var ( var (
+1 -1
View File
@@ -3,7 +3,7 @@ package service
import ( import (
"context" "context"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/thejerf/suture/v4" "github.com/thejerf/suture/v4"
) )
@@ -8,7 +8,7 @@ package v0
import ( import (
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" reflect "reflect"
@@ -6,7 +6,7 @@ package v0
import ( import (
fmt "fmt" fmt "fmt"
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
_ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" _ "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0"
proto "google.golang.org/protobuf/proto" proto "google.golang.org/protobuf/proto"
math "math" math "math"
) )
@@ -9,7 +9,7 @@ import (
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0"
) )
// EventHistoryService is an autogenerated mock type for the EventHistoryService type // EventHistoryService is an autogenerated mock type for the EventHistoryService type
@@ -9,7 +9,7 @@ import (
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0"
) )
// PoliciesProviderService is an autogenerated mock type for the PoliciesProviderService type // PoliciesProviderService is an autogenerated mock type for the PoliciesProviderService type
@@ -8,7 +8,7 @@ package v0
import ( import (
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/policies/v0" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/policies/v0"
_ "google.golang.org/genproto/googleapis/api/annotations" _ "google.golang.org/genproto/googleapis/api/annotations"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -6,7 +6,7 @@ package v0
import ( import (
fmt "fmt" fmt "fmt"
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
_ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/policies/v0" _ "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/policies/v0"
_ "google.golang.org/genproto/googleapis/api/annotations" _ "google.golang.org/genproto/googleapis/api/annotations"
proto "google.golang.org/protobuf/proto" proto "google.golang.org/protobuf/proto"
math "math" math "math"
@@ -9,7 +9,7 @@ import (
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0"
) )
// SearchProviderService is an autogenerated mock type for the SearchProviderService type // SearchProviderService is an autogenerated mock type for the SearchProviderService type
@@ -8,7 +8,7 @@ package v0
import ( import (
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0"
_ "google.golang.org/genproto/googleapis/api/annotations" _ "google.golang.org/genproto/googleapis/api/annotations"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -6,7 +6,7 @@ package v0
import ( import (
fmt "fmt" fmt "fmt"
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
_ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" _ "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0"
_ "google.golang.org/genproto/googleapis/api/annotations" _ "google.golang.org/genproto/googleapis/api/annotations"
proto "google.golang.org/protobuf/proto" proto "google.golang.org/protobuf/proto"
_ "google.golang.org/protobuf/types/known/fieldmaskpb" _ "google.golang.org/protobuf/types/known/fieldmaskpb"
@@ -9,7 +9,7 @@ import (
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
) )
// ValueService is an autogenerated mock type for the ValueService type // ValueService is an autogenerated mock type for the ValueService type
@@ -8,7 +8,7 @@ package v0
import ( import (
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
_ "google.golang.org/genproto/googleapis/api/annotations" _ "google.golang.org/genproto/googleapis/api/annotations"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -6,7 +6,7 @@ package v0
import ( import (
fmt "fmt" fmt "fmt"
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
_ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" _ "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
_ "google.golang.org/genproto/googleapis/api/annotations" _ "google.golang.org/genproto/googleapis/api/annotations"
proto "google.golang.org/protobuf/proto" proto "google.golang.org/protobuf/proto"
emptypb "google.golang.org/protobuf/types/known/emptypb" emptypb "google.golang.org/protobuf/types/known/emptypb"
@@ -8,7 +8,7 @@ package v0
import ( import (
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/store/v0"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" reflect "reflect"
@@ -6,7 +6,7 @@ package v0
import ( import (
fmt "fmt" fmt "fmt"
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
_ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0" _ "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/store/v0"
proto "google.golang.org/protobuf/proto" proto "google.golang.org/protobuf/proto"
math "math" math "math"
) )
@@ -9,7 +9,7 @@ import (
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/thumbnails/v0"
) )
// ThumbnailService is an autogenerated mock type for the ThumbnailService type // ThumbnailService is an autogenerated mock type for the ThumbnailService type

Some files were not shown because too many files have changed in this diff Show More