refactor: remove extra code

Signed-off-by: Shivanjan Chakravorty <[email protected]>
libopenstorage · Aug 10, 2023 · 048df5b · 048df5b
1 parent 2bdbb1e
commit 048df5b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/csi/controller.go b/csi/controller.go
@@ -1155,7 +1155,7 @@ func (s *OsdCsiServer) deleteCloudBackup(
  backupID := req.GetSnapshotId()
 
  // Delete snapshot
- resp, err := cloudBackupClient.Delete(ctx, &api.SdkCloudBackupDeleteRequest{
+ _, err = cloudBackupClient.Delete(ctx, &api.SdkCloudBackupDeleteRequest{
  BackupId: backupID,
  CredentialId: credentialID,
  })
@@ -1166,12 +1166,7 @@ func (s *OsdCsiServer) deleteCloudBackup(
  }
  return nil, status.Errorf(codes.Aborted, "failed to delete cloud snapshot: %v", err)
  }
-
- if resp != nil {
- return &csi.DeleteSnapshotResponse{}, nil
- }
-
- return nil, status.Errorf(codes.Aborted, "unexpected error occured: %v", err)
+ return &csi.DeleteSnapshotResponse{}, nil
 }
 
 // ListSnapshots lists all snapshots in a cluster.

diff --git a/csi/controller_test.go b/csi/controller_test.go
@@ -3652,20 +3652,6 @@ func TestOsdCsiServer_DeleteCloudSnapshot(t *testing.T) {
  nil,
  true,
  },
- {
- "volume id not found while deleting",
- "delete-notfound",
- "valid-cred",
- nil,
- true,
- },
- {
- "unexpected error",
- "unexpected-error",
- "valid-cred",
- &csi.DeleteSnapshotResponse{},
- true,
- },
  {
  "deletion completes without any error",
  "ok",