Merge pull request #254 from Thiht/fix/BodyMatcher

gwleclerc · web-flow · commit 8bd871e15c38 · 2022-11-23T00:32:11.000+01:00
fix: MarshalYAML method for BodyMatcher which caused problems during the persistence of mocks
diff --git a/server/types/matchers.go b/server/types/matchers.go
@@ -8,7 +8,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/smartystreets/assertions"
 	"github.com/stretchr/objx"
-	"gopkg.in/yaml.v3"
 )
 
 const (
@@ -300,12 +299,9 @@ func (bm *BodyMatcher) UnmarshalJSON(data []byte) error {
 
 func (bm BodyMatcher) MarshalYAML() (interface{}, error) {
 	if bm.bodyString != nil {
-		value, err := yaml.Marshal(bm.bodyString)
-		return string(value), err
+		return bm.bodyString, nil
 	}
-
-	value, err := yaml.Marshal(bm.bodyJson)
-	return string(value), err
+	return bm.bodyJson, nil
 }
 
 func (bm *BodyMatcher) UnmarshalYAML(unmarshal func(interface{}) error) error {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`log "github.com/sirupsen/logrus"`
`9`	`9`	`"github.com/smartystreets/assertions"`
`10`	`10`	`"github.com/stretchr/objx"`
`11`		`- "gopkg.in/yaml.v3"`
`12`	`11`	`)`
`13`	`12`
`14`	`13`	`const (`
`@@ -300,12 +299,9 @@ func (bm *BodyMatcher) UnmarshalJSON(data []byte) error {`
`300`	`299`
`301`	`300`	`func (bm BodyMatcher) MarshalYAML() (interface{}, error) {`
`302`	`301`	`if bm.bodyString != nil {`
`303`		`- value, err := yaml.Marshal(bm.bodyString)`
`304`		`- return string(value), err`
	`302`	`+ return bm.bodyString, nil`
`305`	`303`	`}`
`306`		`-`
`307`		`- value, err := yaml.Marshal(bm.bodyJson)`
`308`		`- return string(value), err`
	`304`	`+ return bm.bodyJson, nil`
`309`	`305`	`}`
`310`	`306`
`311`	`307`	`func (bm *BodyMatcher) UnmarshalYAML(unmarshal func(interface{}) error) error {`