All observeFuncs make take into account existing OCI Digest in snapshots

Signed-off-by: Soule BA <bah.soule@gmail.com>
fluxcd · Apr 14, 2024 · 4ce7e3c · 4ce7e3c
1 parent 48fa9eb
commit 4ce7e3c
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 3 deletions.
diff --git a/internal/reconcile/rollback_remediation.go b/internal/reconcile/rollback_remediation.go
@@ -182,7 +182,9 @@ func observeRollback(obj *v2.HelmRelease) storage.ObserveFunc {
 		for i := range obj.Status.History {
 			snap := obj.Status.History[i]
 			if snap.Targets(rls.Name, rls.Namespace, rls.Version) {
-				newSnap := release.ObservedToSnapshot(release.ObserveRelease(rls))
+				obs := release.ObserveRelease(rls)
+				obs.OCIDigest = snap.OCIDigest
+				newSnap := release.ObservedToSnapshot(obs)
 				newSnap.SetTestHooks(snap.GetTestHooks())
 				obj.Status.History[i] = newSnap
 				return

diff --git a/internal/reconcile/rollback_remediation_test.go b/internal/reconcile/rollback_remediation_test.go
@@ -613,4 +613,47 @@ func Test_observeRollback(t *testing.T) {
 			expect,
 		}))
 	})
+
+	t.Run("rollback with update to previous deployed with OCI Digest", func(t *testing.T) {
+		g := NewWithT(t)
+
+		previous := &v2.Snapshot{
+			Name:      mockReleaseName,
+			Namespace: mockReleaseNamespace,
+			Version:   2,
+			Status:    helmrelease.StatusFailed.String(),
+			OCIDigest: "sha256:fcdc2b0de1581a3633ada4afee3f918f6eaa5b5ab38c3fef03d5b48d3f85d9f6",
+		}
+		latest := &v2.Snapshot{
+			Name:      mockReleaseName,
+			Namespace: mockReleaseNamespace,
+			Version:   3,
+			Status:    helmrelease.StatusDeployed.String(),
+			OCIDigest: "sha256:aedc2b0de1576a3633ada4afee3f918f6eaa5b5ab38c3fef03d5b48d3f85d9f6",
+		}
+
+		obj := &v2.HelmRelease{
+			Status: v2.HelmReleaseStatus{
+				History: v2.Snapshots{
+					latest,
+					previous,
+				},
+			},
+		}
+		rls := helmrelease.Mock(&helmrelease.MockReleaseOptions{
+			Name:      previous.Name,
+			Namespace: previous.Namespace,
+			Version:   previous.Version,
+			Status:    helmrelease.StatusSuperseded,
+		})
+		obs := release.ObserveRelease(rls)
+		obs.OCIDigest = "sha256:fcdc2b0de1581a3633ada4afee3f918f6eaa5b5ab38c3fef03d5b48d3f85d9f6"
+		expect := release.ObservedToSnapshot(obs)
+
+		observeRollback(obj)(rls)
+		g.Expect(obj.Status.History).To(testutil.Equal(v2.Snapshots{
+			latest,
+			expect,
+		}))
+	})
 }
diff --git a/internal/reconcile/test.go b/internal/reconcile/test.go
@@ -200,7 +200,10 @@ func observeTest(obj *v2.HelmRelease) storage.ObserveFunc {
 		}
 
 		// Update the latest snapshot with the test result.
-		tested := release.ObservedToSnapshot(release.ObserveRelease(rls))
+		latest := obj.Status.History.Latest()
+		obs := release.ObserveRelease(rls)
+		obs.OCIDigest = latest.OCIDigest
+		tested := release.ObservedToSnapshot(obs)
 		tested.SetTestHooks(release.TestHooksFromRelease(rls))
 		obj.Status.History[0] = tested
 	}

diff --git a/internal/reconcile/test_test.go b/internal/reconcile/test_test.go
@@ -376,6 +376,38 @@ func Test_observeTest(t *testing.T) {
 		}))
 	})
 
+	t.Run("test with current OCI Digest", func(t *testing.T) {
+		g := NewWithT(t)
+
+		obj := &v2.HelmRelease{
+			Status: v2.HelmReleaseStatus{
+				History: v2.Snapshots{
+					&v2.Snapshot{
+						Name:      mockReleaseName,
+						Namespace: mockReleaseNamespace,
+						Version:   1,
+						OCIDigest: "sha256:fcdc2b0de1581a3633ada4afee3f918f6eaa5b5ab38c3fef03d5b48d3f85d9f6",
+					},
+				},
+			},
+		}
+		rls := testutil.BuildRelease(&helmrelease.MockReleaseOptions{
+			Name:      mockReleaseName,
+			Namespace: mockReleaseNamespace,
+			Version:   1,
+		}, testutil.ReleaseWithHooks(testHookFixtures))
+
+		obs := release.ObserveRelease(rls)
+		obs.OCIDigest = "sha256:fcdc2b0de1581a3633ada4afee3f918f6eaa5b5ab38c3fef03d5b48d3f85d9f6"
+		expect := release.ObservedToSnapshot(obs)
+		expect.SetTestHooks(release.TestHooksFromRelease(rls))
+
+		observeTest(obj)(rls)
+		g.Expect(obj.Status.History).To(testutil.Equal(v2.Snapshots{
+			expect,
+		}))
+	})
+
 	t.Run("test targeting different version than latest", func(t *testing.T) {
 		g := NewWithT(t)
 

diff --git a/internal/reconcile/uninstall.go b/internal/reconcile/uninstall.go
@@ -224,7 +224,9 @@ func observeUninstall(obj *v2.HelmRelease) storage.ObserveFunc {
 		for i := range obj.Status.History {
 			snap := obj.Status.History[i]
 			if snap.Targets(rls.Name, rls.Namespace, rls.Version) {
-				newSnap := release.ObservedToSnapshot(release.ObserveRelease(rls))
+				obs := release.ObserveRelease(rls)
+				obs.OCIDigest = snap.OCIDigest
+				newSnap := release.ObservedToSnapshot(obs)
 				newSnap.SetTestHooks(snap.GetTestHooks())
 				obj.Status.History[i] = newSnap
 				return

diff --git a/internal/reconcile/uninstall_test.go b/internal/reconcile/uninstall_test.go
@@ -702,4 +702,36 @@ func Test_observeUninstall(t *testing.T) {
 			current,
 		}))
 	})
+	t.Run("uninstall of current with OCI Digest", func(t *testing.T) {
+		g := NewWithT(t)
+
+		current := &v2.Snapshot{
+			Name:      mockReleaseName,
+			Namespace: mockReleaseNamespace,
+			Version:   1,
+			Status:    helmrelease.StatusDeployed.String(),
+			OCIDigest: "sha256:fcdc2b0de1581a3633ada4afee3f918f6eaa5b5ab38c3fef03d5b48d3f85d9f6",
+		}
+		obj := &v2.HelmRelease{
+			Status: v2.HelmReleaseStatus{
+				History: v2.Snapshots{
+					current,
+				},
+			},
+		}
+		rls := testutil.BuildRelease(&helmrelease.MockReleaseOptions{
+			Name:      current.Name,
+			Namespace: current.Namespace,
+			Version:   current.Version,
+			Status:    helmrelease.StatusUninstalled,
+		})
+		obs := release.ObserveRelease(rls)
+		obs.OCIDigest = "sha256:fcdc2b0de1581a3633ada4afee3f918f6eaa5b5ab38c3fef03d5b48d3f85d9f6"
+		expect := release.ObservedToSnapshot(obs)
+
+		observeUninstall(obj)(rls)
+		g.Expect(obj.Status.History).To(testutil.Equal(v2.Snapshots{
+			expect,
+		}))
+	})
 }