From 0e9691000c504bcb4375adfc284f4d3093bceec7 Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Tue, 2 Apr 2024 20:44:40 +0800
Subject: [PATCH] fix normalieze manifests issue

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 manifest/parse.go      | 31 ++++++++++++++++++-----------
 manifest/parse_test.go | 44 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/manifest/parse.go b/manifest/parse.go
index 552a5ba3..ce784de6 100644
--- a/manifest/parse.go
+++ b/manifest/parse.go
@@ -144,18 +144,11 @@ func parseContent(content string, defaultNamespace string, normalizeManifests bo
 	}
 
 	if normalizeManifests {
-		// Unmarshal and marshal again content to normalize yaml structure
-		// This avoids style differences to show up as diffs but it can
-		// make the output different from the original template (since it is in normalized form)
-		var object map[interface{}]interface{}
-		if err := yaml.Unmarshal([]byte(content), &object); err != nil {
-			log.Fatalf("YAML unmarshal error: %s\nCan't unmarshal %s", err, content)
-		}
-		normalizedContent, err := yaml.Marshal(object)
-		if err != nil {
-			log.Fatalf("YAML marshal error: %s\nCan't marshal %v", err, object)
+		var normalizeErr error
+		content, normalizeErr = ContentNormalizeManifests(content)
+		if normalizeErr != nil {
+			log.Fatalf("Error normalizing manifests: %v", normalizeErr)
 		}
-		content = string(normalizedContent)
 	}
 
 	if isHook(parsedMetadata, excludedHooks...) {
@@ -176,6 +169,22 @@ func parseContent(content string, defaultNamespace string, normalizeManifests bo
 	}, nil
 }
 
+func ContentNormalizeManifests(content string) (string, error) {
+	// Unmarshal and marshal again content to normalize yaml structure
+	// This avoids style differences to show up as diffs but it can
+	// make the output different from the original template (since it is in normalized form)
+	log.Printf("Normalizing content: \n%s", content)
+	var object map[interface{}]interface{}
+	if err := yaml.Unmarshal([]byte(content), &object); err != nil {
+		return "", err
+	}
+	normalizedContent, err := yaml.Marshal(object)
+	if err != nil {
+		return "", err
+	}
+	return string(normalizedContent), nil
+}
+
 func isHook(metadata metadata, hooks ...string) bool {
 	for _, hook := range hooks {
 		if metadata.Metadata.Annotations[hookAnnotation] == hook {
diff --git a/manifest/parse_test.go b/manifest/parse_test.go
index 1ae65f28..e22a7cc5 100644
--- a/manifest/parse_test.go
+++ b/manifest/parse_test.go
@@ -111,3 +111,47 @@ func TestBaseNameAnnotation(t *testing.T) {
 		foundObjects(Parse(string(spec), "default", false)),
 	)
 }
+func TestContentNormalizeManifests(t *testing.T) {
+	tests := []struct {
+		name           string
+		content        string
+		expectedOutput string
+		expectedError  error
+	}{
+		{
+			name: "Valid content",
+			content: `apiVersion: v1
+kind: Pod
+metadata:
+  name: my-pod
+spec:
+  containers:
+  - name: my-container
+    image: nginx`,
+			expectedOutput: `apiVersion: v1
+kind: Pod
+metadata:
+  name: my-pod
+spec:
+  containers:
+  - image: nginx
+    name: my-container
+`,
+			expectedError: nil,
+		},
+		{
+			name:           "Empty content",
+			content:        "",
+			expectedOutput: "{}\n",
+			expectedError:  nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			output, err := ContentNormalizeManifests(tt.content)
+			require.Equal(t, tt.expectedError, err)
+			require.Equal(t, tt.expectedOutput, output)
+		})
+	}
+}