From 6d5a3733ffaf45690c66dca97c790aa21af94eae Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 12 Oct 2021 17:29:33 +0200 Subject: [PATCH] upgrade to go micro v4.1.0 --- accounts/pkg/command/rebuild_index.go | 2 +- accounts/pkg/proto/v0/accounts.mock.go | 2 +- accounts/pkg/proto/v0/accounts.pb.micro.go | 6 +-- .../pkg/proto/v0/accounts.pb.micro_test.go | 4 +- accounts/pkg/server/http/server.go | 2 +- accounts/pkg/service/v0/accounts.go | 4 +- .../service/v0/accounts_permission_test.go | 6 +-- accounts/pkg/service/v0/groups.go | 2 +- changelog/unreleased/go-micro-v4-1-0.md | 5 ++ glauth/pkg/server/glauth/ocis.go | 2 +- go.mod | 26 ++++----- go.sum | 53 ++++++++++--------- graph-explorer/pkg/server/http/server.go | 2 +- graph/pkg/server/http/server.go | 2 +- idp/pkg/server/http/server.go | 2 +- ocis-pkg/log/log.go | 6 +-- ocis-pkg/log/stream.go | 2 +- ocis-pkg/middleware/account.go | 2 +- ocis-pkg/registry/registry.go | 2 +- ocis-pkg/roles/util.go | 2 +- ocis-pkg/service/grpc/service.go | 4 +- ocis-pkg/service/http/service.go | 4 +- ocis/pkg/command/version.go | 2 +- ocis/pkg/runtime/service/service.go | 2 +- ocs/pkg/server/http/server.go | 2 +- ocs/pkg/server/http/svc_test.go | 2 +- ocs/pkg/service/v0/groups.go | 2 +- ocs/pkg/service/v0/users.go | 2 +- proxy/pkg/proxy/policy/selector_test.go | 2 +- proxy/pkg/server/http/server.go | 2 +- proxy/pkg/user/backend/accounts_test.go | 2 +- settings/pkg/proto/v0/settings.mock.go | 2 +- settings/pkg/proto/v0/settings.pb.micro.go | 6 +-- .../pkg/proto/v0/settings.pb.micro_test.go | 4 +- settings/pkg/server/http/server.go | 2 +- settings/pkg/service/v0/service.go | 4 +- settings/pkg/service/v0/service_test.go | 2 +- storage/pkg/service/external/external.go | 4 +- store/pkg/proto/v0/store.pb.micro.go | 6 +-- store/pkg/service/v0/service.go | 2 +- .../pkg/proto/v0/thumbnails.pb.micro.go | 6 +-- thumbnails/pkg/service/v0/service.go | 2 +- web/pkg/server/http/server.go | 2 +- webdav/pkg/server/http/server.go | 2 +- webdav/pkg/service/v0/service.go | 5 +- 45 files changed, 109 insertions(+), 100 deletions(-) create mode 100644 changelog/unreleased/go-micro-v4-1-0.md diff --git a/accounts/pkg/command/rebuild_index.go b/accounts/pkg/command/rebuild_index.go index cffb16388..215f13c65 100644 --- a/accounts/pkg/command/rebuild_index.go +++ b/accounts/pkg/command/rebuild_index.go @@ -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. diff --git a/accounts/pkg/proto/v0/accounts.mock.go b/accounts/pkg/proto/v0/accounts.mock.go index 049e23b90..b0c653f42 100644 --- a/accounts/pkg/proto/v0/accounts.mock.go +++ b/accounts/pkg/proto/v0/accounts.mock.go @@ -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 diff --git a/accounts/pkg/proto/v0/accounts.pb.micro.go b/accounts/pkg/proto/v0/accounts.pb.micro.go index 941ee8e4c..25e03f1de 100644 --- a/accounts/pkg/proto/v0/accounts.pb.micro.go +++ b/accounts/pkg/proto/v0/accounts.pb.micro.go @@ -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. diff --git a/accounts/pkg/proto/v0/accounts.pb.micro_test.go b/accounts/pkg/proto/v0/accounts.pb.micro_test.go index 67ea98334..345dddd6b 100644 --- a/accounts/pkg/proto/v0/accounts.pb.micro_test.go +++ b/accounts/pkg/proto/v0/accounts.pb.micro_test.go @@ -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" ) diff --git a/accounts/pkg/server/http/server.go b/accounts/pkg/server/http/server.go index b6082c617..dc2f5e8cf 100644 --- a/accounts/pkg/server/http/server.go +++ b/accounts/pkg/server/http/server.go @@ -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. diff --git a/accounts/pkg/service/v0/accounts.go b/accounts/pkg/service/v0/accounts.go index d15830328..37979cddf 100644 --- a/accounts/pkg/service/v0/accounts.go +++ b/accounts/pkg/service/v0/accounts.go @@ -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" diff --git a/accounts/pkg/service/v0/accounts_permission_test.go b/accounts/pkg/service/v0/accounts_permission_test.go index e42bae98a..3fdc5885f 100644 --- a/accounts/pkg/service/v0/accounts_permission_test.go +++ b/accounts/pkg/service/v0/accounts_permission_test.go @@ -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" diff --git a/accounts/pkg/service/v0/groups.go b/accounts/pkg/service/v0/groups.go index 98f87212f..e69e82dc4 100644 --- a/accounts/pkg/service/v0/groups.go +++ b/accounts/pkg/service/v0/groups.go @@ -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" ) diff --git a/changelog/unreleased/go-micro-v4-1-0.md b/changelog/unreleased/go-micro-v4-1-0.md new file mode 100644 index 000000000..d4c73d8fc --- /dev/null +++ b/changelog/unreleased/go-micro-v4-1-0.md @@ -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 diff --git a/glauth/pkg/server/glauth/ocis.go b/glauth/pkg/server/glauth/ocis.go index bd39717b1..4f72f618d 100644 --- a/glauth/pkg/server/glauth/ocis.go +++ b/glauth/pkg/server/glauth/ocis.go @@ -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 diff --git a/go.mod b/go.mod index 951a03269..ad4e0ddd1 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 19708541c..4ba5f7f0d 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/graph-explorer/pkg/server/http/server.go b/graph-explorer/pkg/server/http/server.go index ead6bcf7b..f8025d93a 100644 --- a/graph-explorer/pkg/server/http/server.go +++ b/graph-explorer/pkg/server/http/server.go @@ -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. diff --git a/graph/pkg/server/http/server.go b/graph/pkg/server/http/server.go index d29e2778a..36f64ef3f 100644 --- a/graph/pkg/server/http/server.go +++ b/graph/pkg/server/http/server.go @@ -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. diff --git a/idp/pkg/server/http/server.go b/idp/pkg/server/http/server.go index 829552e66..22c38a5c2 100644 --- a/idp/pkg/server/http/server.go +++ b/idp/pkg/server/http/server.go @@ -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. diff --git a/ocis-pkg/log/log.go b/ocis-pkg/log/log.go index 8b95d0fe4..043639195 100644 --- a/ocis-pkg/log/log.go +++ b/ocis-pkg/log/log.go @@ -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. diff --git a/ocis-pkg/log/stream.go b/ocis-pkg/log/stream.go index 5b26ba201..0bb0fd43f 100644 --- a/ocis-pkg/log/stream.go +++ b/ocis-pkg/log/stream.go @@ -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 { diff --git a/ocis-pkg/middleware/account.go b/ocis-pkg/middleware/account.go index 9d7c26d4e..9276c1a8c 100644 --- a/ocis-pkg/middleware/account.go +++ b/ocis-pkg/middleware/account.go @@ -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. diff --git a/ocis-pkg/registry/registry.go b/ocis-pkg/registry/registry.go index ad8d8ec18..40507fb9d 100644 --- a/ocis-pkg/registry/registry.go +++ b/ocis-pkg/registry/registry.go @@ -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 ( diff --git a/ocis-pkg/roles/util.go b/ocis-pkg/roles/util.go index b5e7aab6f..8b5d25b8c 100644 --- a/ocis-pkg/roles/util.go +++ b/ocis-pkg/roles/util.go @@ -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 diff --git a/ocis-pkg/service/grpc/service.go b/ocis-pkg/service/grpc/service.go index edeab6c8e..5870100e5 100644 --- a/ocis-pkg/service/grpc/service.go +++ b/ocis-pkg/service/grpc/service.go @@ -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. diff --git a/ocis-pkg/service/http/service.go b/ocis-pkg/service/http/service.go index 82b941ddc..a7a9f8bd3 100644 --- a/ocis-pkg/service/http/service.go +++ b/ocis-pkg/service/http/service.go @@ -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. diff --git a/ocis/pkg/command/version.go b/ocis/pkg/command/version.go index 25eeeba60..21d762b59 100644 --- a/ocis/pkg/command/version.go +++ b/ocis/pkg/command/version.go @@ -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. diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go index 6ff29a158..28cd652b5 100644 --- a/ocis/pkg/runtime/service/service.go +++ b/ocis/pkg/runtime/service/service.go @@ -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 ( diff --git a/ocs/pkg/server/http/server.go b/ocs/pkg/server/http/server.go index 3ac61f4fa..34eea8674 100644 --- a/ocs/pkg/server/http/server.go +++ b/ocs/pkg/server/http/server.go @@ -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. diff --git a/ocs/pkg/server/http/svc_test.go b/ocs/pkg/server/http/svc_test.go index 7c46558f0..baad2067a 100644 --- a/ocs/pkg/server/http/svc_test.go +++ b/ocs/pkg/server/http/svc_test.go @@ -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 ( diff --git a/ocs/pkg/service/v0/groups.go b/ocs/pkg/service/v0/groups.go index a019663e4..e98e29117 100644 --- a/ocs/pkg/service/v0/groups.go +++ b/ocs/pkg/service/v0/groups.go @@ -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" ) diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go index 1a7fc01f4..036efc6fb 100644 --- a/ocs/pkg/service/v0/users.go +++ b/ocs/pkg/service/v0/users.go @@ -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" diff --git a/proxy/pkg/proxy/policy/selector_test.go b/proxy/pkg/proxy/policy/selector_test.go index a4ded5773..d48566c0f 100644 --- a/proxy/pkg/proxy/policy/selector_test.go +++ b/proxy/pkg/proxy/policy/selector_test.go @@ -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) { diff --git a/proxy/pkg/server/http/server.go b/proxy/pkg/server/http/server.go index 9725a63e4..a403f630d 100644 --- a/proxy/pkg/server/http/server.go +++ b/proxy/pkg/server/http/server.go @@ -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. diff --git a/proxy/pkg/user/backend/accounts_test.go b/proxy/pkg/user/backend/accounts_test.go index 57e652def..ed2a33b66 100644 --- a/proxy/pkg/user/backend/accounts_test.go +++ b/proxy/pkg/user/backend/accounts_test.go @@ -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{ diff --git a/settings/pkg/proto/v0/settings.mock.go b/settings/pkg/proto/v0/settings.mock.go index d33f33200..b24b9ee31 100644 --- a/settings/pkg/proto/v0/settings.mock.go +++ b/settings/pkg/proto/v0/settings.mock.go @@ -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. diff --git a/settings/pkg/proto/v0/settings.pb.micro.go b/settings/pkg/proto/v0/settings.pb.micro.go index 6742ec087..1b3e4b10e 100644 --- a/settings/pkg/proto/v0/settings.pb.micro.go +++ b/settings/pkg/proto/v0/settings.pb.micro.go @@ -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. diff --git a/settings/pkg/proto/v0/settings.pb.micro_test.go b/settings/pkg/proto/v0/settings.pb.micro_test.go index 28c24e253..8e9e26c31 100644 --- a/settings/pkg/proto/v0/settings.pb.micro_test.go +++ b/settings/pkg/proto/v0/settings.pb.micro_test.go @@ -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 ( diff --git a/settings/pkg/server/http/server.go b/settings/pkg/server/http/server.go index 17595078e..238d3a2c7 100644 --- a/settings/pkg/server/http/server.go +++ b/settings/pkg/server/http/server.go @@ -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. diff --git a/settings/pkg/service/v0/service.go b/settings/pkg/service/v0/service.go index a9614c454..d65bfcff6 100644 --- a/settings/pkg/service/v0/service.go +++ b/settings/pkg/service/v0/service.go @@ -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. diff --git a/settings/pkg/service/v0/service_test.go b/settings/pkg/service/v0/service_test.go index 9e9630f34..7c39b724a 100644 --- a/settings/pkg/service/v0/service_test.go +++ b/settings/pkg/service/v0/service_test.go @@ -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 ( diff --git a/storage/pkg/service/external/external.go b/storage/pkg/service/external/external.go index c4fbd7b0a..4ef64adac 100644 --- a/storage/pkg/service/external/external.go +++ b/storage/pkg/service/external/external.go @@ -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 diff --git a/store/pkg/proto/v0/store.pb.micro.go b/store/pkg/proto/v0/store.pb.micro.go index 7b1e0215c..e302b21db 100644 --- a/store/pkg/proto/v0/store.pb.micro.go +++ b/store/pkg/proto/v0/store.pb.micro.go @@ -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. diff --git a/store/pkg/service/v0/service.go b/store/pkg/service/v0/service.go index 60b116e55..199411094 100644 --- a/store/pkg/service/v0/service.go +++ b/store/pkg/service/v0/service.go @@ -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" ) diff --git a/thumbnails/pkg/proto/v0/thumbnails.pb.micro.go b/thumbnails/pkg/proto/v0/thumbnails.pb.micro.go index 02b6400ca..d4892bc9c 100644 --- a/thumbnails/pkg/proto/v0/thumbnails.pb.micro.go +++ b/thumbnails/pkg/proto/v0/thumbnails.pb.micro.go @@ -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. diff --git a/thumbnails/pkg/service/v0/service.go b/thumbnails/pkg/service/v0/service.go index dab2496ab..b5388f844 100644 --- a/thumbnails/pkg/service/v0/service.go +++ b/thumbnails/pkg/service/v0/service.go @@ -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" ) diff --git a/web/pkg/server/http/server.go b/web/pkg/server/http/server.go index ade4049b4..25a9e5db7 100644 --- a/web/pkg/server/http/server.go +++ b/web/pkg/server/http/server.go @@ -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. diff --git a/webdav/pkg/server/http/server.go b/webdav/pkg/server/http/server.go index 16aebff92..11eeeeae3 100644 --- a/webdav/pkg/server/http/server.go +++ b/webdav/pkg/server/http/server.go @@ -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. diff --git a/webdav/pkg/service/v0/service.go b/webdav/pkg/service/v0/service.go index 972e6f7e5..f67c39b8e 100644 --- a/webdav/pkg/service/v0/service.go +++ b/webdav/pkg/service/v0/service.go @@ -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"