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

Merge pull request #3678 from owncloud/v2

Browse Source 
Update ocis packages and imports to V2
This commit is contained in:
Michael Barz
2022-05-04 16:36:01 +02:00
committed by GitHub
parent 35e81ced43 2eb906a3ff
commit 4b71cd40af
723 changed files with 2199 additions and 2194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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