From 628b6cbae54099a369a7e3e64438a7ed9888eb4c Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hidde@hhh.computer>
Date: Fri, 3 Nov 2023 13:16:50 +0100
Subject: [PATCH] action: simplify chart diff logic

We actually only care about the chart name or version changing, as we
assume proper (immutable) versioning by the publisher of the chart
(either the user, or the source-controller).

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
---
 internal/action/verify.go  |  8 +++-----
 internal/chartutil/diff.go | 30 ------------------------------
 2 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 internal/chartutil/diff.go

diff --git a/internal/action/verify.go b/internal/action/verify.go
index 49b043a86..83070c8f6 100644
--- a/internal/action/verify.go
+++ b/internal/action/verify.go
@@ -38,7 +38,7 @@ var (
 	ErrReleaseNotObserved = errors.New("release not observed to be made for object")
 	ErrReleaseDigest      = errors.New("release digest verification error")
 	ErrChartChanged       = errors.New("release chart changed")
-	ErrConfigDigest       = errors.New("release config digest verification error")
+	ErrConfigDigest       = errors.New("release config values changed")
 )
 
 // ReleaseTargetChanged returns true if the given release and/or chart
@@ -157,10 +157,8 @@ func VerifyRelease(rls *helmrelease.Release, snapshot *v2.Snapshot, chrt *helmch
 		return ErrReleaseNotFound
 	}
 
-	if chrt != nil {
-		if _, eq := chartutil.DiffMeta(*rls.Chart.Metadata, *chrt); !eq {
-			return ErrChartChanged
-		}
+	if chrt != nil && (rls.Chart.Metadata.Name != chrt.Name || rls.Chart.Metadata.Version != chrt.Version) {
+		return ErrChartChanged
 	}
 
 	if snapshot == nil || !chartutil.VerifyValues(digest.Digest(snapshot.ConfigDigest), vals) {
diff --git a/internal/chartutil/diff.go b/internal/chartutil/diff.go
deleted file mode 100644
index fc385d941..000000000
--- a/internal/chartutil/diff.go
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2022 The Flux authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package chartutil
-
-import (
-	"github.com/google/go-cmp/cmp"
-	"helm.sh/helm/v3/pkg/chart"
-)
-
-// DiffMeta returns if the two chart.Metadata differ.
-func DiffMeta(x, y chart.Metadata) (diff string, eq bool) {
-	if diff := cmp.Diff(x, y); diff != "" {
-		return diff, false
-	}
-	return "", true
-}