Revert "Updating Snapshot test to fix update errors (CrunchyData#4160)"

This reverts commit 7383f6b.

Author: andrewlecuyer

internal/controller/postgrescluster/snapshots_test.go

@@ -72,7 +72,7 @@ func TestReconcileVolumeSnapshots(t *testing.T) {
 		volumeSnapshotClassName := "my-snapshotclass"
 		snapshot, err := r.generateVolumeSnapshot(cluster, *pvc, volumeSnapshotClassName)
 		assert.NilError(t, err)
-		assert.NilError(t, r.Client.Create(ctx, snapshot))
+		assert.NilError(t, r.apply(ctx, snapshot))
 
 		// Get all snapshots for this cluster and assert 1 exists
 		selectSnapshots, err := naming.AsSelector(naming.Cluster(cluster.Name))
@@ -240,7 +240,7 @@ func TestReconcileVolumeSnapshots(t *testing.T) {
 			},
 		}
 		assert.NilError(t, r.setControllerReference(cluster, snapshot1))
-		assert.NilError(t, r.Client.Create(ctx, snapshot1))
+		assert.NilError(t, r.apply(ctx, snapshot1))
 
 		// Update snapshot status
 		truePtr := initialize.Bool(true)
@@ -272,7 +272,7 @@ func TestReconcileVolumeSnapshots(t *testing.T) {
 			},
 		}
 		assert.NilError(t, r.setControllerReference(cluster, snapshot2))
-		assert.NilError(t, r.Client.Create(ctx, snapshot2))
+		assert.NilError(t, r.apply(ctx, snapshot2))
 
 		// Update second snapshot's status
 		snapshot2.Status = &volumesnapshotv1.VolumeSnapshotStatus{
@@ -396,7 +396,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 		spec := testVolumeClaimSpec()
 		pvc.Spec = spec.AsPersistentVolumeClaimSpec()
 		assert.NilError(t, r.setControllerReference(cluster, pvc))
-		assert.NilError(t, r.Client.Create(ctx, pvc))
+		assert.NilError(t, r.apply(ctx, pvc))
 
 		// Assert that the pvc was created
 		selectPvcs, err := naming.AsSelector(naming.Cluster(cluster.Name))
@@ -476,7 +476,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 		// Create successful backup job
 		backupJob := testBackupJob(cluster)
 		assert.NilError(t, r.setControllerReference(cluster, backupJob))
-		assert.NilError(t, r.Client.Create(ctx, backupJob))
+		assert.NilError(t, r.apply(ctx, backupJob))
 
 		currentTime := metav1.Now()
 		startTime := metav1.NewTime(currentTime.AddDate(0, 0, -1))
@@ -530,7 +530,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 		// Create successful backup job
 		backupJob := testBackupJob(cluster)
 		assert.NilError(t, r.setControllerReference(cluster, backupJob))
-		assert.NilError(t, r.Client.Create(ctx, backupJob))
+		assert.NilError(t, r.apply(ctx, backupJob))
 
 		backupJob.Status = succeededJobStatus(earlierStartTime, earlierTime)
 		assert.NilError(t, r.Client.Status().Update(ctx, backupJob))
@@ -541,7 +541,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 			naming.PGBackRestBackupJobCompletion: backupJob.Status.CompletionTime.Format(time.RFC3339),
 		}
 		assert.NilError(t, r.setControllerReference(cluster, restoreJob))
-		assert.NilError(t, r.Client.Create(ctx, restoreJob))
+		assert.NilError(t, r.apply(ctx, restoreJob))
 
 		restoreJob.Status = succeededJobStatus(currentStartTime, currentTime)
 		assert.NilError(t, r.Client.Status().Update(ctx, restoreJob))
@@ -594,7 +594,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 		// Create successful backup job
 		backupJob := testBackupJob(cluster)
 		assert.NilError(t, r.setControllerReference(cluster, backupJob))
-		assert.NilError(t, r.Client.Create(ctx, backupJob))
+		assert.NilError(t, r.apply(ctx, backupJob))
 
 		backupJob.Status = succeededJobStatus(startTime, earlierTime)
 		assert.NilError(t, r.Client.Status().Update(ctx, backupJob))
@@ -605,7 +605,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
 			naming.PGBackRestBackupJobCompletion: backupJob.Status.CompletionTime.Format(time.RFC3339),
 		}
 		assert.NilError(t, r.setControllerReference(cluster, restoreJob))
-		assert.NilError(t, r.Client.Create(ctx, restoreJob))
+		assert.NilError(t, r.apply(ctx, restoreJob))
 
 		restoreJob.Status = batchv1.JobStatus{
 			Succeeded: 0,
@@ -787,7 +787,7 @@ func TestGetDedicatedSnapshotVolumeRestoreJob(t *testing.T) {
 		job1 := testRestoreJob(cluster)
 		job1.Namespace = ns.Name
 
-		err := r.Client.Create(ctx, job1)
+		err := r.apply(ctx, job1)
 		assert.NilError(t, err)
 
 		dsvRestoreJob, err := r.getDedicatedSnapshotVolumeRestoreJob(ctx, cluster)
@@ -803,14 +803,14 @@ func TestGetDedicatedSnapshotVolumeRestoreJob(t *testing.T) {
 			naming.PGBackRestBackupJobCompletion: "backup-timestamp",
 		}
 
-		err := r.Client.Create(ctx, job2)
+		err := r.apply(ctx, job2)
 		assert.NilError(t, err)
 
 		job3 := testRestoreJob(cluster)
 		job3.Name = "restore-job-3"
 		job3.Namespace = ns.Name
 
-		assert.NilError(t, r.Client.Create(ctx, job3))
+		assert.NilError(t, r.apply(ctx, job3))
 
 		dsvRestoreJob, err := r.getDedicatedSnapshotVolumeRestoreJob(ctx, cluster)
 		assert.NilError(t, err)
@@ -842,7 +842,7 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
 		job1 := testBackupJob(cluster)
 		job1.Namespace = ns.Name
 
-		err := r.Client.Create(ctx, job1)
+		err := r.apply(ctx, job1)
 		assert.NilError(t, err)
 
 		latestCompleteBackupJob, err := r.getLatestCompleteBackupJob(ctx, cluster)
@@ -867,7 +867,7 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
 		job2.Namespace = ns.Name
 		job2.Name = "backup-job-2"
 
-		assert.NilError(t, r.Client.Create(ctx, job2))
+		assert.NilError(t, r.apply(ctx, job2))
 
 		// Get job1 and update Status.
 		assert.NilError(t, r.Client.Get(ctx, client.ObjectKeyFromObject(job1), job1))
@@ -1054,7 +1054,7 @@ func TestGetSnapshotsForCluster(t *testing.T) {
 		}
 		snapshot.Spec.Source.PersistentVolumeClaimName = initialize.String("some-pvc-name")
 		snapshot.Spec.VolumeSnapshotClassName = initialize.String("some-class-name")
-		assert.NilError(t, r.Client.Create(ctx, snapshot))
+		assert.NilError(t, r.apply(ctx, snapshot))
 
 		snapshots, err := r.getSnapshotsForCluster(ctx, cluster)
 		assert.NilError(t, err)
@@ -1095,7 +1095,7 @@ func TestGetSnapshotsForCluster(t *testing.T) {
 		}
 		snapshot2.Spec.Source.PersistentVolumeClaimName = initialize.String("another-pvc-name")
 		snapshot2.Spec.VolumeSnapshotClassName = initialize.String("another-class-name")
-		assert.NilError(t, r.Client.Create(ctx, snapshot2))
+		assert.NilError(t, r.apply(ctx, snapshot2))
 
 		snapshots, err := r.getSnapshotsForCluster(ctx, cluster)
 		assert.NilError(t, err)
@@ -1287,7 +1287,7 @@ func TestDeleteSnapshots(t *testing.T) {
 			},
 		}
 		assert.NilError(t, r.setControllerReference(rhinoCluster, snapshot1))
-		assert.NilError(t, r.Client.Create(ctx, snapshot1))
+		assert.NilError(t, r.apply(ctx, snapshot1))
 
 		snapshots := []*volumesnapshotv1.VolumeSnapshot{
 			snapshot1,
@@ -1337,7 +1337,7 @@ func TestDeleteSnapshots(t *testing.T) {
 			},
 		}
 		assert.NilError(t, r.setControllerReference(cluster, snapshot2))
-		assert.NilError(t, r.Client.Create(ctx, snapshot2))
+		assert.NilError(t, r.apply(ctx, snapshot2))
 
 		snapshots := []*volumesnapshotv1.VolumeSnapshot{
 			snapshot1, snapshot2,