From d7f67032dffb5a445084e6f2b374d5e9ab198a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Tue, 25 Jan 2022 14:56:55 +0100 Subject: [PATCH] Remove unfinished GetPath() code --- .../sharesstorageprovider.go | 19 +------------------ .../sharesstorageprovider_test.go | 18 ------------------ 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go index 622c3f1c0ef..2aae3fd8bf1 100644 --- a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go +++ b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go @@ -285,24 +285,7 @@ func (s *service) GetPath(ctx context.Context, req *provider.GetPathRequest) (*p // - getPath of every received share on the same space - needs also owner permissions -> needs machine auth // - find the shortest root path that is a prefix of the resource path // alternatively implement this on storageprovider - it needs to know about grants to do so - - receivedShare, rpcStatus, err := s.resolveReference(ctx, &provider.Reference{ResourceId: req.ResourceId}) - appctx.GetLogger(ctx).Debug(). - Interface("resourceId", req.ResourceId). - Interface("received_share", receivedShare). - Msg("sharesstorageprovider: Got GetPath request") - if err != nil { - return nil, err - } - if rpcStatus != nil { - return &provider.GetPathResponse{ - Status: rpcStatus, - }, nil - } - - return s.gateway.GetPath(ctx, &provider.GetPathRequest{ - ResourceId: receivedShare.Share.ResourceId, - }) + return nil, gstatus.Errorf(codes.Unimplemented, "method not implemented") } func (s *service) GetHome(ctx context.Context, req *provider.GetHomeRequest) (*provider.GetHomeResponse, error) { diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go index 8944f99c69b..cbd1628ca8b 100644 --- a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go +++ b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go @@ -298,24 +298,6 @@ var _ = Describe("Sharesstorageprovider", func() { }, nil) }) - Describe("GetPath", func() { - It("returns the path", func() { - gw.On("GetPath", mock.Anything, mock.Anything).Return(&sprovider.GetPathResponse{ - Status: status.NewOK(context.Background()), - Path: "/shareddir", - }, nil) - res, err := s.GetPath(ctx, &sprovider.GetPathRequest{ - ResourceId: &sprovider.ResourceId{ - StorageId: utils.ShareStorageProviderID, - OpaqueId: "shareddir", - }, - }) - Expect(err).ToNot(HaveOccurred()) - Expect(res.Status.Code).To(Equal(rpc.Code_CODE_OK)) - Expect(res.Path).To(Equal("/shareddir")) - }) - }) - Describe("Stat", func() { It("stats the root shares folder", func() { res, err := s.Stat(ctx, BaseStatRequest)