From df43e99cd138df661839af680d8b76807715e357 Mon Sep 17 00:00:00 2001 From: Fabrizio Furano Date: Fri, 12 Mar 2021 14:57:33 +0100 Subject: [PATCH] Use the eos grpc defs from github --- go.mod | 1 + go.sum | 2 ++ pkg/eosclient/eosgrpc/eosgrpc.go | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index cbbafd422e..ade2e434b3 100644 --- a/go.mod +++ b/go.mod @@ -16,6 +16,7 @@ require ( github.com/cs3org/go-cs3apis v0.0.0-20210209082852-35ace33082f5 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59 + github.com/ffurano/grpc-proto v0.0.0-20210312134900-65801a1ca184 github.com/go-ldap/ldap/v3 v3.2.4 github.com/go-openapi/errors v0.19.6 // indirect github.com/go-openapi/strfmt v0.19.2 // indirect diff --git a/go.sum b/go.sum index c94803a7bc..4048bf4865 100644 --- a/go.sum +++ b/go.sum @@ -163,6 +163,8 @@ github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/ffurano/grpc-proto v0.0.0-20210312134900-65801a1ca184 h1:8sEVFrVAFCen9fYexSRHOnJgkat6dWpCX9W+WZxxaKE= +github.com/ffurano/grpc-proto v0.0.0-20210312134900-65801a1ca184/go.mod h1:tVK5FalFRrPhludOXg3eSQ/9sMpi/b6mav+UHAm8OWc= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= diff --git a/pkg/eosclient/eosgrpc/eosgrpc.go b/pkg/eosclient/eosgrpc/eosgrpc.go index 793f758d1c..97c6660b3b 100644 --- a/pkg/eosclient/eosgrpc/eosgrpc.go +++ b/pkg/eosclient/eosgrpc/eosgrpc.go @@ -33,10 +33,12 @@ import ( "github.com/cs3org/reva/pkg/appctx" "github.com/cs3org/reva/pkg/eosclient" - erpc "github.com/cs3org/reva/pkg/eosclient/eosgrpc/eos_grpc" + + //erpc "github.com/cs3org/reva/pkg/eosclient/eosgrpc/eos_grpc" ehttp "github.com/cs3org/reva/pkg/eosclient/eosgrpc/eos_http" "github.com/cs3org/reva/pkg/errtypes" "github.com/cs3org/reva/pkg/storage/utils/acl" + erpc "github.com/ffurano/grpc-proto/protobuf" "github.com/pkg/errors" "github.com/rs/zerolog/log" "google.golang.org/grpc"