Fixes for Delete

kubernetes-sigs · Jul 10, 2024 · 41a3d49 · 41a3d49
1 parent 98616b7
commit 41a3d49
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
@@ -128,11 +128,10 @@ func (d *Driver) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest)
 		return &csi.DeleteVolumeResponse{}, nil
 	}
 
-	//TODO: Add Delete File System when FS provisioning is implemented
 	if accessPointId != "" {
 		err := d.provisioners[AccessPointMode].Delete(ctx, req)
 		if err != nil {
-			return nil, status.Errorf(codes.Internal, "Failed to Delete volume %v: %v", volId, err)
+			return nil, err
 		}
 	} else {
 		return nil, status.Errorf(codes.NotFound, "Failed to find access point for volume: %v", volId)

diff --git a/pkg/driver/provisioner.go b/pkg/driver/provisioner.go
@@ -370,19 +370,18 @@ func (a AccessPointProvisioner) Delete(ctx context.Context, req *csi.DeleteVolum
 			return status.Errorf(codes.Internal, "Could not delete %q: %v", target, err)
 		}
 
-		// Delete access point
-		if err = localCloud.DeleteAccessPoint(ctx, accessPointId); err != nil {
-			if err == cloud.ErrAccessDenied {
-				return status.Errorf(codes.Unauthenticated, "Access Denied. Please ensure you have the right AWS permissions: %v", err)
-			}
-			if err == cloud.ErrNotFound {
-				klog.V(5).Infof("DeleteVolume: Access Point not found, returning success")
-				return nil
-			}
-			return status.Errorf(codes.Internal, "Failed to Delete volume %v: %v", volId, err)
+	}
+
+	// Delete access point
+	if err = localCloud.DeleteAccessPoint(ctx, accessPointId); err != nil {
+		if err == cloud.ErrAccessDenied {
+			return status.Errorf(codes.Unauthenticated, "Access Denied. Please ensure you have the right AWS permissions: %v", err)
 		}
-	} else {
-		return status.Errorf(codes.NotFound, "Failed to find access point for volume: %v", volId)
+		if err == cloud.ErrNotFound {
+			klog.V(5).Infof("DeleteVolume: Access Point not found, returning success")
+			return nil
+		}
+		return status.Errorf(codes.Internal, "Failed to Delete volume %v: %v", volId, err)
 	}
 
 	return nil