mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-23 12:38:21 -05:00
Code Issues 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
extensions/settings/pkg/assets/option.go
+4 -4
View File
@@ -3,10 +3,10 @@ package assets
import (
"net/http"
"github.com/owncloud/ocis/extensions/settings"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/assetsfs"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/settings"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/assetsfs"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// New returns a new http filesystem to serve assets.
extensions/settings/pkg/command/health.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/config/parser"
"github.com/owncloud/ocis/extensions/settings/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/logging"
"github.com/urfave/cli/v2"
)
extensions/settings/pkg/command/root.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)
extensions/settings/pkg/command/server.go
+9 -9
View File
@@ -5,15 +5,15 @@ import (
"fmt"
"github.com/oklog/run"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/config/parser"
"github.com/owncloud/ocis/extensions/settings/pkg/logging"
"github.com/owncloud/ocis/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/extensions/settings/pkg/server/debug"
"github.com/owncloud/ocis/extensions/settings/pkg/server/grpc"
"github.com/owncloud/ocis/extensions/settings/pkg/server/http"
"github.com/owncloud/ocis/extensions/settings/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/server/grpc"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/server/http"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/urfave/cli/v2"
)
extensions/settings/pkg/command/version.go
+3 -3
View File
@@ -4,11 +4,11 @@ import (
"fmt"
"os"
"github.com/owncloud/ocis/ocis-pkg/registry"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/urfave/cli/v2"
)
extensions/settings/pkg/config/config.go
+1 -1
View File
@@ -3,7 +3,7 @@ package config
import (
"context"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
)
// Config combines all available configuration parts.
extensions/settings/pkg/config/defaults/defaultconfig.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"path"
"strings"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
)
func FullDefaultConfig() *config.Config {
extensions/settings/pkg/config/parser/parse.go
+5 -5
View File
@@ -3,12 +3,12 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
)
// ParseConfig loads configuration from known paths.
extensions/settings/pkg/logging/logging.go
+2 -2
View File
@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// LoggerFromConfig initializes a service-specific logger instance.
extensions/settings/pkg/server/debug/option.go
+2 -2
View File
@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.
extensions/settings/pkg/server/debug/server.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
)
// Server initializes the debug service and server.
extensions/settings/pkg/server/grpc/option.go
+3 -3
View File
@@ -3,9 +3,9 @@ package grpc
import (
"context"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/urfave/cli/v2"
)
extensions/settings/pkg/server/grpc/server.go
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"context"
permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1"
svc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/ocis-pkg/version"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
svc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
"go-micro.dev/v4/api"
"go-micro.dev/v4/server"
)
extensions/settings/pkg/server/http/option.go
+3 -3
View File
@@ -3,9 +3,9 @@ package http
import (
"context"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/urfave/cli/v2"
)
extensions/settings/pkg/server/http/server.go
+8 -8
View File
@@ -3,14 +3,14 @@ package http
import (
"github.com/go-chi/chi/v5"
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/extensions/settings/pkg/assets"
svc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/account"
"github.com/owncloud/ocis/ocis-pkg/cors"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
"github.com/owncloud/ocis/ocis-pkg/version"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/assets"
svc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/account"
"github.com/owncloud/ocis/v2/ocis-pkg/cors"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/service/http"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
"go-micro.dev/v4"
)
extensions/settings/pkg/service/v0/instrument.go
+1 -1
View File
@@ -1,7 +1,7 @@
package svc
import (
"github.com/owncloud/ocis/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/metrics"
)
// NewInstrument returns a service that instruments metrics.
extensions/settings/pkg/service/v0/logging.go
+1 -1
View File
@@ -1,7 +1,7 @@
package svc
import (
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// NewLogging returns a service that logs messages.
extensions/settings/pkg/service/v0/option.go
+2 -2
View File
@@ -3,8 +3,8 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.
extensions/settings/pkg/service/v0/permissions.go
+1 -1
View File
@@ -1,7 +1,7 @@
package svc
import (
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
func (g Service) hasPermission(
extensions/settings/pkg/service/v0/service.go
+9 -9
View File
@@ -8,15 +8,15 @@ import (
permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1"
rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
"github.com/cs3org/reva/v2/pkg/rgrpc/status"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/settings"
filestore "github.com/owncloud/ocis/extensions/settings/pkg/store/filesystem"
metastore "github.com/owncloud/ocis/extensions/settings/pkg/store/metadata"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/roles"
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/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/settings"
filestore "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/filesystem"
metastore "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/metadata"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
merrors "go-micro.dev/v4/errors"
"go-micro.dev/v4/metadata"
"google.golang.org/protobuf/types/known/emptypb"
extensions/settings/pkg/service/v0/service_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"testing"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"github.com/stretchr/testify/assert"
"go-micro.dev/v4/metadata"
)
extensions/settings/pkg/service/v0/settings.go
+2 -2
View File
@@ -1,8 +1,8 @@
package svc
import (
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
)
const (
extensions/settings/pkg/service/v0/validator.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
validation "github.com/go-ozzo/ozzo-validation/v4"
"github.com/go-ozzo/ozzo-validation/v4/is"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
)
var (
extensions/settings/pkg/settings/settings.go
+2 -2
View File
@@ -3,8 +3,8 @@ package settings
import (
"errors"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
var (
extensions/settings/pkg/store/defaults/defaults.go
+2 -2
View File
@@ -1,8 +1,8 @@
package defaults
import (
"github.com/owncloud/ocis/extensions/settings/pkg/config"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
const (
extensions/settings/pkg/store/filesystem/assignments.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"path/filepath"
"github.com/gofrs/uuid"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
// ListRoleAssignments loads and returns all role assignments matching the given assignment identifier.
extensions/settings/pkg/store/filesystem/assignments_test.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"path/filepath"
"testing"
olog "github.com/owncloud/ocis/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/stretchr/testify/assert"
)
extensions/settings/pkg/store/filesystem/bundles.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"sync"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/extensions/settings/pkg/store/errortypes"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/store/errortypes"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
var m = &sync.RWMutex{}
extensions/settings/pkg/store/filesystem/bundles_test.go
+2 -2
View File
@@ -3,8 +3,8 @@ package store
import (
"testing"
olog "github.com/owncloud/ocis/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/stretchr/testify/assert"
)
extensions/settings/pkg/store/filesystem/io.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"io/ioutil"
"os"
"github.com/owncloud/ocis/extensions/settings/pkg/store/errortypes"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/store/errortypes"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
)
extensions/settings/pkg/store/filesystem/permissions.go
+3 -3
View File
@@ -1,9 +1,9 @@
package store
import (
"github.com/owncloud/ocis/extensions/settings/pkg/settings"
"github.com/owncloud/ocis/extensions/settings/pkg/util"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/settings"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/util"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
// ListPermissionsByResource collects all permissions from the provided roleIDs that match the requested resource
extensions/settings/pkg/store/filesystem/store.go
+3 -3
View File
@@ -4,9 +4,9 @@ package store
import (
"os"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/settings"
olog "github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/settings"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
)
var (
extensions/settings/pkg/store/filesystem/values.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"path/filepath"
"github.com/gofrs/uuid"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
// ListValues reads all values that match the given bundleId and accountUUID.
extensions/settings/pkg/store/filesystem/values_test.go
+2 -2
View File
@@ -3,8 +3,8 @@ package store
import (
"testing"
olog "github.com/owncloud/ocis/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/stretchr/testify/assert"
)
extensions/settings/pkg/store/metadata/assignments.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"fmt"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/extensions/settings/pkg/store/defaults"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/store/defaults"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
// ListRoleAssignments loads and returns all role assignments matching the given assignment identifier.
extensions/settings/pkg/store/metadata/assignments_test.go
+4 -4
View File
@@ -6,10 +6,10 @@ import (
"testing"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/extensions/settings/pkg/config/defaults"
olog "github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/shared"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config/defaults"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/stretchr/testify/require"
)
extensions/settings/pkg/store/metadata/bundles.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"fmt"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/extensions/settings/pkg/store/defaults"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/store/defaults"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
// ListBundles returns all bundles in the dataPath folder that match the given type.
extensions/settings/pkg/store/metadata/bundles_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/gofrs/uuid"
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/require"
)
extensions/settings/pkg/store/metadata/permissions.go
+3 -3
View File
@@ -1,9 +1,9 @@
package store
import (
"github.com/owncloud/ocis/extensions/settings/pkg/settings"
"github.com/owncloud/ocis/extensions/settings/pkg/util"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/settings"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/util"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
// ListPermissionsByResource collects all permissions from the provided roleIDs that match the requested resource
extensions/settings/pkg/store/metadata/permissions_test.go
+1 -1
View File
@@ -3,7 +3,7 @@ package store
import (
"testing"
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/require"
)
extensions/settings/pkg/store/metadata/store.go
+5 -5
View File
@@ -9,11 +9,11 @@ import (
"github.com/cs3org/reva/v2/pkg/storage/utils/metadata"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/settings"
"github.com/owncloud/ocis/extensions/settings/pkg/store/defaults"
olog "github.com/owncloud/ocis/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/settings"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/store/defaults"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
var (
extensions/settings/pkg/store/metadata/store_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"strings"
"github.com/owncloud/ocis/extensions/settings/pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config/defaults"
)
const (
extensions/settings/pkg/store/metadata/values.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"fmt"
"github.com/gofrs/uuid"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
// ListValues reads all values that match the given bundleId and accountUUID.
extensions/settings/pkg/store/metadata/values_test.go
+1 -1
View File
@@ -3,7 +3,7 @@ package store
import (
"testing"
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/require"
)
extensions/settings/pkg/store/registry.go
+2 -2
View File
@@ -2,6 +2,6 @@ package store
import (
// init filesystem store
_ "github.com/owncloud/ocis/extensions/settings/pkg/store/filesystem"
_ "github.com/owncloud/ocis/extensions/settings/pkg/store/metadata"
_ "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/filesystem"
_ "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/metadata"
)
extensions/settings/pkg/tracing/tracing.go
+2 -2
View File
@@ -1,8 +1,8 @@
package tracing
import (
"github.com/owncloud/ocis/extensions/settings/pkg/config"
pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"go.opentelemetry.io/otel/trace"
)
extensions/settings/pkg/util/resource_helper.go
+1 -1
View File
@@ -1,7 +1,7 @@
package util
import (
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
)
const (
extensions/settings/pkg/util/resource_helper_test.go
+1 -1
View File
@@ -3,7 +3,7 @@ package util
import (
"testing"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"gotest.tools/v3/assert"
)