use PrettyMarshal

duc-cnzj · Oct 8, 2023 · ac79e6d · ac79e6d
1 parent 15776c3
commit ac79e6d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/internal/socket/manager.go b/internal/socket/manager.go
@@ -749,7 +749,7 @@ func (s mergeYamlString) MarshalYAML() (any, error) {
 	var merged map[string]any
 	provider.Get("").Populate(&merged)
 
-	out, _ := yaml.Marshal(&merged)
+	out, _ := utils.PrettyMarshal(&merged)
 
 	return string(out), nil
 }

diff --git a/internal/socket/manager_test.go b/internal/socket/manager_test.go
@@ -1528,14 +1528,31 @@ func Test_defaultLoaders(t *testing.T) {
 }
 
 func Test_mergeYamlString_MarshalYAML(t *testing.T) {
-	s := mergeYamlString{`
+	s := mergeYamlString{
+		`
 user:
   name: duc
-`, `
+`,
+		`
 user:
   age: 18
-`}
+`,
+		`user:
+  new_age: |
+    name: duc
+    age: 18  
+    content: x
+`,
+	}
 	marshalYAML, _ := s.MarshalYAML()
+	assert.Equal(t, `user:
+  age: 18
+  name: duc
+  new_age: |
+    name: duc
+    age: 18  
+    content: x
+`, marshalYAML.(string))
 	m := map[string]any{}
 	yaml.Unmarshal([]byte(marshalYAML.(string)), &m)
 	assert.Equal(t, 18, m["user"].(map[string]any)["age"])