Merge pull request #3543 from owncloud/switch-micro-source

switch source for go micro plugins
owncloud · Apr 19, 2022 · d2dc035 · d2dc035
2 parents ff48a58 + f6ead08
commit d2dc035
Show file tree

Hide file tree

Showing 17 changed files with 71 additions and 79 deletions.
diff --git a/extensions/accounts/pkg/command/add_account.go b/extensions/accounts/pkg/command/add_account.go
@@ -6,7 +6,7 @@ import (
 	accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
 	accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
 
-	"github.com/asim/go-micro/plugins/client/grpc/v4"
+	"github.com/go-micro/plugins/v4/client/grpc"
 	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
 	"github.com/urfave/cli/v2"

diff --git a/extensions/accounts/pkg/command/inspect_account.go b/extensions/accounts/pkg/command/inspect_account.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
 
-	"github.com/asim/go-micro/plugins/client/grpc/v4"
+	"github.com/go-micro/plugins/v4/client/grpc"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/urfave/cli/v2"

diff --git a/extensions/accounts/pkg/command/list_accounts.go b/extensions/accounts/pkg/command/list_accounts.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
 
-	"github.com/asim/go-micro/plugins/client/grpc/v4"
+	"github.com/go-micro/plugins/v4/client/grpc"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/urfave/cli/v2"

diff --git a/extensions/accounts/pkg/command/rebuild_index.go b/extensions/accounts/pkg/command/rebuild_index.go
@@ -6,7 +6,7 @@ import (
 
 	accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
 
-	"github.com/asim/go-micro/plugins/client/grpc/v4"
+	"github.com/go-micro/plugins/v4/client/grpc"
 	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/urfave/cli/v2"
 	merrors "go-micro.dev/v4/errors"

diff --git a/extensions/accounts/pkg/command/remove_account.go b/extensions/accounts/pkg/command/remove_account.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
 
-	"github.com/asim/go-micro/plugins/client/grpc/v4"
+	"github.com/go-micro/plugins/v4/client/grpc"
 	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/urfave/cli/v2"
 )

diff --git a/extensions/accounts/pkg/command/update_account.go b/extensions/accounts/pkg/command/update_account.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
 
-	"github.com/asim/go-micro/plugins/client/grpc/v4"
+	"github.com/go-micro/plugins/v4/client/grpc"
 	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/urfave/cli/v2"
 	"google.golang.org/genproto/protobuf/field_mask"

diff --git a/extensions/audit/pkg/command/server.go b/extensions/audit/pkg/command/server.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/asim/go-micro/plugins/events/natsjs/v4"
 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/events/server"
+	"github.com/go-micro/plugins/v4/events/natsjs"
 	"github.com/owncloud/ocis/extensions/audit/pkg/config"
 	"github.com/owncloud/ocis/extensions/audit/pkg/config/parser"
 	"github.com/owncloud/ocis/extensions/audit/pkg/logging"

diff --git a/extensions/graph/pkg/server/http/server.go b/extensions/graph/pkg/server/http/server.go
@@ -1,9 +1,9 @@
 package http
 
 import (
-	"github.com/asim/go-micro/plugins/events/natsjs/v4"
 	"github.com/cs3org/reva/v2/pkg/events/server"
 	chimiddleware "github.com/go-chi/chi/v5/middleware"
+	"github.com/go-micro/plugins/v4/events/natsjs"
 	graphMiddleware "github.com/owncloud/ocis/extensions/graph/pkg/middleware"
 	svc "github.com/owncloud/ocis/extensions/graph/pkg/service/v0"
 	"github.com/owncloud/ocis/ocis-pkg/account"

diff --git a/extensions/notifications/pkg/command/server.go b/extensions/notifications/pkg/command/server.go
@@ -3,9 +3,9 @@ package command
 import (
 	"fmt"
 
-	"github.com/asim/go-micro/plugins/events/natsjs/v4"
 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/events/server"
+	"github.com/go-micro/plugins/v4/events/natsjs"
 	"github.com/owncloud/ocis/extensions/notifications/pkg/channels"
 	"github.com/owncloud/ocis/extensions/notifications/pkg/config"
 	"github.com/owncloud/ocis/extensions/notifications/pkg/config/parser"

diff --git a/extensions/ocs/pkg/service/v0/users.go b/extensions/ocs/pkg/service/v0/users.go
@@ -16,7 +16,6 @@ import (
 	storemsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/store/v0"
 	storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0"
 
-	"github.com/asim/go-micro/plugins/client/grpc/v4"
 	revauser "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
 	rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
@@ -26,6 +25,7 @@ import (
 	"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
 	"github.com/cs3org/reva/v2/pkg/token/manager/jwt"
 	"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"

diff --git a/extensions/proxy/pkg/proxy/policy/selector.go b/extensions/proxy/pkg/proxy/policy/selector.go
@@ -8,8 +8,8 @@ import (
 
 	accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
 
-	"github.com/asim/go-micro/plugins/client/grpc/v4"
 	revactx "github.com/cs3org/reva/v2/pkg/ctx"
+	"github.com/go-micro/plugins/v4/client/grpc"
 	"github.com/owncloud/ocis/extensions/proxy/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/oidc"
 )

diff --git a/go.mod b/go.mod
@@ -7,22 +7,11 @@ require (
 	github.com/GeertJohan/yubigo v0.0.0-20190917122436-175bc097e60e
 	github.com/ReneKroon/ttlcache/v2 v2.11.0
 	github.com/asim/go-micro/plugins/client/grpc/v4 v4.0.0-20220118152736-9e0be6c85d75
-	github.com/asim/go-micro/plugins/events/natsjs/v4 v4.0.0-20220311080335-e5a35d38f931
-	github.com/asim/go-micro/plugins/logger/zerolog/v4 v4.0.0-20220118152736-9e0be6c85d75
-	github.com/asim/go-micro/plugins/registry/consul/v4 v4.0.0-20220118152736-9e0be6c85d75
-	github.com/asim/go-micro/plugins/registry/etcd/v4 v4.0.0-20220118152736-9e0be6c85d75
-	github.com/asim/go-micro/plugins/registry/kubernetes/v4 v4.0.0-20220118152736-9e0be6c85d75
-	github.com/asim/go-micro/plugins/registry/mdns/v4 v4.0.0-20220118152736-9e0be6c85d75
-	github.com/asim/go-micro/plugins/registry/nats/v4 v4.0.0-20220118152736-9e0be6c85d75
 	github.com/asim/go-micro/plugins/server/grpc/v4 v4.0.0-20220118152736-9e0be6c85d75
-	github.com/asim/go-micro/plugins/server/http/v4 v4.0.0-20220317022205-c6d352c83291
-	github.com/asim/go-micro/plugins/wrapper/breaker/gobreaker/v4 v4.0.0-20220118152736-9e0be6c85d75
-	github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v4 v4.0.0-20220118152736-9e0be6c85d75
-	github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v4 v4.0.0-20220118152736-9e0be6c85d75
 	github.com/blevesearch/bleve/v2 v2.3.2
 	github.com/coreos/go-oidc/v3 v3.1.0
 	github.com/cs3org/go-cs3apis v0.0.0-20220412090512-93c5918b4bde
-	github.com/cs3org/reva/v2 v2.0.0-20220414151507-d46af8cacea0
+	github.com/cs3org/reva/v2 v2.0.0-20220419100641-50aa8636af59
 	github.com/disintegration/imaging v1.6.2
 	github.com/glauth/glauth/v2 v2.0.0-20211021011345-ef3151c28733
 	github.com/go-chi/chi/v5 v5.0.7
@@ -31,6 +20,18 @@ require (
 	github.com/go-ldap/ldap/v3 v3.4.3
 	github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3
 	github.com/go-logr/logr v1.2.3
+	github.com/go-micro/plugins/v4/client/grpc v1.0.0
+	github.com/go-micro/plugins/v4/events/natsjs v1.0.0
+	github.com/go-micro/plugins/v4/logger/zerolog v1.0.0
+	github.com/go-micro/plugins/v4/registry/consul v1.0.0
+	github.com/go-micro/plugins/v4/registry/etcd v1.0.0
+	github.com/go-micro/plugins/v4/registry/kubernetes v1.0.0
+	github.com/go-micro/plugins/v4/registry/mdns v1.0.0
+	github.com/go-micro/plugins/v4/registry/nats v1.0.0
+	github.com/go-micro/plugins/v4/server/http v1.0.0
+	github.com/go-micro/plugins/v4/wrapper/breaker/gobreaker v1.0.0
+	github.com/go-micro/plugins/v4/wrapper/monitoring/prometheus v1.0.0
+	github.com/go-micro/plugins/v4/wrapper/trace/opencensus v1.0.0
 	github.com/go-ozzo/ozzo-validation/v4 v4.3.0
 	github.com/gofrs/uuid v4.2.0+incompatible
 	github.com/golang-jwt/jwt/v4 v4.4.1
@@ -247,9 +248,9 @@ require (
 	github.com/xanzy/ssh-agent v0.3.1 // indirect
 	github.com/yaegashi/msgraph.go v0.1.4 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.1 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.1 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.2 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.2 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.2 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.19.1 // indirect