fix: handle null input in deleteStatusAndTidyMetadata

- Return nil without panic when JSON input is null
- Safely handle missing metadata field with type assertion
- Add test case for null JSON input

Signed-off-by: yxxhero <aiopsclub@163.com>

Author: yxxhero

manifest/generate.go

@@ -248,6 +248,9 @@ func cleanMetadataForPatch(data []byte) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
+	if objMap == nil {
+		return []byte("null"), nil
+	}
 	return json.Marshal(objMap)
 }
 

manifest/util.go

@@ -6,27 +6,32 @@ import (
 	jsoniter "github.com/json-iterator/go"
 )
 
-func deleteStatusAndTidyMetadata(obj []byte) (map[string]interface{}, error) {
-	var objectMap map[string]interface{}
+func deleteStatusAndTidyMetadata(obj []byte) (map[string]any, error) {
+	var objectMap map[string]any
 	err := jsoniter.Unmarshal(obj, &objectMap)
 	if err != nil {
 		return nil, fmt.Errorf("could not unmarshal byte sequence: %w", err)
 	}
 
+	if objectMap == nil {
+		return nil, nil
+	}
+
 	delete(objectMap, "status")
 
-	metadata := objectMap["metadata"].(map[string]interface{})
+	metadata, ok := objectMap["metadata"].(map[string]any)
+	if !ok {
+		return objectMap, nil
+	}
 
 	delete(metadata, "managedFields")
 	delete(metadata, "generation")
 	delete(metadata, "creationTimestamp")
 	delete(metadata, "resourceVersion")
 	delete(metadata, "uid")
 
-	// See the below for the goal of this metadata tidy logic.
-	// https://github.com/databus23/helm-diff/issues/326#issuecomment-1008253274
 	if a := metadata["annotations"]; a != nil {
-		annotations := a.(map[string]interface{})
+		annotations := a.(map[string]any)
 		delete(annotations, "meta.helm.sh/release-name")
 		delete(annotations, "meta.helm.sh/release-namespace")
 		delete(annotations, "deployment.kubernetes.io/revision")

manifest/util_test.go

@@ -10,7 +10,7 @@ func Test_deleteStatusAndTidyMetadata(t *testing.T) {
 	tests := []struct {
 		name    string
 		obj     []byte
-		want    map[string]interface{}
+		want    map[string]any
 		wantErr bool
 	}{
 		{
@@ -19,6 +19,12 @@ func Test_deleteStatusAndTidyMetadata(t *testing.T) {
 			want:    nil,
 			wantErr: true,
 		},
+		{
+			name:    "null json",
+			obj:     []byte("null"),
+			want:    nil,
+			wantErr: false,
+		},
 		{
 			name: "valid json",
 			obj: []byte(`
@@ -57,21 +63,21 @@ func Test_deleteStatusAndTidyMetadata(t *testing.T) {
     }
 }
 `),
-			want: map[string]interface{}{
+			want: map[string]any{
 				"apiVersion": "apps/v1",
 				"kind":       "Deployment",
-				"metadata": map[string]interface{}{
-					"annotations": map[string]interface{}{
+				"metadata": map[string]any{
+					"annotations": map[string]any{
 						"other-annot": "value",
 					},
 					"name":      "nginx-deployment",
 					"namespace": "test-ns",
 				},
-				"spec": map[string]interface{}{
-					"template": map[string]interface{}{
-						"spec": map[string]interface{}{
-							"containers": []interface{}{
-								map[string]interface{}{
+				"spec": map[string]any{
+					"template": map[string]any{
+						"spec": map[string]any{
+							"containers": []any{
+								map[string]any{
 									"image":           "nginx:1.14.2",
 									"imagePullPolicy": "IfNotPresent",
 									"name":            "nginx",