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
extensions/ocs/pkg/command/health.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/extensions/ocs/pkg/config/parser"
"github.com/owncloud/ocis/extensions/ocs/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/logging"
"github.com/urfave/cli/v2"
)
extensions/ocs/pkg/command/root.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/ocs/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/ocs/pkg/command/server.go
+8 -8
View File
@@ -4,16 +4,16 @@ import (
"context"
"fmt"
"github.com/owncloud/ocis/extensions/ocs/pkg/config/parser"
"github.com/owncloud/ocis/extensions/ocs/pkg/logging"
"github.com/owncloud/ocis/extensions/ocs/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/oklog/run"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/extensions/ocs/pkg/metrics"
"github.com/owncloud/ocis/extensions/ocs/pkg/server/debug"
"github.com/owncloud/ocis/extensions/ocs/pkg/server/http"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/server/http"
"github.com/urfave/cli/v2"
)
extensions/ocs/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/ocs/pkg/config"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
"github.com/urfave/cli/v2"
)
extensions/ocs/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/ocs/pkg/config/defaults/defaultconfig.go
+1 -1
View File
@@ -3,7 +3,7 @@ package defaults
import (
"strings"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
)
func FullDefaultConfig() *config.Config {
extensions/ocs/pkg/config/parser/parse.go
+5 -5
View File
@@ -3,13 +3,13 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config/defaults"
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"
"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
)
// ParseConfig loads configuration from known paths.
extensions/ocs/pkg/logging/logging.go
+2 -2
View File
@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// LoggerFromConfig initializes a service-specific logger instance.
extensions/ocs/pkg/middleware/logtrace.go
+1 -1
View File
@@ -3,7 +3,7 @@ package middleware
import (
"net/http"
ocstracing "github.com/owncloud/ocis/extensions/ocs/pkg/tracing"
ocstracing "github.com/owncloud/ocis/v2/extensions/ocs/pkg/tracing"
"go.opentelemetry.io/otel/propagation"
)
extensions/ocs/pkg/middleware/options.go
+2 -2
View File
@@ -1,8 +1,8 @@
package middleware
import (
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/roles"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
)
// Option defines a single option function.
extensions/ocs/pkg/middleware/requireadmin.go
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"net/http"
"github.com/go-chi/render"
accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response"
"github.com/owncloud/ocis/ocis-pkg/roles"
accounts "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
)
// RequireAdmin middleware is used to require the user in context to be an admin / have account management permissions
extensions/ocs/pkg/middleware/requireselforadmin.go
+6 -6
View File
@@ -7,11 +7,11 @@ import (
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/go-chi/chi/v5"
"github.com/go-chi/render"
accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response"
settingsService "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/roles"
accounts "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response"
settingsService "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
)
// RequireSelfOrAdmin middleware is used to require the requesting user to be an admin or the requested user himself
@@ -50,7 +50,7 @@ func RequireSelfOrAdmin(opts ...Option) func(next http.Handler) http.Handler {
if len(roleIDs) == 0 {
roleIDs = append(roleIDs, settingsService.BundleUUIDRoleUser, settingsService.SelfManagementPermissionID)
// if roles are empty, assume we haven't seen the user before and assign a default user role. At least until
// proper roles are provided. See https://github.com/owncloud/ocis/issues/1825 for more context.
// proper roles are provided. See https://github.com/owncloud/ocis/v2/issues/1825 for more context.
//return user, nil
}
}
extensions/ocs/pkg/middleware/requireuser.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/go-chi/render"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response"
)
// RequireUser middleware is used to require a user in context
extensions/ocs/pkg/server/debug/option.go
+2 -2
View File
@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.
extensions/ocs/pkg/server/debug/server.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/ocs/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/ocs/pkg/server/http/option.go
+3 -3
View File
@@ -3,9 +3,9 @@ package http
import (
"context"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/extensions/ocs/pkg/metrics"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/metrics"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/urfave/cli/v2"
)
extensions/ocs/pkg/server/http/server.go
+6 -6
View File
@@ -2,12 +2,12 @@ package http
import (
chimiddleware "github.com/go-chi/chi/v5/middleware"
ocsmw "github.com/owncloud/ocis/extensions/ocs/pkg/middleware"
svc "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0"
"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"
ocsmw "github.com/owncloud/ocis/v2/extensions/ocs/pkg/middleware"
svc "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0"
"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"
"go-micro.dev/v4"
)
extensions/ocs/pkg/server/http/svc_test.go
+17 -17
View File
@@ -20,18 +20,18 @@ import (
"github.com/cs3org/reva/v2/pkg/token"
"github.com/cs3org/reva/v2/pkg/token/manager/jwt"
"github.com/golang/protobuf/ptypes/empty"
accountsCfg "github.com/owncloud/ocis/extensions/accounts/pkg/config"
accountsLogging "github.com/owncloud/ocis/extensions/accounts/pkg/logging"
accountsServiceExt "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
svc "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0"
ssvc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
ocisLog "github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
accountsCfg "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
accountsLogging "github.com/owncloud/ocis/v2/extensions/accounts/pkg/logging"
accountsServiceExt "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
svc "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0"
ssvc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0"
ocisLog "github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
"github.com/stretchr/testify/assert"
"go-micro.dev/v4/client"
)
@@ -805,7 +805,7 @@ func TestCreateUser(t *testing.T) {
},
nil,
},
// https://github.com/owncloud/ocis-ocs/issues/49
// https://github.com/owncloud/ocis/v2-ocs/issues/49
{
"User with special character in userid",
User{
@@ -1447,7 +1447,7 @@ func TestUpdateUser(t *testing.T) {
}
// This is a bug verification test for endpoint '/cloud/user'
// Link to the fixed issue: https://github.com/owncloud/ocis-ocs/issues/52
// Link to the fixed issue: https://github.com/owncloud/ocis/v2-ocs/issues/52
func TestGetSingleUser(t *testing.T) {
user := User{
Enabled: "true",
@@ -1503,7 +1503,7 @@ func TestGetSingleUser(t *testing.T) {
}
// This is a bug demonstration test for endpoint '/cloud/user'
// Link to the issue: https://github.com/owncloud/ocis/issues/53
// Link to the issue: https://github.com/owncloud/ocis/v2/issues/53
func TestGetUserSigningKey(t *testing.T) {
user := User{
Enabled: "true",
@@ -1830,7 +1830,7 @@ func TestAddUsersToGroupInvalidGroup(t *testing.T) {
cleanUp(t)
}
// Issue: https://github.com/owncloud/ocis/issues/57 - cannot remove user from group
// Issue: https://github.com/owncloud/ocis/v2/issues/57 - cannot remove user from group
func TestRemoveUserFromGroup(t *testing.T) {
user := User{
Enabled: "true",
@@ -1902,7 +1902,7 @@ func TestRemoveUserFromGroup(t *testing.T) {
}
}
// Issue: https://github.com/owncloud/ocis-ocs/issues/59 - cloud/capabilities endpoint not implemented
// Issue: https://github.com/owncloud/ocis/v2-ocs/issues/59 - cloud/capabilities endpoint not implemented
func TestCapabilities(t *testing.T) {
for _, ocsVersion := range ocsVersions {
for _, format := range formats {
extensions/ocs/pkg/service/v0/config.go
+2 -2
View File
@@ -3,8 +3,8 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response"
)
// GetConfig renders the ocs config endpoint
extensions/ocs/pkg/service/v0/groups.go
+5 -5
View File
@@ -9,14 +9,14 @@ import (
"regexp"
"strconv"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/go-chi/chi/v5"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response"
ocstracing "github.com/owncloud/ocis/extensions/ocs/pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response"
ocstracing "github.com/owncloud/ocis/v2/extensions/ocs/pkg/tracing"
merrors "go-micro.dev/v4/errors"
"go.opentelemetry.io/otel/attribute"
)
extensions/ocs/pkg/service/v0/instrument.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/extensions/ocs/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/metrics"
)
// NewInstrument returns a service that instruments metrics.
extensions/ocs/pkg/service/v0/logging.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// NewLogging returns a service that logs messages.
extensions/ocs/pkg/service/v0/option.go
+4 -4
View File
@@ -3,10 +3,10 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/roles"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
)
// Option defines a single option function.
extensions/ocs/pkg/service/v0/response/response.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"reflect"
"github.com/go-chi/render"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data"
)
// Response is the top level response structure
extensions/ocs/pkg/service/v0/response/version.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/go-chi/chi/v5"
"github.com/go-chi/render"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data"
)
type key int
extensions/ocs/pkg/service/v0/service.go
+12 -12
View File
@@ -5,24 +5,24 @@ import (
"time"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
"github.com/go-chi/render"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
ocsm "github.com/owncloud/ocis/extensions/ocs/pkg/middleware"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response"
"github.com/owncloud/ocis/extensions/proxy/pkg/user/backend"
"github.com/owncloud/ocis/ocis-pkg/account"
"github.com/owncloud/ocis/ocis-pkg/log"
opkgm "github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/roles"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
ocsm "github.com/owncloud/ocis/v2/extensions/ocs/pkg/middleware"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/ocis-pkg/account"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
opkgm "github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
)
// Service defines the extension handlers.
extensions/ocs/pkg/service/v0/tracing.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
)
// NewTracing returns a service that instruments traces.
extensions/ocs/pkg/service/v0/users.go
+7 -7
View File
@@ -10,11 +10,11 @@ import (
"strconv"
"strings"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
storemsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/store/v0"
storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0"
storemsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0"
storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0"
revauser "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
@@ -27,9 +27,9 @@ import (
"github.com/go-chi/chi/v5"
"github.com/go-micro/plugins/v4/client/grpc"
"github.com/google/uuid"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response"
ocstracing "github.com/owncloud/ocis/extensions/ocs/pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response"
ocstracing "github.com/owncloud/ocis/v2/extensions/ocs/pkg/tracing"
"github.com/pkg/errors"
merrors "go-micro.dev/v4/errors"
"google.golang.org/genproto/protobuf/field_mask"
extensions/ocs/pkg/tracing/tracing.go
+2 -2
View File
@@ -1,8 +1,8 @@
package tracing
import (
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"go.opentelemetry.io/otel/trace"
)