sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump major version to v2

Browse Source
This commit is contained in:
Michael Barz
2022-05-04 14:49:59 +02:00
parent a3c4a9d57d
commit 189987bcbd
708 changed files with 2198 additions and 2183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ocis-pkg/account/option.go
+1 -1
View File
@@ -1,7 +1,7 @@
package account
import (
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.
ocis-pkg/assetsfs/assetsfs.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"os"
"path"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// FileSystem customized to load assets
ocis-pkg/clihelper/app.go
+1 -1
View File
@@ -1,7 +1,7 @@
package clihelper
import (
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/urfave/cli/v2"
)
ocis-pkg/config/config.go
+33 -33
View File
@@ -1,40 +1,40 @@
package config
import (
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config"
appProvider "github.com/owncloud/ocis/extensions/app-provider/pkg/config"
appRegistry "github.com/owncloud/ocis/extensions/app-registry/pkg/config"
audit "github.com/owncloud/ocis/extensions/audit/pkg/config"
authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
authmachine "github.com/owncloud/ocis/extensions/auth-machine/pkg/config"
frontend "github.com/owncloud/ocis/extensions/frontend/pkg/config"
gateway "github.com/owncloud/ocis/extensions/gateway/pkg/config"
glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config"
graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config"
graph "github.com/owncloud/ocis/extensions/graph/pkg/config"
group "github.com/owncloud/ocis/extensions/group/pkg/config"
idm "github.com/owncloud/ocis/extensions/idm/pkg/config"
idp "github.com/owncloud/ocis/extensions/idp/pkg/config"
nats "github.com/owncloud/ocis/extensions/nats/pkg/config"
notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config"
ocdav "github.com/owncloud/ocis/extensions/ocdav/pkg/config"
ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config"
proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config"
search "github.com/owncloud/ocis/extensions/search/pkg/config"
settings "github.com/owncloud/ocis/extensions/settings/pkg/config"
sharing "github.com/owncloud/ocis/extensions/sharing/pkg/config"
storagepublic "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config"
storageshares "github.com/owncloud/ocis/extensions/storage-shares/pkg/config"
storagesystem "github.com/owncloud/ocis/extensions/storage-system/pkg/config"
storageusers "github.com/owncloud/ocis/extensions/storage-users/pkg/config"
store "github.com/owncloud/ocis/extensions/store/pkg/config"
thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
user "github.com/owncloud/ocis/extensions/user/pkg/config"
web "github.com/owncloud/ocis/extensions/web/pkg/config"
webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config"
accounts "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
appProvider "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config"
appRegistry "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config"
audit "github.com/owncloud/ocis/v2/extensions/audit/pkg/config"
authbasic "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config"
authbearer "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config"
authmachine "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config"
frontend "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config"
gateway "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config"
glauth "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config"
graphExplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
graph "github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
group "github.com/owncloud/ocis/v2/extensions/group/pkg/config"
idm "github.com/owncloud/ocis/v2/extensions/idm/pkg/config"
idp "github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
nats "github.com/owncloud/ocis/v2/extensions/nats/pkg/config"
notifications "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config"
ocdav "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config"
ocs "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
proxy "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
search "github.com/owncloud/ocis/v2/extensions/search/pkg/config"
settings "github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
sharing "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config"
storagepublic "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config"
storageshares "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config"
storagesystem "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config"
storageusers "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config"
store "github.com/owncloud/ocis/v2/extensions/store/pkg/config"
thumbnails "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
user "github.com/owncloud/ocis/v2/extensions/user/pkg/config"
web "github.com/owncloud/ocis/v2/extensions/web/pkg/config"
webdav "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config"
)
const (
ocis-pkg/config/config_test.go
+1 -1
View File
@@ -3,7 +3,7 @@ package config_test
import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"gopkg.in/yaml.v2"
)
ocis-pkg/config/defaultconfig.go
+32 -32
View File
@@ -1,38 +1,38 @@
package config
import (
accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
appProvider "github.com/owncloud/ocis/extensions/app-provider/pkg/config/defaults"
appRegistry "github.com/owncloud/ocis/extensions/app-registry/pkg/config/defaults"
audit "github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/config/defaults"
authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/defaults"
authmachine "github.com/owncloud/ocis/extensions/auth-machine/pkg/config/defaults"
frontend "github.com/owncloud/ocis/extensions/frontend/pkg/config/defaults"
gateway "github.com/owncloud/ocis/extensions/gateway/pkg/config/defaults"
glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config/defaults"
graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/defaults"
graph "github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
group "github.com/owncloud/ocis/extensions/group/pkg/config/defaults"
idm "github.com/owncloud/ocis/extensions/idm/pkg/config/defaults"
idp "github.com/owncloud/ocis/extensions/idp/pkg/config/defaults"
nats "github.com/owncloud/ocis/extensions/nats/pkg/config/defaults"
notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults"
ocdav "github.com/owncloud/ocis/extensions/ocdav/pkg/config/defaults"
ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults"
proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults"
search "github.com/owncloud/ocis/extensions/search/pkg/config/defaults"
settings "github.com/owncloud/ocis/extensions/settings/pkg/config/defaults"
sharing "github.com/owncloud/ocis/extensions/sharing/pkg/config/defaults"
storagepublic "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config/defaults"
storageshares "github.com/owncloud/ocis/extensions/storage-shares/pkg/config/defaults"
storageSystem "github.com/owncloud/ocis/extensions/storage-system/pkg/config/defaults"
storageusers "github.com/owncloud/ocis/extensions/storage-users/pkg/config/defaults"
store "github.com/owncloud/ocis/extensions/store/pkg/config/defaults"
thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults"
user "github.com/owncloud/ocis/extensions/user/pkg/config/defaults"
web "github.com/owncloud/ocis/extensions/web/pkg/config/defaults"
webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config/defaults"
accounts "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config/defaults"
appProvider "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config/defaults"
appRegistry "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config/defaults"
audit "github.com/owncloud/ocis/v2/extensions/audit/pkg/config/defaults"
authbasic "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config/defaults"
authbearer "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config/defaults"
authmachine "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config/defaults"
frontend "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config/defaults"
gateway "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config/defaults"
glauth "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config/defaults"
graphExplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config/defaults"
graph "github.com/owncloud/ocis/v2/extensions/graph/pkg/config/defaults"
group "github.com/owncloud/ocis/v2/extensions/group/pkg/config/defaults"
idm "github.com/owncloud/ocis/v2/extensions/idm/pkg/config/defaults"
idp "github.com/owncloud/ocis/v2/extensions/idp/pkg/config/defaults"
nats "github.com/owncloud/ocis/v2/extensions/nats/pkg/config/defaults"
notifications "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config/defaults"
ocdav "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config/defaults"
ocs "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config/defaults"
proxy "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config/defaults"
search "github.com/owncloud/ocis/v2/extensions/search/pkg/config/defaults"
settings "github.com/owncloud/ocis/v2/extensions/settings/pkg/config/defaults"
sharing "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config/defaults"
storagepublic "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config/defaults"
storageshares "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config/defaults"
storageSystem "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config/defaults"
storageusers "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config/defaults"
store "github.com/owncloud/ocis/v2/extensions/store/pkg/config/defaults"
thumbnails "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config/defaults"
user "github.com/owncloud/ocis/v2/extensions/user/pkg/config/defaults"
web "github.com/owncloud/ocis/v2/extensions/web/pkg/config/defaults"
webdav "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config/defaults"
)
func DefaultConfig() *Config {
ocis-pkg/config/environment.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strings"
gofig "github.com/gookit/config/v2"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
)
// BindEnv takes a config `c` and a EnvBinding and binds the values from the environment to the address location in cfg.
ocis-pkg/config/environment_test.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
gofig "github.com/gookit/config/v2"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
)
var _ = Describe("Environment", func() {
ocis-pkg/config/helpers.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
gofig "github.com/gookit/config/v2"
gooyaml "github.com/gookit/config/v2/yaml"
"github.com/owncloud/ocis/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
)
var (
ocis-pkg/config/parser/parse.go
+3 -3
View File
@@ -3,9 +3,9 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
)
// ParseConfig loads the ocis configuration and
ocis-pkg/cors/option.go
+1 -1
View File
@@ -1,7 +1,7 @@
package cors
import (
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.
ocis-pkg/crypto/crypto_test.go
+3 -3
View File
@@ -5,11 +5,11 @@ import (
"os"
"path/filepath"
"github.com/owncloud/ocis/ocis-pkg/crypto"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/crypto"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
. "github.com/onsi/ginkgo/v2"
cfg "github.com/owncloud/ocis/ocis-pkg/config"
cfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
)
var _ = Describe("Crypto", func() {
ocis-pkg/crypto/gencert.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"os"
"path/filepath"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
var (
ocis-pkg/crypto/gencert_test.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"path/filepath"
"testing"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
func TestEnsureExistsDir(t *testing.T) {
ocis-pkg/indexer/config/config.go
+1 -1
View File
@@ -2,7 +2,7 @@
package config
import (
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
)
// Repo defines which storage implementation is to be used.
ocis-pkg/indexer/index/cs3/autoincrement.go
+6 -6
View File
@@ -9,9 +9,9 @@ import (
"strconv"
"strings"
"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage"
idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors"
idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors"
v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
@@ -22,10 +22,10 @@ import (
"github.com/cs3org/reva/v2/pkg/utils"
"google.golang.org/grpc/metadata"
"github.com/owncloud/ocis/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/ocis-pkg/indexer/registry"
metadatastorage "github.com/owncloud/ocis/ocis-pkg/metadata_storage"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry"
metadatastorage "github.com/owncloud/ocis/v2/ocis-pkg/metadata_storage"
)
// Autoincrement are fields for an index of type autoincrement.
ocis-pkg/indexer/index/cs3/autoincrement_test.go
+3 -3
View File
@@ -5,9 +5,9 @@ package cs3
// "os"
// "testing"
//
// "github.com/owncloud/ocis/accounts/pkg/config"
// "github.com/owncloud/ocis/ocis-pkg/indexer/option"
// . "github.com/owncloud/ocis/ocis-pkg/indexer/test"
// "github.com/owncloud/ocis/v2/accounts/pkg/config"
// "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
// . "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test"
// "github.com/stretchr/testify/assert"
//)
//
ocis-pkg/indexer/index/cs3/config.go
+1 -1
View File
@@ -1,7 +1,7 @@
package cs3
import (
acccfg "github.com/owncloud/ocis/extensions/accounts/pkg/config"
acccfg "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
)
// Config represents cs3conf. Should be deprecated in favor of config.Config.
ocis-pkg/indexer/index/cs3/non_unique.go
+6 -6
View File
@@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"
"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage"
v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
@@ -16,11 +16,11 @@ import (
"github.com/cs3org/reva/v2/pkg/token"
"github.com/cs3org/reva/v2/pkg/token/manager/jwt"
"github.com/cs3org/reva/v2/pkg/utils"
idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/ocis-pkg/indexer/registry"
metadatastorage "github.com/owncloud/ocis/ocis-pkg/metadata_storage"
idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry"
metadatastorage "github.com/owncloud/ocis/v2/ocis-pkg/metadata_storage"
"google.golang.org/grpc/metadata"
)
ocis-pkg/indexer/index/cs3/non_unique_test.go
+3 -3
View File
@@ -6,9 +6,9 @@ package cs3
// "path"
// "testing"
//
// "github.com/owncloud/ocis/accounts/pkg/config"
// "github.com/owncloud/ocis/ocis-pkg/indexer/option"
// . "github.com/owncloud/ocis/ocis-pkg/indexer/test"
// "github.com/owncloud/ocis/v2/accounts/pkg/config"
// "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
// . "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test"
// "github.com/stretchr/testify/assert"
//)
//
ocis-pkg/indexer/index/cs3/unique.go
+6 -6
View File
@@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"
"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage"
v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
@@ -16,11 +16,11 @@ import (
"github.com/cs3org/reva/v2/pkg/token"
"github.com/cs3org/reva/v2/pkg/token/manager/jwt"
"github.com/cs3org/reva/v2/pkg/utils"
idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/ocis-pkg/indexer/registry"
metadatastorage "github.com/owncloud/ocis/ocis-pkg/metadata_storage"
idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry"
metadatastorage "github.com/owncloud/ocis/v2/ocis-pkg/metadata_storage"
"google.golang.org/grpc/metadata"
)
ocis-pkg/indexer/index/cs3/unique_test.go
+3 -3
View File
@@ -6,9 +6,9 @@ package cs3
// "path"
// "testing"
//
// "github.com/owncloud/ocis/accounts/pkg/config"
// "github.com/owncloud/ocis/ocis-pkg/indexer/option"
// . "github.com/owncloud/ocis/ocis-pkg/indexer/test"
// "github.com/owncloud/ocis/v2/accounts/pkg/config"
// "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
// . "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test"
// "github.com/stretchr/testify/assert"
//)
//
ocis-pkg/indexer/index/disk/autoincrement.go
+4 -4
View File
@@ -8,11 +8,11 @@ import (
"strconv"
"strings"
idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors"
idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/ocis-pkg/indexer/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry"
)
// Autoincrement are fields for an index of type autoincrement.
ocis-pkg/indexer/index/disk/autoincrement_test.go
+3 -3
View File
@@ -6,9 +6,9 @@ import (
"path/filepath"
"testing"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
//. "github.com/owncloud/ocis/ocis-pkg/indexer/test"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
//. "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
"github.com/stretchr/testify/assert"
)
ocis-pkg/indexer/index/disk/non_unique.go
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"path/filepath"
"strings"
idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/ocis-pkg/indexer/registry"
idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry"
)
// NonUnique is able to index an document by a key which might contain non-unique values
ocis-pkg/indexer/index/disk/non_unique_test.go
+5 -5
View File
@@ -6,11 +6,11 @@ import (
"path"
"testing"
"github.com/owncloud/ocis/ocis-pkg/indexer/config"
"github.com/owncloud/ocis/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
. "github.com/owncloud/ocis/ocis-pkg/indexer/test"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/config"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
. "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test"
"github.com/stretchr/testify/assert"
)
ocis-pkg/indexer/index/disk/unique.go
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"path/filepath"
"strings"
idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/ocis-pkg/indexer/registry"
idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry"
)
// Unique ensures that only one document of the same type and key-value combination can exist in the index.
ocis-pkg/indexer/index/disk/unique_test.go
+5 -5
View File
@@ -5,11 +5,11 @@ import (
"path"
"testing"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
. "github.com/owncloud/ocis/ocis-pkg/indexer/test"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
. "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test"
"github.com/stretchr/testify/assert"
)
ocis-pkg/indexer/indexer.go
+8 -8
View File
@@ -7,17 +7,17 @@ import (
"path"
"strings"
"github.com/owncloud/ocis/ocis-pkg/sync"
"github.com/owncloud/ocis/v2/ocis-pkg/sync"
"github.com/CiscoM31/godata"
"github.com/iancoleman/strcase"
"github.com/owncloud/ocis/ocis-pkg/indexer/config"
"github.com/owncloud/ocis/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/ocis-pkg/indexer/index"
_ "github.com/owncloud/ocis/ocis-pkg/indexer/index/cs3" // to populate index
_ "github.com/owncloud/ocis/ocis-pkg/indexer/index/disk" // to populate index
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/ocis-pkg/indexer/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/config"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/index"
_ "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index/cs3" // to populate index
_ "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index/disk" // to populate index
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry"
)
// Indexer is a facade to configure and query over multiple indices.
ocis-pkg/indexer/indexer_test.go
+5 -5
View File
@@ -6,12 +6,12 @@ import (
"path"
"testing"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/ocis-pkg/indexer/config"
_ "github.com/owncloud/ocis/ocis-pkg/indexer/index/cs3"
_ "github.com/owncloud/ocis/ocis-pkg/indexer/index/disk"
. "github.com/owncloud/ocis/ocis-pkg/indexer/test"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/config"
_ "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index/cs3"
_ "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index/disk"
. "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test"
"github.com/stretchr/testify/assert"
)
ocis-pkg/indexer/map.go
+1 -1
View File
@@ -1,6 +1,6 @@
package indexer
import "github.com/owncloud/ocis/ocis-pkg/indexer/index"
import "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index"
// typeMap stores the indexer layout at runtime.
ocis-pkg/indexer/option/option.go
+1 -1
View File
@@ -1,6 +1,6 @@
package option
import "github.com/owncloud/ocis/extensions/accounts/pkg/config"
import "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
// Option defines a single option function.
type Option func(o *Options)
ocis-pkg/indexer/registry/registry.go
+2 -2
View File
@@ -1,8 +1,8 @@
package registry
import (
"github.com/owncloud/ocis/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
)
// IndexConstructor is a constructor function for creating index.Index.
ocis-pkg/ldap/ldap.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"os"
"time"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
const _caTimeout = 5
ocis-pkg/log/log.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strings"
"time"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
ocis-pkg/metadata_storage/metadata_storage.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
"github.com/cs3org/reva/v2/pkg/errtypes"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"google.golang.org/grpc/metadata"
)
ocis-pkg/middleware/account.go
+2 -2
View File
@@ -8,7 +8,7 @@ import (
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/token/manager/jwt"
"github.com/owncloud/ocis/ocis-pkg/account"
"github.com/owncloud/ocis/v2/ocis-pkg/account"
"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)
// Important: user.Id.OpaqueId is the AccountUUID. Set this way in the account uuid middleware in ocis-proxy.
// https://github.com/owncloud/ocis-proxy/blob/ea254d6036592cf9469d757d1295e0c4309d1e63/pkg/middleware/account_uuid.go#L109
// https://github.com/owncloud/ocis/v2-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.
ctx = metadata.Set(ctx, AccountID, u.Id.OpaqueId)
if u.Opaque != nil {
ocis-pkg/middleware/header.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"strings"
"time"
"github.com/owncloud/ocis/ocis-pkg/cors"
"github.com/owncloud/ocis/v2/ocis-pkg/cors"
chicors "github.com/go-chi/cors"
)
ocis-pkg/middleware/logger.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"time"
"github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/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).
ocis-pkg/middleware/openidconnect.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"time"
oidc "github.com/coreos/go-oidc/v3/oidc"
ocisoidc "github.com/owncloud/ocis/ocis-pkg/oidc"
ocisoidc "github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"golang.org/x/oauth2"
)
ocis-pkg/middleware/static.go
+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/issues/1094
// TODO: investigate broken caching - https://github.com/owncloud/ocis/v2/issues/1094
// 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)
//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")) {
next.ServeHTTP(w, r)
} else {
// TODO: investigate broken caching - https://github.com/owncloud/ocis/issues/1094
// TODO: investigate broken caching - https://github.com/owncloud/ocis/v2/issues/1094
//w.Header().Set("Cache-Control", fmt.Sprintf("max-age=%s, must-revalidate", strconv.Itoa(ttl)))
//w.Header().Set("Expires", expires)
//w.Header().Set("Last-Modified", lastModified)
ocis-pkg/oidc/option.go
+1 -1
View File
@@ -1,7 +1,7 @@
package oidc
import (
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.
ocis-pkg/roles/cache.go
+2 -2
View File
@@ -3,8 +3,8 @@ package roles
import (
"time"
"github.com/owncloud/ocis/ocis-pkg/sync"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/sync"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
// cache is a cache implementation for roles, keyed by roleIDs.
ocis-pkg/roles/cache_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"testing"
"time"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/stretchr/testify/assert"
)
ocis-pkg/roles/manager.go
+3 -3
View File
@@ -3,9 +3,9 @@ package roles
import (
"context"
"github.com/owncloud/ocis/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
)
// Manager manages a cache of roles by fetching unknown roles from the settings.RoleService.
ocis-pkg/roles/option.go
+2 -2
View File
@@ -3,8 +3,8 @@ package roles
import (
"time"
"github.com/owncloud/ocis/ocis-pkg/log"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
)
// Options are all the possible options.
ocis-pkg/roles/util.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"go-micro.dev/v4/metadata"
)
ocis-pkg/service/debug/option.go
+1 -1
View File
@@ -3,7 +3,7 @@ package debug
import (
"net/http"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.
ocis-pkg/service/debug/service.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/justinas/alice"
"github.com/owncloud/ocis/ocis-pkg/cors"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/cors"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"github.com/prometheus/client_golang/prometheus/promhttp"
"go.opencensus.io/zpages"
)
ocis-pkg/service/external/external.go
Vendored
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"context"
"time"
"github.com/owncloud/ocis/ocis-pkg/log"
oregistry "github.com/owncloud/ocis/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
oregistry "github.com/owncloud/ocis/v2/ocis-pkg/registry"
"go-micro.dev/v4/broker"
"go-micro.dev/v4/registry"
)
ocis-pkg/service/external/external_test.go
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ package external
// "testing"
//
// "github.com/micro/go-micro/v2/registry"
// "github.com/owncloud/ocis/ocis-pkg/log"
// "github.com/owncloud/ocis/v2/ocis-pkg/log"
//)
//
//func TestRegisterGRPCEndpoint(t *testing.T) {
ocis-pkg/service/grpc/option.go
+1 -1
View File
@@ -3,7 +3,7 @@ package grpc
import (
"context"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/urfave/cli/v2"
)
ocis-pkg/service/grpc/service.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
mbreaker "github.com/go-micro/plugins/v4/wrapper/breaker/gobreaker"
"github.com/go-micro/plugins/v4/wrapper/monitoring/prometheus"
"github.com/go-micro/plugins/v4/wrapper/trace/opencensus"
"github.com/owncloud/ocis/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
"go-micro.dev/v4"
"go-micro.dev/v4/client"
)
ocis-pkg/service/http/option.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"crypto/tls"
"net/http"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/urfave/cli/v2"
)
ocis-pkg/service/http/service.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"strings"
"time"
"github.com/owncloud/ocis/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
mhttps "github.com/go-micro/plugins/v4/server/http"
"go-micro.dev/v4"
ocis-pkg/shared/errors.go
+1 -1
View File
@@ -3,7 +3,7 @@ package shared
import (
"fmt"
"github.com/owncloud/ocis/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
)
func MissingMachineAuthApiKeyError(service string) error {
ocis-pkg/tracing/tracing.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"net/url"
"strings"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"go.opentelemetry.io/otel/exporters/jaeger"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/sdk/resource"