Merge pull request kubernetes-sigs#123 from ZeroMagic/mismatching

fix: return empty when the specify source volume id does not exist
levimm · Jul 12, 2019 · d7ae3eb · d7ae3eb
2 parents 9be575a + 888db51
commit d7ae3eb
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/pkg/azuredisk/controllerserver.go b/pkg/azuredisk/controllerserver.go
@@ -543,14 +543,23 @@ func (d *Driver) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsReques
 	if err != nil {
 		return nil, status.Error(codes.Internal, fmt.Sprintf("Unknown list snapshot error: %v", err))
 	}
+	match := false
 	entries := []*csi.ListSnapshotsResponse_Entry{}
 	for _, snapshot := range snapshotListPage.Values() {
+		if req.SourceVolumeId == getSourceVolumeId(&snapshot) {
+			match = true
+		}
 		csiSnapshot, err := generateCSISnapshot(req.SourceVolumeId, &snapshot)
 		if err != nil {
 			return nil, fmt.Errorf("failed to generate snapshot entry: %v", err)
 		}
 		entries = append(entries, &csi.ListSnapshotsResponse_Entry{Snapshot: csiSnapshot})
 	}
+	// return empty if SourceVolumeId is not empty and does not match the listed snapshot's SourceVolumeId
+	if req.SourceVolumeId != "" && !match {
+		return &csi.ListSnapshotsResponse{}, nil
+	}
+
 	nextToken := ""
 	if snapshotListPage.Response().NextLink != nil {
 		nextToken = *snapshotListPage.Response().NextLink