mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2025-12-31 01:10:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

upgrade to go micro v4.1.0

Browse Source
This commit is contained in:
Willy Kloucek
2021-10-12 17:29:33 +02:00
parent ce136b4940
commit 6d5a3733ff
45 changed files with 109 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/pkg/command/rebuild_index.go
View File

@@ -5,10 +5,10 @@ import (
"fmt"
"github.com/asim/go-micro/plugins/client/grpc/v3"
merrors "github.com/asim/go-micro/v3/errors"
"github.com/owncloud/ocis/accounts/pkg/config"
index "github.com/owncloud/ocis/accounts/pkg/proto/v0"
"github.com/urfave/cli/v2"
merrors "go-micro.dev/v4/errors"
)
// RebuildIndex rebuilds the entire configured index.

2
accounts/pkg/proto/v0/accounts.mock.go
View File

@@ -3,8 +3,8 @@ package proto
import (
context "context"
client "github.com/asim/go-micro/v3/client"
empty "github.com/golang/protobuf/ptypes/empty"
client "go-micro.dev/v4/client"
)
// MockAccountsService can be used to write tests

6
accounts/pkg/proto/v0/accounts.pb.micro.go
View File

@@ -16,9 +16,9 @@ import (
import (
context "context"
api "github.com/asim/go-micro/v3/api"
client "github.com/asim/go-micro/v3/client"
server "github.com/asim/go-micro/v3/server"
api "go-micro.dev/v4/api"
client "go-micro.dev/v4/client"
server "go-micro.dev/v4/server"
)
// Reference imports to suppress errors if they are not otherwise used.

4
accounts/pkg/proto/v0/accounts.pb.micro_test.go
View File

@@ -12,8 +12,6 @@ import (
mgrpcc "github.com/asim/go-micro/plugins/client/grpc/v3"
"github.com/asim/go-micro/v3/client"
merrors "github.com/asim/go-micro/v3/errors"
"github.com/golang/protobuf/ptypes/empty"
"github.com/owncloud/ocis/accounts/pkg/command"
"github.com/owncloud/ocis/accounts/pkg/config"
@@ -22,6 +20,8 @@ import (
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
"github.com/stretchr/testify/assert"
"go-micro.dev/v4/client"
merrors "go-micro.dev/v4/errors"
"google.golang.org/genproto/protobuf/field_mask"
"google.golang.org/protobuf/types/known/timestamppb"
)

2
accounts/pkg/server/http/server.go
View File

@@ -1,7 +1,6 @@
package http
import (
"github.com/asim/go-micro/v3"
"github.com/go-chi/chi/v5"
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/accounts/pkg/assets"
@@ -10,6 +9,7 @@ import (
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
"github.com/owncloud/ocis/ocis-pkg/version"
"go-micro.dev/v4"
)
// Server initializes the http service and server.

4
accounts/pkg/service/v0/accounts.go
View File

@@ -16,8 +16,6 @@ import (
"go.opentelemetry.io/otel/attribute"
merrors "github.com/asim/go-micro/v3/errors"
"github.com/asim/go-micro/v3/metadata"
"github.com/gofrs/uuid"
"github.com/golang/protobuf/ptypes/empty"
fieldmask_utils "github.com/mennanov/fieldmask-utils"
@@ -31,6 +29,8 @@ import (
settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
settings_svc "github.com/owncloud/ocis/settings/pkg/service/v0"
"github.com/rs/zerolog"
merrors "go-micro.dev/v4/errors"
"go-micro.dev/v4/metadata"
"golang.org/x/crypto/bcrypt"
"google.golang.org/genproto/protobuf/field_mask"
p "google.golang.org/protobuf/proto"

6
accounts/pkg/service/v0/accounts_permission_test.go
View File

@@ -9,9 +9,6 @@ import (
"testing"
"time"
"github.com/asim/go-micro/v3/client"
merrors "github.com/asim/go-micro/v3/errors"
"github.com/asim/go-micro/v3/metadata"
"github.com/golang/protobuf/ptypes/empty"
"github.com/owncloud/ocis/accounts/pkg/config"
"github.com/owncloud/ocis/accounts/pkg/proto/v0"
@@ -21,6 +18,9 @@ import (
settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
ssvc "github.com/owncloud/ocis/settings/pkg/service/v0"
"github.com/stretchr/testify/assert"
"go-micro.dev/v4/client"
merrors "go-micro.dev/v4/errors"
"go-micro.dev/v4/metadata"
)
const dataPath = "/var/tmp/ocis-accounts-tests"

2
accounts/pkg/service/v0/groups.go
View File

@@ -5,11 +5,11 @@ import (
"path"
"strconv"
merrors "github.com/asim/go-micro/v3/errors"
"github.com/gofrs/uuid"
"github.com/golang/protobuf/ptypes/empty"
"github.com/owncloud/ocis/accounts/pkg/proto/v0"
"github.com/owncloud/ocis/accounts/pkg/storage"
merrors "go-micro.dev/v4/errors"
p "google.golang.org/protobuf/proto"
)

5
changelog/unreleased/go-micro-v4-1-0.md Normal file
View File

@@ -0,0 +1,5 @@
Enhancement: Upgrade to go-micro v4.1.0
We've upgraded to go-micro v4.1.0
https://github.com/owncloud/ocis/pull/2616

2
glauth/pkg/server/glauth/ocis.go
View File

@@ -8,7 +8,6 @@ import (
"strconv"
"strings"
"github.com/asim/go-micro/v3/metadata"
"github.com/glauth/glauth/pkg/config"
"github.com/glauth/glauth/pkg/handler"
"github.com/glauth/glauth/pkg/stats"
@@ -17,6 +16,7 @@ import (
accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"go-micro.dev/v4/metadata"
)
type queryType string

26
go.mod
View File

@@ -5,18 +5,17 @@ go 1.17
require (
github.com/CiscoM31/godata v1.0.4
github.com/GeertJohan/yubigo v0.0.0-20190917122436-175bc097e60e
github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20210812172626-c7195aae9817
github.com/asim/go-micro/plugins/logger/zerolog/v3 v3.0.0-20210812172626-c7195aae9817
github.com/asim/go-micro/plugins/registry/etcd/v3 v3.0.0-20210812172626-c7195aae9817
github.com/asim/go-micro/plugins/registry/kubernetes/v3 v3.0.0-20210812172626-c7195aae9817
github.com/asim/go-micro/plugins/registry/mdns/v3 v3.0.0-20210812172626-c7195aae9817
github.com/asim/go-micro/plugins/registry/nats/v3 v3.0.0-20210812172626-c7195aae9817
github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20210812172626-c7195aae9817
github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210812172626-c7195aae9817
github.com/asim/go-micro/plugins/wrapper/breaker/gobreaker/v3 v3.0.0-20210812172626-c7195aae9817
github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3 v3.0.0-20210812172626-c7195aae9817
github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210812172626-c7195aae9817
github.com/asim/go-micro/v3 v3.6.1-0.20210924081004-8c39b1e1204d
github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20211012122208-f63e46a7d1e9
github.com/asim/go-micro/plugins/logger/zerolog/v3 v3.0.0-20211012122208-f63e46a7d1e9
github.com/asim/go-micro/plugins/registry/etcd/v3 v3.0.0-20211012122208-f63e46a7d1e9
github.com/asim/go-micro/plugins/registry/kubernetes/v3 v3.0.0-20211012122208-f63e46a7d1e9
github.com/asim/go-micro/plugins/registry/mdns/v3 v3.0.0-20211012122208-f63e46a7d1e9
github.com/asim/go-micro/plugins/registry/nats/v3 v3.0.0-20211012122208-f63e46a7d1e9
github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20211012122208-f63e46a7d1e9
github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20211012122208-f63e46a7d1e9
github.com/asim/go-micro/plugins/wrapper/breaker/gobreaker/v3 v3.0.0-20211012122208-f63e46a7d1e9
github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3 v3.0.0-20211012122208-f63e46a7d1e9
github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20211012122208-f63e46a7d1e9
github.com/blevesearch/bleve/v2 v2.1.0
github.com/coreos/go-oidc/v3 v3.0.0
github.com/cs3org/go-cs3apis v0.0.0-20211007101428-6d142794ec11
@@ -57,6 +56,7 @@ require (
github.com/thejerf/suture/v4 v4.0.1
github.com/urfave/cli/v2 v2.3.0
github.com/yaegashi/msgraph.go v0.1.4
go-micro.dev/v4 v4.1.0
go.opencensus.io v0.23.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0
go.opentelemetry.io/otel v1.0.1
@@ -69,7 +69,6 @@ require (
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84
google.golang.org/grpc v1.41.0
google.golang.org/grpc/examples v0.0.0-20210802225658-edb9b3bc2266 // indirect
google.golang.org/protobuf v1.27.1
gotest.tools/v3 v3.0.3
stash.kopano.io/kgol/rndm v1.1.1
@@ -87,6 +86,7 @@ require (
github.com/RoaringBitmap/roaring v0.7.3 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/asim/go-micro/v3 v3.6.1-0.20210924081004-8c39b1e1204d // indirect
github.com/aws/aws-sdk-go v1.40.46 // indirect
github.com/beevik/etree v1.1.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect

53
go.sum
View File

@@ -128,36 +128,35 @@ github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:W
github.com/asim/go-micro/plugins/broker/memory/v3 v3.0.0-20210630062103-c13bb07171bc h1:K4mquvo0DyrloQoayVZc5hfyQ8NLJCpEkYY6eB8uC5c=
github.com/asim/go-micro/plugins/broker/memory/v3 v3.0.0-20210630062103-c13bb07171bc/go.mod h1:EH0EOjRcyefTt6Db72aX3My8dowi7QvTDaQc8AYqHjw=
github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20210630062103-c13bb07171bc/go.mod h1:jXXZLUMQrZxKm4+afUcR+sH9HFuKx7SVMi6cyn+Y+OA=
github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20210812172626-c7195aae9817 h1:33CT4fCTFR2BwX+8Nhu9qTpPGxocgeFZVpI8R9kRanA=
github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20210812172626-c7195aae9817/go.mod h1:QWTqtc1jPgyOkH2CsyVyfvkut4kRbUWgvjZaw4kjpoA=
github.com/asim/go-micro/plugins/logger/zerolog/v3 v3.0.0-20210812172626-c7195aae9817 h1:eHqaQfl7sC/LkNdZHRgX7od0aMuw6HpIUpI3UzXs+Xs=
github.com/asim/go-micro/plugins/logger/zerolog/v3 v3.0.0-20210812172626-c7195aae9817/go.mod h1:ya7T2Yuv6qJHZwCb6k6hOZzRm6WbMQO+ItLxMz8zd5Q=
github.com/asim/go-micro/plugins/registry/etcd/v3 v3.0.0-20210812172626-c7195aae9817 h1:XNbCn2khMk+v8vsg4/OInTBzxvNG0Jd7r2A3qkC/T/c=
github.com/asim/go-micro/plugins/registry/etcd/v3 v3.0.0-20210812172626-c7195aae9817/go.mod h1:xenxhgwP3iAb990MTs6j50zhmkdF1+IczQn2E3TzccY=
github.com/asim/go-micro/plugins/registry/kubernetes/v3 v3.0.0-20210812172626-c7195aae9817 h1:3dY53JgFWB59A5JI9Bj+OS5dZDkIMU5meykEYx/f9Mc=
github.com/asim/go-micro/plugins/registry/kubernetes/v3 v3.0.0-20210812172626-c7195aae9817/go.mod h1:kPISqc4l6tbv9XcSvSP7Fiuo32yLSKLdsPU0e/MJGig=
github.com/asim/go-micro/plugins/registry/mdns/v3 v3.0.0-20210812172626-c7195aae9817 h1:riBkGUo8YG5L8p7yYolUS2EaWGu6tsvBclrcZQvAk/Q=
github.com/asim/go-micro/plugins/registry/mdns/v3 v3.0.0-20210812172626-c7195aae9817/go.mod h1:i1/sKiqJY/MeheoEwAKLQNl5C21i1V+Z5pCWk3Iqc2c=
github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20211012122208-f63e46a7d1e9 h1:0rlb2hLVDrX8QqMFUwC3RmbLaJGjMAowrdg4wcNnlyY=
github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20211012122208-f63e46a7d1e9/go.mod h1:ii8xtB70n5TE5GODlIuOPqb0Jqqb6JL/KPF6U4qjjtE=
github.com/asim/go-micro/plugins/logger/zerolog/v3 v3.0.0-20211012122208-f63e46a7d1e9 h1:FCIaZ2cPgRLAiBocMV4VW59UoCnnpUOJh/atTfQRoKo=
github.com/asim/go-micro/plugins/logger/zerolog/v3 v3.0.0-20211012122208-f63e46a7d1e9/go.mod h1:BlVT0y+NeKFCC39a4Tk0ekQPmGs51QFmAzKZujJrgbU=
github.com/asim/go-micro/plugins/registry/etcd/v3 v3.0.0-20211012122208-f63e46a7d1e9 h1:v7DfO7ng28RX39sZ21XlHf8r86CDVt5fYfdnn6MymrU=
github.com/asim/go-micro/plugins/registry/etcd/v3 v3.0.0-20211012122208-f63e46a7d1e9/go.mod h1:sv7OmhOfEhYl7COIqoECMMUgHiou54PqFmdW2seUlyA=
github.com/asim/go-micro/plugins/registry/kubernetes/v3 v3.0.0-20211012122208-f63e46a7d1e9 h1:0Sq9hOW5x9VOCNCuenzKccisYw0EOAK/xHPJ0Kmi1i8=
github.com/asim/go-micro/plugins/registry/kubernetes/v3 v3.0.0-20211012122208-f63e46a7d1e9/go.mod h1:hZ7FbJzElhnBom/dREeevlGTKkzRF0lP+O/czpeMOXo=
github.com/asim/go-micro/plugins/registry/mdns/v3 v3.0.0-20211012122208-f63e46a7d1e9 h1:vFRMO7ecA+9+d+atGhFuANCMw1KCP81SHKBAR6g7qR0=
github.com/asim/go-micro/plugins/registry/mdns/v3 v3.0.0-20211012122208-f63e46a7d1e9/go.mod h1:yImYTrcHuOOgcDkaiGYzLcDR8Es8Xppcl1DzD8Kzlkc=
github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210629124054-4929a7c16ecc/go.mod h1:Xo866hGAXEvmUgskfhtijoRspvL9OXvuzMg97n1b8qg=
github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc h1:tDva/ON5dAKeND5j+CSR/wr22280KdPZjOzZxUcWFL8=
github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210630062103-c13bb07171bc/go.mod h1:byk73o19+HiI5rX9PqFhY48v61lV8l+lnXRvRH5jlmE=
github.com/asim/go-micro/plugins/registry/nats/v3 v3.0.0-20210812172626-c7195aae9817 h1:qKOfCH4iIrZ+q2ibwmzdGf0qTuOJWsFNkg8rHvnPu9g=
github.com/asim/go-micro/plugins/registry/nats/v3 v3.0.0-20210812172626-c7195aae9817/go.mod h1:i14GDCN8JPJv00F1gD0fHssuVtOKj0LP1BWpPSBP/XE=
github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20210812172626-c7195aae9817 h1:BO9Rb5ZqEmDneMZMHx+WE3nez6462mrP1oLUXYbIbcA=
github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20210812172626-c7195aae9817/go.mod h1:E5Ogci6dKu3gz84cElAqwkxf6NW6xacGUK/cU3FCtXg=
github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210812172626-c7195aae9817 h1:JUCV28EBwCoCMhX6Uq638g7FALpp7Mtb5nqP2J9+w2k=
github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210812172626-c7195aae9817/go.mod h1:Q4d8FKNG51oizDCzjl84aO3pVBiA/Py3q4CEZVPaGP0=
github.com/asim/go-micro/plugins/registry/nats/v3 v3.0.0-20211012122208-f63e46a7d1e9 h1:hasnC0IkZviOhjTQr3E9zXJ2ZPvDfr8+wC5LT8ffx4g=
github.com/asim/go-micro/plugins/registry/nats/v3 v3.0.0-20211012122208-f63e46a7d1e9/go.mod h1:69LdBYNPsz1ITFC1C3PH6wcijUt5BrwJdSGY8scGbzA=
github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20211012122208-f63e46a7d1e9 h1:wL2U6p7dYmPE7/wcB1YnrGnW8X4Xw22KZ3Y9e2UP27k=
github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20211012122208-f63e46a7d1e9/go.mod h1:0Jf88ivmEEq9bu+XePGsPe0skQQndk7+p8VMm4VHTe4=
github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20211012122208-f63e46a7d1e9 h1:GiW+tuCoI59W+Uo+KgswIeKIrqfS4QKQKaJXxLyVgBg=
github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20211012122208-f63e46a7d1e9/go.mod h1:u0chGPXUE/PBqkx1E1gu1vVShu5slSrehYRSNujKLIU=
github.com/asim/go-micro/plugins/transport/grpc/v3 v3.0.0-20210630062103-c13bb07171bc h1:HNwQZ8otoAsVfJT+VPZKXpPLcPvhdeLB4eZUV9C5Y+s=
github.com/asim/go-micro/plugins/transport/grpc/v3 v3.0.0-20210630062103-c13bb07171bc/go.mod h1:he85vqmB3AW9k63zOfoauzYDE9slaL8WOL6vmq3vyUg=
github.com/asim/go-micro/plugins/wrapper/breaker/gobreaker/v3 v3.0.0-20210812172626-c7195aae9817 h1:sjvuBuOxj8vqPBw82HLaH+QhA0yqGSj+Y4u7802GUqQ=
github.com/asim/go-micro/plugins/wrapper/breaker/gobreaker/v3 v3.0.0-20210812172626-c7195aae9817/go.mod h1:NGJv3ZSfwWSegJuLlzXwHP0lwrVTcVWeq8DPCMKTJ7U=
github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3 v3.0.0-20210812172626-c7195aae9817 h1:un12pmoZEo6otiLpu07kuC2QT6R6cWrJ5MMyO8GAPSA=
github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3 v3.0.0-20210812172626-c7195aae9817/go.mod h1:6uRIlWjXd2uhK9OMhLc+Crbx9Hm4DlwImHd/yw0cf3I=
github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210812172626-c7195aae9817 h1:iJaeJKpmdZcVIa5kFE0g72C7jVopPjgpxC3ME5j/N9U=
github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210812172626-c7195aae9817/go.mod h1:Oh9DCQtnWmflPS26YuPjRjY8TGs+hGpyeBxv1kj8myk=
github.com/asim/go-micro/plugins/wrapper/breaker/gobreaker/v3 v3.0.0-20211012122208-f63e46a7d1e9 h1:KuNwSRQe7YtIDIF0rBfjd8gohjuEz18PCmVC2t8DCJI=
github.com/asim/go-micro/plugins/wrapper/breaker/gobreaker/v3 v3.0.0-20211012122208-f63e46a7d1e9/go.mod h1:gDYrZUHiB9vmTiu5cMpLKCv2fn7qsRGIQqAYJGqFkDo=
github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3 v3.0.0-20211012122208-f63e46a7d1e9 h1:CLh8mOgIv1J0+SR8Ny0bkWL/7a2olg9Pa62aGrvOLU4=
github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3 v3.0.0-20211012122208-f63e46a7d1e9/go.mod h1:Vo3SWZfj0HayR0h07xP218zoLkgkto54fujAIu8H94Y=
github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20211012122208-f63e46a7d1e9 h1:EAewDo27l8kidfQQo3yTrJ64pFy8sCOaJ6I5ZRHKFOg=
github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20211012122208-f63e46a7d1e9/go.mod h1:5mB3LtO4EUAWFz5PZaRxnC48OCSI005ySscXtRu37+M=
github.com/asim/go-micro/v3 v3.5.1/go.mod h1:OJ5DnUQmoEVQTNbKRstR7/krtYJI+QaBe/XeN5MZkqE=
github.com/asim/go-micro/v3 v3.5.2-0.20210629124054-4929a7c16ecc/go.mod h1:cNGIIYQcp0qy+taNYmrBdaIHeqMWHV5ZH/FfQzfOyE8=
github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc/go.mod h1:cNGIIYQcp0qy+taNYmrBdaIHeqMWHV5ZH/FfQzfOyE8=
github.com/asim/go-micro/v3 v3.6.1-0.20210924081004-8c39b1e1204d h1:EAmpwVkQtiT3yD286sYUs6VqZglabLq/DqfowID83F4=
github.com/asim/go-micro/v3 v3.6.1-0.20210924081004-8c39b1e1204d/go.mod h1:Vr4N4czAznfz3gPqKUznocbo5l0knZRIpzh5+0Hml7I=
github.com/aws/aws-sdk-go v1.20.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
@@ -581,6 +580,7 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7
github.com/gorilla/schema v1.1.0 h1:CamqUDOFUBqzrvxuz2vEwo8+SUdwsluFh7IlzJh30LY=
github.com/gorilla/schema v1.1.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE=
@@ -726,6 +726,7 @@ github.com/liquidweb/liquidweb-go v1.6.3/go.mod h1:SuXXp+thr28LnjEw18AYtWwIbWMHS
github.com/longsleep/go-metrics v0.0.0-20170706183227-c1943bcf9047/go.mod h1:Eq9KjddJTZCHG0ja+SEJNp739Um4URrcBuccq3Ih/NI=
github.com/longsleep/go-metrics v0.0.0-20191013204616-cddea569b0ea h1:Q5nKuCPF/m8xXz9oGchzSZJbGpJbb9Rm3SGBBHbBWiQ=
github.com/longsleep/go-metrics v0.0.0-20191013204616-cddea569b0ea/go.mod h1:w6QO1LBkVla70FZrrF6XcB0YN+jTEYugjkn3+6RYTSM=
github.com/m3o/m3o-go/client v0.0.0-20210421144725-8bfd7992ada3/go.mod h1:vmeaYrKYpgVNhny/l7iH8mXS88S7ijUiYni3gZUrCq0=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
@@ -1139,6 +1140,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/zenazn/goji v0.9.1-0.20160507202103-64eb34159fe5/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
go-micro.dev/v4 v4.1.0 h1:XXZWlKhSpkQZTvPKcXRP5JvJoqbVhV+p/UUIfdVgN7E=
go-micro.dev/v4 v4.1.0/go.mod h1:XTEJj5ILOBW+2ndGDG56r8fBXZ8hmsVaIaS1K5zwj+s=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
@@ -1642,8 +1645,8 @@ google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K
google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
google.golang.org/grpc/examples v0.0.0-20210628165121-83f9def5feb3/go.mod h1:bF8wuZSAZTcbF7ZPKrDI/qY52toTP/yxLpRRY4Eu9Js=
google.golang.org/grpc/examples v0.0.0-20210802225658-edb9b3bc2266 h1:b/FwCzmdYrUG3vM0A1hqRcvWh7ZTXaGPr485CpByznI=
google.golang.org/grpc/examples v0.0.0-20210802225658-edb9b3bc2266/go.mod h1:bF8wuZSAZTcbF7ZPKrDI/qY52toTP/yxLpRRY4Eu9Js=
google.golang.org/grpc/examples v0.0.0-20210902184326-c93e472777b9 h1:nuV5/Eu1pLmXFqSuM5yYgg1z+m3f7+HC1HO1xsmCz9I=
google.golang.org/grpc/examples v0.0.0-20210902184326-c93e472777b9/go.mod h1:gID3PKrg7pWKntu9Ss6zTLJ0ttC0X9IHgREOCZwbCVU=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

2
graph-explorer/pkg/server/http/server.go
View File

@@ -1,12 +1,12 @@
package http
import (
"github.com/asim/go-micro/v3"
chimiddleware "github.com/go-chi/chi/v5/middleware"
svc "github.com/owncloud/ocis/graph-explorer/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
"github.com/owncloud/ocis/ocis-pkg/version"
"go-micro.dev/v4"
)
// Server initializes the http service and server.

2
graph/pkg/server/http/server.go
View File

@@ -1,7 +1,6 @@
package http
import (
"github.com/asim/go-micro/v3"
chimiddleware "github.com/go-chi/chi/v5/middleware"
graphMiddleware "github.com/owncloud/ocis/graph/pkg/middleware"
svc "github.com/owncloud/ocis/graph/pkg/service/v0"
@@ -9,6 +8,7 @@ import (
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
"github.com/owncloud/ocis/ocis-pkg/version"
"go-micro.dev/v4"
)
// Server initializes the http service and server.

2
idp/pkg/server/http/server.go
View File

@@ -4,12 +4,12 @@ import (
"crypto/tls"
"os"
"github.com/asim/go-micro/v3"
chimiddleware "github.com/go-chi/chi/v5/middleware"
svc "github.com/owncloud/ocis/idp/pkg/service/v0"
pkgcrypto "github.com/owncloud/ocis/ocis-pkg/crypto"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
"go-micro.dev/v4"
)
// Server initializes the http service and server.

6
ocis-pkg/log/log.go
View File

@@ -6,11 +6,11 @@ import (
"strings"
"time"
mdlog "github.com/asim/go-micro/v3/debug/log"
mlog "github.com/asim/go-micro/v3/util/log"
"github.com/asim/go-micro/v3/util/ring"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
mdlog "go-micro.dev/v4/debug/log"
mlog "go-micro.dev/v4/util/log"
"go-micro.dev/v4/util/ring"
)
// Logger simply wraps the zerolog logger.

2
ocis-pkg/log/stream.go
View File

@@ -1,7 +1,7 @@
package log
import (
mdlog "github.com/asim/go-micro/v3/debug/log"
mdlog "go-micro.dev/v4/debug/log"
)
type logStream struct {

2
ocis-pkg/middleware/account.go
View File

@@ -7,10 +7,10 @@ import (
"github.com/cs3org/reva/pkg/auth/scope"
"github.com/asim/go-micro/v3/metadata"
revactx "github.com/cs3org/reva/pkg/ctx"
"github.com/cs3org/reva/pkg/token/manager/jwt"
"github.com/owncloud/ocis/ocis-pkg/account"
"go-micro.dev/v4/metadata"
)
// newAccountOptions initializes the available default options.

2
ocis-pkg/registry/registry.go
View File

@@ -9,7 +9,7 @@ import (
mdnsr "github.com/asim/go-micro/plugins/registry/mdns/v3"
natsr "github.com/asim/go-micro/plugins/registry/nats/v3"
"github.com/asim/go-micro/v3/registry"
"go-micro.dev/v4/registry"
)
var (

2
ocis-pkg/roles/util.go
View File

@@ -4,8 +4,8 @@ import (
"context"
"encoding/json"
"github.com/asim/go-micro/v3/metadata"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"go-micro.dev/v4/metadata"
)
// ReadRoleIDsFromContext extracts roleIDs from the metadata context and returns them as []string

4
ocis-pkg/service/grpc/service.go
View File

@@ -9,9 +9,9 @@ import (
mbreaker "github.com/asim/go-micro/plugins/wrapper/breaker/gobreaker/v3"
"github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3"
"github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3"
"github.com/asim/go-micro/v3"
"github.com/asim/go-micro/v3/client"
"github.com/owncloud/ocis/ocis-pkg/registry"
"go-micro.dev/v4"
"go-micro.dev/v4/client"
)
// DefaultClient is a custom oCIS grpc configured client.

4
ocis-pkg/service/http/service.go
View File

@@ -8,8 +8,8 @@ import (
"github.com/owncloud/ocis/ocis-pkg/registry"
mhttps "github.com/asim/go-micro/plugins/server/http/v3"
"github.com/asim/go-micro/v3"
"github.com/asim/go-micro/v3/server"
"go-micro.dev/v4"
"go-micro.dev/v4/server"
)
// Service simply wraps the go-micro web service.

2
ocis/pkg/command/version.go
View File

@@ -4,12 +4,12 @@ import (
"fmt"
"os"
mreg "github.com/asim/go-micro/v3/registry"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/registry"
"github.com/owncloud/ocis/ocis/pkg/register"
"github.com/urfave/cli/v2"
mreg "go-micro.dev/v4/registry"
)
// VersionCommand is the entrypoint for the version command.

2
ocis/pkg/runtime/service/service.go
View File

@@ -14,7 +14,6 @@ import (
"time"
mzlog "github.com/asim/go-micro/plugins/logger/zerolog/v3"
"github.com/asim/go-micro/v3/logger"
"github.com/mohae/deepcopy"
"github.com/olekukonko/tablewriter"
accounts "github.com/owncloud/ocis/accounts/pkg/command"
@@ -35,6 +34,7 @@ import (
webdav "github.com/owncloud/ocis/webdav/pkg/command"
"github.com/rs/zerolog"
"github.com/thejerf/suture/v4"
"go-micro.dev/v4/logger"
)
var (

2
ocs/pkg/server/http/server.go
View File

@@ -1,12 +1,12 @@
package http
import (
"github.com/asim/go-micro/v3"
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
ocsmw "github.com/owncloud/ocis/ocs/pkg/middleware"
svc "github.com/owncloud/ocis/ocs/pkg/service/v0"
"go-micro.dev/v4"
)
// Server initializes the http service and server.

2
ocs/pkg/server/http/svc_test.go
View File

@@ -14,7 +14,6 @@ import (
"strings"
"testing"
"github.com/asim/go-micro/v3/client"
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
"github.com/cs3org/reva/pkg/auth/scope"
@@ -32,6 +31,7 @@ import (
settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
ssvc "github.com/owncloud/ocis/settings/pkg/service/v0"
"github.com/stretchr/testify/assert"
"go-micro.dev/v4/client"
)
const (

2
ocs/pkg/service/v0/groups.go
View File

@@ -9,7 +9,6 @@ import (
"regexp"
"strconv"
merrors "github.com/asim/go-micro/v3/errors"
revactx "github.com/cs3org/reva/pkg/ctx"
"github.com/go-chi/chi/v5"
"github.com/go-chi/render"
@@ -17,6 +16,7 @@ import (
"github.com/owncloud/ocis/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/ocs/pkg/service/v0/response"
ocstracing "github.com/owncloud/ocis/ocs/pkg/tracing"
merrors "go-micro.dev/v4/errors"
"go.opentelemetry.io/otel/attribute"
)

2
ocs/pkg/service/v0/users.go
View File

@@ -10,7 +10,6 @@ import (
"strings"
"github.com/asim/go-micro/plugins/client/grpc/v3"
merrors "github.com/asim/go-micro/v3/errors"
gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
revauser "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
@@ -27,6 +26,7 @@ import (
ocstracing "github.com/owncloud/ocis/ocs/pkg/tracing"
storepb "github.com/owncloud/ocis/store/pkg/proto/v0"
"github.com/pkg/errors"
merrors "go-micro.dev/v4/errors"
"google.golang.org/genproto/protobuf/field_mask"
"google.golang.org/grpc/metadata"
"google.golang.org/protobuf/types/known/fieldmaskpb"

2
proxy/pkg/proxy/policy/selector_test.go
View File

@@ -7,12 +7,12 @@ import (
"net/http/httptest"
"testing"
"github.com/asim/go-micro/v3/client"
userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
revactx "github.com/cs3org/reva/pkg/ctx"
"github.com/owncloud/ocis/accounts/pkg/proto/v0"
"github.com/owncloud/ocis/ocis-pkg/oidc"
"github.com/owncloud/ocis/proxy/pkg/config"
"go-micro.dev/v4/client"
)
func TestLoadSelector(t *testing.T) {

2
proxy/pkg/server/http/server.go
View File

@@ -4,9 +4,9 @@ import (
"crypto/tls"
"os"
"github.com/asim/go-micro/v3"
pkgcrypto "github.com/owncloud/ocis/ocis-pkg/crypto"
svc "github.com/owncloud/ocis/ocis-pkg/service/http"
"go-micro.dev/v4"
)
// Server initializes the http service and server.

2
proxy/pkg/user/backend/accounts_test.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"testing"
"github.com/asim/go-micro/v3/client"
userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
"github.com/cs3org/reva/pkg/token/manager/jwt"
accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
@@ -13,6 +12,7 @@ import (
settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
"github.com/rs/zerolog"
"github.com/stretchr/testify/assert"
"go-micro.dev/v4/client"
)
var mockAccResp = []*accounts.Account{

2
settings/pkg/proto/v0/settings.mock.go
View File

@@ -3,8 +3,8 @@ package proto
import (
"context"
"github.com/asim/go-micro/v3/client"
"github.com/golang/protobuf/ptypes/empty"
"go-micro.dev/v4/client"
)
// MockBundleService can be used to write tests against the bundle service.

6
settings/pkg/proto/v0/settings.pb.micro.go
View File

@@ -14,9 +14,9 @@ import (
import (
context "context"
api "github.com/asim/go-micro/v3/api"
client "github.com/asim/go-micro/v3/client"
server "github.com/asim/go-micro/v3/server"
api "go-micro.dev/v4/api"
client "go-micro.dev/v4/client"
server "go-micro.dev/v4/server"
)
// Reference imports to suppress errors if they are not otherwise used.

4
settings/pkg/proto/v0/settings.pb.micro_test.go
View File

@@ -9,8 +9,6 @@ import (
"os"
"testing"
merrors "github.com/asim/go-micro/v3/errors"
"github.com/asim/go-micro/v3/metadata"
ocislog "github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
@@ -19,6 +17,8 @@ import (
svc "github.com/owncloud/ocis/settings/pkg/service/v0"
store "github.com/owncloud/ocis/settings/pkg/store/filesystem"
"github.com/stretchr/testify/assert"
merrors "go-micro.dev/v4/errors"
"go-micro.dev/v4/metadata"
)
var (

2
settings/pkg/server/http/server.go
View File

@@ -1,7 +1,6 @@
package http
import (
"github.com/asim/go-micro/v3"
"github.com/go-chi/chi/v5"
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/ocis-pkg/account"
@@ -11,6 +10,7 @@ import (
"github.com/owncloud/ocis/settings/pkg/assets"
"github.com/owncloud/ocis/settings/pkg/proto/v0"
svc "github.com/owncloud/ocis/settings/pkg/service/v0"
"go-micro.dev/v4"
)
// Server initializes the http service and server.

4
settings/pkg/service/v0/service.go
View File

@@ -4,8 +4,6 @@ import (
"context"
"fmt"
merrors "github.com/asim/go-micro/v3/errors"
"github.com/asim/go-micro/v3/metadata"
"github.com/golang/protobuf/ptypes/empty"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/middleware"
@@ -14,6 +12,8 @@ import (
"github.com/owncloud/ocis/settings/pkg/proto/v0"
"github.com/owncloud/ocis/settings/pkg/settings"
store "github.com/owncloud/ocis/settings/pkg/store/filesystem"
merrors "go-micro.dev/v4/errors"
"go-micro.dev/v4/metadata"
)
// Service represents a service.

2
settings/pkg/service/v0/service_test.go
View File

@@ -4,9 +4,9 @@ import (
"context"
"testing"
"github.com/asim/go-micro/v3/metadata"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/stretchr/testify/assert"
"go-micro.dev/v4/metadata"
)
var (

4
storage/pkg/service/external/external.go vendored
View File

@@ -4,10 +4,10 @@ import (
"context"
"time"
"github.com/asim/go-micro/v3/broker"
"github.com/asim/go-micro/v3/registry"
"github.com/owncloud/ocis/ocis-pkg/log"
oregistry "github.com/owncloud/ocis/ocis-pkg/registry"
"go-micro.dev/v4/broker"
"go-micro.dev/v4/registry"
)
// RegisterGRPCEndpoint publishes an arbitrary endpoint to the service-registry. This allows to query nodes of

6
store/pkg/proto/v0/store.pb.micro.go
View File

@@ -12,9 +12,9 @@ import (
import (
context "context"
api "github.com/asim/go-micro/v3/api"
client "github.com/asim/go-micro/v3/client"
server "github.com/asim/go-micro/v3/server"
api "go-micro.dev/v4/api"
client "go-micro.dev/v4/client"
server "go-micro.dev/v4/server"
)
// Reference imports to suppress errors if they are not otherwise used.

2
store/pkg/service/v0/service.go
View File

@@ -7,12 +7,12 @@ import (
"os"
"path/filepath"
merrors "github.com/asim/go-micro/v3/errors"
"github.com/blevesearch/bleve/v2"
"github.com/blevesearch/bleve/v2/analysis/analyzer/keyword"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/store/pkg/config"
"github.com/owncloud/ocis/store/pkg/proto/v0"
merrors "go-micro.dev/v4/errors"
"google.golang.org/protobuf/encoding/protojson"
)

6
thumbnails/pkg/proto/v0/thumbnails.pb.micro.go
View File

@@ -12,9 +12,9 @@ import (
import (
context "context"
api "github.com/asim/go-micro/v3/api"
client "github.com/asim/go-micro/v3/client"
server "github.com/asim/go-micro/v3/server"
api "go-micro.dev/v4/api"
client "go-micro.dev/v4/client"
server "go-micro.dev/v4/server"
)
// Reference imports to suppress errors if they are not otherwise used.

2
thumbnails/pkg/service/v0/service.go
View File

@@ -7,7 +7,6 @@ import (
"path"
"strings"
merrors "github.com/asim/go-micro/v3/errors"
gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
@@ -18,6 +17,7 @@ import (
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail"
"github.com/owncloud/ocis/thumbnails/pkg/thumbnail/imgsource"
"github.com/pkg/errors"
merrors "go-micro.dev/v4/errors"
"google.golang.org/grpc/metadata"
)

2
web/pkg/server/http/server.go
View File

@@ -1,13 +1,13 @@
package http
import (
"github.com/asim/go-micro/v3"
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
"github.com/owncloud/ocis/ocis-pkg/version"
webmid "github.com/owncloud/ocis/web/pkg/middleware"
svc "github.com/owncloud/ocis/web/pkg/service/v0"
"go-micro.dev/v4"
)
// Server initializes the http service and server.

2
webdav/pkg/server/http/server.go
View File

@@ -1,11 +1,11 @@
package http
import (
"github.com/asim/go-micro/v3"
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
svc "github.com/owncloud/ocis/webdav/pkg/service/v0"
"go-micro.dev/v4"
)
// Server initializes the http service and server.

5
webdav/pkg/service/v0/service.go
View File

@@ -2,12 +2,13 @@ package svc
import (
"encoding/xml"
merrors "github.com/asim/go-micro/v3/errors"
"github.com/go-chi/render"
"net/http"
"path"
"strings"
"github.com/go-chi/render"
merrors "go-micro.dev/v4/errors"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"