alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unit test and remove comments

Browse Source
This commit is contained in:
Raunak Pradip Shah
2024-01-05 18:14:35 -08:00
parent 0bd355cf29
commit e6dc65fefe
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/sidecar-controller/groupsnapshot_helper.go
View File

@@ -426,12 +426,6 @@ func (ctrl *csiSnapshotSideCarController) createGroupSnapshotWrapper(groupSnapsh
// Create individual snapshots and snapshot contents // Create individual snapshots and snapshot contents
var snapshotContentNames []string var snapshotContentNames []string
for _, snapshot := range snapshots { for _, snapshot := range snapshots {
/*
uuid, ok := uuidMap[snapshot.SourceVolumeId]
if !ok {
continue
}
*/
volumeSnapshotContentName := GetSnapshotContentNameForVolumeGroupSnapshotContent(string(groupSnapshotContent.UID), snapshot.SourceVolumeId) volumeSnapshotContentName := GetSnapshotContentNameForVolumeGroupSnapshotContent(string(groupSnapshotContent.UID), snapshot.SourceVolumeId)
volumeSnapshotName := GetSnapshotNameForVolumeGroupSnapshotContent(string(groupSnapshotContent.UID), snapshot.SourceVolumeId) volumeSnapshotName := GetSnapshotNameForVolumeGroupSnapshotContent(string(groupSnapshotContent.UID), snapshot.SourceVolumeId)
volumeSnapshotNamespace := groupSnapshotContent.Spec.VolumeGroupSnapshotRef.Namespace volumeSnapshotNamespace := groupSnapshotContent.Spec.VolumeGroupSnapshotRef.Namespace

24
pkg/validation-webhook/groupsnapshot_test.go
View File

@@ -248,11 +248,16 @@ func TestAdmitVolumeGroupSnapshotV1Alpha1(t *testing.T) {
func TestAdmitVolumeGroupSnapshotContentV1Alpha1(t *testing.T) { func TestAdmitVolumeGroupSnapshotContentV1Alpha1(t *testing.T) {
volumeHandle := "volumeHandle1" volumeHandle := "volumeHandle1"
modifiedField := "modified-field" modifiedRefName := "modified-ref-name"
groupSnapshotHandle := "groupsnapshotHandle1" groupSnapshotHandle := "groupsnapshotHandle1"
volumeSnapshotHandles := []string{"volumeSnapshotHandle1"}
groupSnapshotHandles := &volumegroupsnapshotv1alpha1.GroupSnapshotHandles{ groupSnapshotHandles := &volumegroupsnapshotv1alpha1.GroupSnapshotHandles{
VolumeGroupSnapshotHandle: "volumeGroupSnapshotHandle1", VolumeGroupSnapshotHandle: groupSnapshotHandle,
VolumeSnapshotHandles: []string{"volumeSnapshotHandle1", "volumeSnapshotHandle2"}, VolumeSnapshotHandles: volumeSnapshotHandles,
}
modifiedGroupSnapshotHandles := &volumegroupsnapshotv1alpha1.GroupSnapshotHandles{
VolumeGroupSnapshotHandle: groupSnapshotHandle,
VolumeSnapshotHandles: append(volumeSnapshotHandles, "volumeSnapshotHandle2"),
} }
volumeGroupSnapshotClassName := "volume-snapshot-class-1" volumeGroupSnapshotClassName := "volume-snapshot-class-1"
validContent := &volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContent{ validContent := &volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContent{
@@ -321,7 +326,7 @@ func TestAdmitVolumeGroupSnapshotContentV1Alpha1(t *testing.T) {
groupSnapContent: &volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContent{ groupSnapContent: &volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContent{
Spec: volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContentSpec{ Spec: volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContentSpec{
Source: volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContentSource{ Source: volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContentSource{
VolumeGroupSnapshotHandle: &modifiedField, GroupSnapshotHandles: modifiedGroupSnapshotHandles,
}, },
VolumeGroupSnapshotRef: core_v1.ObjectReference{ VolumeGroupSnapshotRef: core_v1.ObjectReference{
Name: "snapshot-ref", Name: "snapshot-ref",
@@ -332,17 +337,20 @@ func TestAdmitVolumeGroupSnapshotContentV1Alpha1(t *testing.T) {
oldGroupSnapContent: validContent, oldGroupSnapContent: validContent,
shouldAdmit: false, shouldAdmit: false,
operation: v1.Update, operation: v1.Update,
msg: fmt.Sprintf("Spec.Source.VolumeGroupSnapshotHandle is immutable but was changed from %s to %s", groupSnapshotHandle, modifiedField), msg: fmt.Sprintf("Spec.Source.GroupSnapshotHandles is immutable but was changed from %s to %s", groupSnapshotHandles, modifiedGroupSnapshotHandles),
}, },
{ {
name: "Update: old is valid and new is valid but modifies immutable ref", name: "Update: old is valid and new is valid but modifies immutable ref",
groupSnapContent: &volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContent{ groupSnapContent: &volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContent{
Spec: volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContentSpec{ Spec: volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContentSpec{
Source: volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContentSource{ Source: volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContentSource{
VolumeGroupSnapshotHandle: &groupSnapshotHandle, GroupSnapshotHandles: &volumegroupsnapshotv1alpha1.GroupSnapshotHandles{
VolumeGroupSnapshotHandle: groupSnapshotHandle,
VolumeSnapshotHandles: volumeSnapshotHandles,
},
}, },
VolumeGroupSnapshotRef: core_v1.ObjectReference{ VolumeGroupSnapshotRef: core_v1.ObjectReference{
Name: modifiedField, Name: modifiedRefName,
Namespace: "default-ns", Namespace: "default-ns",
}, },
}, },
@@ -351,7 +359,7 @@ func TestAdmitVolumeGroupSnapshotContentV1Alpha1(t *testing.T) {
shouldAdmit: false, shouldAdmit: false,
operation: v1.Update, operation: v1.Update,
msg: fmt.Sprintf("Spec.VolumeGroupSnapshotRef.Name is immutable but was changed from %s to %s", msg: fmt.Sprintf("Spec.VolumeGroupSnapshotRef.Name is immutable but was changed from %s to %s",
validContent.Spec.VolumeGroupSnapshotRef.Name, modifiedField), validContent.Spec.VolumeGroupSnapshotRef.Name, modifiedRefName),
}, },
{ {
name: "Update: old is invalid and new is valid", name: "Update: old is invalid and new is valid",