fix: ApplicationSource.Equal return false negative

when comparing string with escaped and unescaped representation.

Signed-off-by: Nattawit Chaiworawitsakul <c.nattawit@gmail.com>

pkg/apis/application/v1alpha1/types.go

@@ -1,6 +1,7 @@
 package v1alpha1
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"math"
@@ -2821,9 +2822,23 @@ func (source *ApplicationSource) Equals(other *ApplicationSource) bool {
 	otherCopy := other.DeepCopy()
 	sourceCopy.Plugin = nil
 	otherCopy.Plugin = nil
+	sourceCopy.htmlEscape()
+	otherCopy.htmlEscape()
 	return reflect.DeepEqual(sourceCopy, otherCopy)
 }
 
+func (source *ApplicationSource) htmlEscape() {
+	if source.Helm != nil {
+		if source.Helm.ValuesObject != nil {
+			if source.Helm.ValuesObject.Raw != nil {
+				var buf bytes.Buffer
+				json.HTMLEscape(&buf, source.Helm.ValuesObject.Raw)
+				source.Helm.ValuesObject.Raw = buf.Bytes()
+			}
+		}
+	}
+}
+
 // ExplicitType returns the type (e.g. Helm, Kustomize, etc) of the application. If either none or multiple types are defined, returns an error.
 func (source *ApplicationSource) ExplicitType() (*ApplicationSourceType, error) {
 	var appTypes []ApplicationSourceType

pkg/apis/application/v1alpha1/types_test.go

@@ -1286,6 +1286,27 @@ func TestApplicationSource_IsZero(t *testing.T) {
 	}
 }
 
+func TestApplicationSource_Equals(t *testing.T) {
+	t.Run("Escaped Characters", func(t *testing.T) {
+		src1 := ApplicationSource{
+			Helm: &ApplicationSourceHelm{
+				ValuesObject: &runtime.RawExtension{
+					Raw: []byte(`{"Test":"test&<>

"}`),
+				},
+			},
+		}
+		src2 := ApplicationSource{
+			Helm: &ApplicationSourceHelm{
+				ValuesObject: &runtime.RawExtension{
+					Raw: []byte(`{"Test":"test\u0026\u003c\u003e\u2028\u2029"}`),
+				},
+			},
+		}
+
+		assert.True(t, src1.Equals(&src2))
+	})
+}
+
 func TestApplicationSourceHelm_AddParameter(t *testing.T) {
 	src := ApplicationSourceHelm{}
 	t.Run("Add", func(t *testing.T) {