diff --git a/ocs/go.mod b/ocs/go.mod index 55e7c2136..47a39475b 100644 --- a/ocs/go.mod +++ b/ocs/go.mod @@ -7,6 +7,8 @@ require ( contrib.go.opencensus.io/exporter/ocagent v0.7.0 contrib.go.opencensus.io/exporter/zipkin v0.1.1 github.com/UnnoTed/fileb0x v1.1.4 + github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20210210071449-f9f5e7422d8f + github.com/asim/go-micro/v3 v3.5.0 github.com/bmatcuk/doublestar v1.3.4 // indirect github.com/cs3org/go-cs3apis v0.0.0-20210209082852-35ace33082f5 github.com/cs3org/reva v1.6.0 @@ -34,7 +36,7 @@ require ( github.com/stretchr/testify v1.7.0 github.com/valyala/fasttemplate v1.2.1 // indirect go.opencensus.io v0.22.6 - google.golang.org/genproto v0.0.0-20200624020401-64a14ca9d1ad + google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d google.golang.org/protobuf v1.25.0 ) diff --git a/ocs/go.sum b/ocs/go.sum index 1755e6b81..55a1faf3e 100644 --- a/ocs/go.sum +++ b/ocs/go.sum @@ -132,11 +132,25 @@ github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 h1:4daAzAu0 github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/ascarter/requestid v0.0.0-20170313220838-5b76ab3d4aee h1:3T/l+vMotQ7cDSLWNAn2Vg1SAQ3mdyLgBWWBitSS3uU= github.com/ascarter/requestid v0.0.0-20170313220838-5b76ab3d4aee/go.mod h1:u7Wtt4WATGGgae9mURNGQQqxAudPKrxfsbSDSGOso+g= +github.com/asim/go-micro/cmd/protoc-gen-micro/v3 v3.0.0-20210210071449-f9f5e7422d8f/go.mod h1:fYvR5QgzmPPwycnoC7lyZanqQ4l41AbaZ+urE2DSsbI= +github.com/asim/go-micro/plugins/broker/memory/v3 v3.0.0-20210202145831-070250155285/go.mod h1:IJrBUDk0XAbi0iDg+sKgkY588m311TkSoEAjU9xu/mc= +github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20210205090925-e8167a8b79ed/go.mod h1:Mx1EwGdIq7wl5IkKLaGbHtoIC4yvqUNxJtZu6wxsqiU= +github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20210210071449-f9f5e7422d8f h1:VTL4EFNLPzrc28lrYrLrjMkwx6xLEWII0v5rCb6Ozqw= +github.com/asim/go-micro/plugins/client/grpc/v3 v3.0.0-20210210071449-f9f5e7422d8f/go.mod h1:Mx1EwGdIq7wl5IkKLaGbHtoIC4yvqUNxJtZu6wxsqiU= +github.com/asim/go-micro/plugins/registry/mdns/v3 v3.0.0-20210210071449-f9f5e7422d8f h1:3IEpZMneDJjCI9bHgRECu+HHNqfkIaPm/gNbn1jWvPQ= +github.com/asim/go-micro/plugins/registry/mdns/v3 v3.0.0-20210210071449-f9f5e7422d8f/go.mod h1:UWBk93zeuMU1xQSVqFUzLwYHQCiQsMepIPFXlltysls= github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210202145831-070250155285/go.mod h1:AU0vyZvsO1lpuQr/DUG4CnNRvITXqQcJRRAzBATR6Jo= +github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20210210071449-f9f5e7422d8f h1:WaTi2EiBXi48uXmlGTb7h+QxSqmhm6A6r5P2idxvLrM= +github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20210210071449-f9f5e7422d8f/go.mod h1:4cS4mKqylPAybKUO8/mdjTGlBImeAL1RWA2rV/mObPQ= github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210210071449-f9f5e7422d8f h1:fZuMpX1tMJKD93MdCsHTzSld6yAzdeZvzDgvKVT8ON8= github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210210071449-f9f5e7422d8f/go.mod h1:Oe0f4zsBx6if1scvMrL/4mNfkD7URaqkvhQWnWogcws= +github.com/asim/go-micro/plugins/transport/grpc/v3 v3.0.0-20210202145831-070250155285/go.mod h1:FXWwzJ74gGEIY/gOdDHJqCQuago+tLSkcUPayf9daGM= +github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210210071449-f9f5e7422d8f h1:OUIw+swBpGSD3PQF/T6GMnNkSkOnO4vYe4t4KNb2jLI= +github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210210071449-f9f5e7422d8f/go.mod h1:iCbpezORppbnxDxG/TEAoLsoxkAvEfcq2Fo1WOClNjY= github.com/asim/go-micro/v3 v3.0.0-20210120135431-d94936f6c97c h1:pxZggDV2VJ7aTR7/7xzAJOGam0y8zzrtBgmop1pHAyA= github.com/asim/go-micro/v3 v3.0.0-20210120135431-d94936f6c97c/go.mod h1:fAeb2KUnD3z4XwtQ91XFxw5zgGKhoTsLc6Ie81QdER4= +github.com/asim/go-micro/v3 v3.5.0 h1:VAmEDB2IdIzPLdgk0bgN6qBe3zHQ5j45SSZfg0e91sY= +github.com/asim/go-micro/v3 v3.5.0/go.mod h1:PR/RCuFk1F7aPnK6pc8Ca9rHOZzfg1x7+fvTygQa55g= github.com/aws/aws-sdk-go v1.20.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.23.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.23.19/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= @@ -673,6 +687,7 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -1606,6 +1621,7 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb h1:eBmm0M9fYhWpKZLjQUUKka/LtIxf46G4fxeEz5KJr9U= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1892,6 +1908,8 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200624020401-64a14ca9d1ad h1:uAwc13+y0Y8QZLTYhLCu6lHhnG99ecQU5FYTj8zxAng= google.golang.org/genproto v0.0.0-20200624020401-64a14ca9d1ad/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d h1:HV9Z9qMhQEsdlvxNFELgQ11RkMzO3CMkjEySjCtuLes= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/ocs/pkg/server/http/server.go b/ocs/pkg/server/http/server.go index f555a4820..aae9ae99c 100644 --- a/ocs/pkg/server/http/server.go +++ b/ocs/pkg/server/http/server.go @@ -1,6 +1,7 @@ package http import ( + "github.com/asim/go-micro/v3" "github.com/owncloud/ocis/ocis-pkg/middleware" "github.com/owncloud/ocis/ocis-pkg/service/http" svc "github.com/owncloud/ocis/ocs/pkg/service/v0" @@ -45,10 +46,7 @@ func Server(opts ...Option) (http.Service, error) { handle = svc.NewTracing(handle) } - service.Handle( - "/", - handle, - ) + micro.RegisterHandler(service.Server(), handle) service.Init() return service, nil diff --git a/ocs/pkg/server/http/svc_test.go b/ocs/pkg/server/http/svc_test.go index 4eceaca08..6f7f7b992 100644 --- a/ocs/pkg/server/http/svc_test.go +++ b/ocs/pkg/server/http/svc_test.go @@ -15,12 +15,12 @@ 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/token" "github.com/cs3org/reva/pkg/token/manager/jwt" "github.com/golang/protobuf/ptypes/empty" - "github.com/micro/go-micro/v2/client" accountsCmd "github.com/owncloud/ocis/accounts/pkg/command" accountsCfg "github.com/owncloud/ocis/accounts/pkg/config" accountsProto "github.com/owncloud/ocis/accounts/pkg/proto/v0" @@ -51,7 +51,7 @@ const ( userEinstein string = "einstein" userMarie string = "marie" userRichard string = "richard" - userIDP string = "idp" + userIDP string = "idp" userReva string = "reva" userMoss string = "moss" userAdmin string = "admin" @@ -138,7 +138,7 @@ const ( userIDEinstein string = "4c510ada-c86b-4815-8820-42cdf82c3d51" userIDMarie string = "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c" userIDFeynman string = "932b4540-8d16-481e-8ef4-588e4b6b151c" - userIDIDP string = "820ba2a1-3f54-4538-80a4-2d73007e30bf" + userIDIDP string = "820ba2a1-3f54-4538-80a4-2d73007e30bf" userIDReva string = "bc596f3c-c955-4328-80a0-60d018b4ad57" userIDMoss string = "058bff95-6708-4fe5-91e4-9ea3d377588b" userIDAdmin string = "ddc2004c-0977-11eb-9d3f-a793888cd0f8" diff --git a/ocs/pkg/service/v0/groups.go b/ocs/pkg/service/v0/groups.go index 6b7913b45..0ef1610df 100644 --- a/ocs/pkg/service/v0/groups.go +++ b/ocs/pkg/service/v0/groups.go @@ -9,9 +9,9 @@ import ( "regexp" "strconv" + merrors "github.com/asim/go-micro/v3/errors" "github.com/go-chi/chi" "github.com/go-chi/render" - merrors "github.com/micro/go-micro/v2/errors" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "github.com/owncloud/ocis/ocs/pkg/service/v0/data" diff --git a/ocs/pkg/service/v0/service.go b/ocs/pkg/service/v0/service.go index 3d9d0a1d7..1f5fca555 100644 --- a/ocs/pkg/service/v0/service.go +++ b/ocs/pkg/service/v0/service.go @@ -4,11 +4,11 @@ import ( "net/http" "time" + "github.com/owncloud/ocis/ocis-pkg/service/grpc" + "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" "github.com/go-chi/render" - "github.com/micro/go-micro/v2/client/grpc" - ogrpc "github.com/owncloud/ocis/ocis-pkg/service/grpc" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "github.com/owncloud/ocis/ocis-pkg/account" @@ -22,8 +22,6 @@ import ( settings "github.com/owncloud/ocis/settings/pkg/proto/v0" ) -var defaultClient = grpc.NewClient() - // Service defines the extension handlers. type Service interface { ServeHTTP(http.ResponseWriter, *http.Request) @@ -39,7 +37,7 @@ func NewService(opts ...Option) Service { roleService := options.RoleService if roleService == nil { - roleService = settings.NewRoleService("com.owncloud.api.settings", ogrpc.DefaultClient) + roleService = settings.NewRoleService("com.owncloud.api.settings", grpc.DefaultClient) } roleManager := options.RoleManager if roleManager == nil { @@ -152,11 +150,11 @@ func (o Ocs) NotFound(w http.ResponseWriter, r *http.Request) { } func (o Ocs) getAccountService() accounts.AccountsService { - return accounts.NewAccountsService("com.owncloud.api.accounts", defaultClient) + return accounts.NewAccountsService("com.owncloud.api.accounts", grpc.DefaultClient) } func (o Ocs) getGroupsService() accounts.GroupsService { - return accounts.NewGroupsService("com.owncloud.api.accounts", defaultClient) + return accounts.NewGroupsService("com.owncloud.api.accounts", grpc.DefaultClient) } // NotImplementedStub returns a not implemented error diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go index 906a8ef09..151a9eaf3 100644 --- a/ocs/pkg/service/v0/users.go +++ b/ocs/pkg/service/v0/users.go @@ -15,8 +15,8 @@ import ( "google.golang.org/genproto/protobuf/field_mask" "google.golang.org/protobuf/types/known/fieldmaskpb" - "github.com/micro/go-micro/v2/client/grpc" - merrors "github.com/micro/go-micro/v2/errors" + "github.com/asim/go-micro/plugins/client/grpc/v3" + merrors "github.com/asim/go-micro/v3/errors" accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "github.com/owncloud/ocis/ocs/pkg/service/v0/data" "github.com/owncloud/ocis/ocs/pkg/service/v0/response" diff --git a/settings/pkg/proto/v0/settings.mock.go b/settings/pkg/proto/v0/settings.mock.go index 04904bded..d33f33200 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" - "github.com/micro/go-micro/v2/client" ) // MockBundleService can be used to write tests against the bundle service. diff --git a/store/pkg/proto/v0/store.pb.go b/store/pkg/proto/v0/store.pb.go index fe91eeb9d..e76980b9e 100644 --- a/store/pkg/proto/v0/store.pb.go +++ b/store/pkg/proto/v0/store.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.24.0 -// protoc v3.11.4 +// protoc-gen-go v1.23.0 +// protoc v3.14.0 // source: store.proto package proto diff --git a/store/pkg/proto/v0/store.pb.micro.go b/store/pkg/proto/v0/store.pb.micro.go index 6a2a1696e..b0ca3f36f 100644 --- a/store/pkg/proto/v0/store.pb.micro.go +++ b/store/pkg/proto/v0/store.pb.micro.go @@ -11,8 +11,9 @@ import ( import ( context "context" - client "github.com/micro/go-micro/v2/client" - server "github.com/micro/go-micro/v2/server" + api "github.com/asim/go-micro/v3/api" + client "github.com/asim/go-micro/v3/client" + server "github.com/asim/go-micro/v3/server" ) // Reference imports to suppress errors if they are not otherwise used. @@ -27,10 +28,17 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Reference imports to suppress errors if they are not otherwise used. +var _ api.Endpoint var _ context.Context var _ client.Option var _ server.Option +// Api Endpoints for Store service + +func NewStoreEndpoints() []*api.Endpoint { + return []*api.Endpoint{} +} + // Client API for Store service type StoreService interface {