Merge pull request #494 from nixpanic/GroupControllerServer

GetVolumeGroupSnapshot should check SnapshotIDs not SourceVolumeIDs

Author: k8s-ci-robot

pkg/hostpath/groupcontrollerserver.go

@@ -237,7 +237,7 @@ func (hp *hostPath) GetVolumeGroupSnapshot(ctx context.Context, req *csi.GetVolu
 		return nil, err
 	}
 
-	if !groupSnapshot.MatchesSourceVolumeIDs(req.GetSnapshotIds()) {
+	if !groupSnapshot.MatchesSnapshotIDs(req.GetSnapshotIds()) {
 		return nil, status.Error(codes.InvalidArgument, "Snapshot IDs do not match the GroupSnapshot IDs")
 	}
 

pkg/state/state.go

@@ -338,18 +338,24 @@ func (s *state) DeleteGroupSnapshot(groupSnapshotID string) error {
 }
 
 func (gs *GroupSnapshot) MatchesSourceVolumeIDs(sourceVolumeIDs []string) bool {
-	stateSourceVolumeIDs := gs.SourceVolumeIDs
+	return equalIDs(gs.SourceVolumeIDs, sourceVolumeIDs)
+}
+
+func (gs *GroupSnapshot) MatchesSnapshotIDs(snapshotIDs []string) bool {
+	return equalIDs(gs.SnapshotIDs, snapshotIDs)
+}
 
-	if len(stateSourceVolumeIDs) != len(sourceVolumeIDs) {
+func equalIDs(a, b []string) bool {
+	if len(a) != len(b) {
 		return false
 	}
 
 	// sort slices so that values are at the same location
-	sort.Strings(stateSourceVolumeIDs)
-	sort.Strings(sourceVolumeIDs)
+	sort.Strings(a)
+	sort.Strings(b)
 
-	for i, v := range stateSourceVolumeIDs {
-		if v != sourceVolumeIDs[i] {
+	for i, v := range a {
+		if v != b[i] {
 			return false
 		}
 	}