Merge pull request #4480 from micbar/revert-cross-storage-move

fix: revert the status code denied moves
cs3org · Jan 26, 2024 · 22272e6 · 22272e6
2 parents bec9d4c + fb514b7
commit 22272e6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/changelog/unreleased/fix-statuscode-move-denied.md b/changelog/unreleased/fix-statuscode-move-denied.md
diff --git a/internal/grpc/services/gateway/storageprovider.go b/internal/grpc/services/gateway/storageprovider.go
@@ -709,7 +709,7 @@ func (s *svc) Move(ctx context.Context, req *provider.MoveRequest) (*provider.Mo
 
  if sourceProviderInfo.Address != destProviderInfo.Address {
  return &provider.MoveResponse{
- Status: status.NewPermissionDenied(ctx, nil, "cross storage moves are not permitted, use copy and delete"),
+ Status: status.NewUnimplemented(ctx, nil, "cross storage moves are not supported, use copy and delete"),
  }, nil
  }
 

diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go
@@ -667,7 +667,7 @@ func (s *service) Move(ctx context.Context, req *provider.MoveRequest) (*provide
 
  if dstReceivedShare.Share.Id.OpaqueId != srcReceivedShare.Share.Id.OpaqueId {
  return &provider.MoveResponse{
- Status: status.NewPermissionDenied(ctx, nil, "cross storage moves are not permitted, use copy and delete"),
+ Status: status.NewUnimplemented(ctx, nil, "cross storage moves are not supported, use copy and delete"),
  }, nil
  }
 

diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go
@@ -808,7 +808,7 @@ var _ = Describe("Sharesstorageprovider", func() {
  gatewayClient.AssertNotCalled(GinkgoT(), "Move", mock.Anything, mock.Anything)
  Expect(err).ToNot(HaveOccurred())
  Expect(res).ToNot(BeNil())
- Expect(res.Status.Code).To(Equal(rpc.Code_CODE_PERMISSION_DENIED))
+ Expect(res.Status.Code).To(Equal(rpc.Code_CODE_UNIMPLEMENTED))
  })
 
  It("refuses to move a file between shares resolving to the same space", func() {
@@ -826,7 +826,7 @@ var _ = Describe("Sharesstorageprovider", func() {
  gatewayClient.AssertNotCalled(GinkgoT(), "Move", mock.Anything, mock.Anything)
  Expect(err).ToNot(HaveOccurred())
  Expect(res).ToNot(BeNil())
- Expect(res.Status.Code).To(Equal(rpc.Code_CODE_PERMISSION_DENIED))
+ Expect(res.Status.Code).To(Equal(rpc.Code_CODE_UNIMPLEMENTED))
  })
 
  It("moves a file", func() {