Merge pull request #106 from cmars/fix/merge-empty-dst

fix: empty merge destination
snyk · Dec 17, 2021 · d8c8a6c · d8c8a6c
2 parents 69a9763 + 8cde9c1
commit d8c8a6c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/merge.go b/merge.go
@@ -130,6 +130,9 @@ func mergeInfo(dst, src *openapi3.T, replace bool) {
 }
 
 func mergePaths(dst, src *openapi3.T, replace bool) {
+	if src.Paths != nil && dst.Paths == nil {
+		dst.Paths = make(openapi3.Paths)
+	}
 	for k, v := range src.Paths {
 		if _, ok := dst.Paths[k]; !ok || replace {
 			dst.Paths[k] = v

diff --git a/merge_test.go b/merge_test.go
@@ -257,6 +257,29 @@ servers:
 	})
 }
 
+func TestMergeIntoEmpty(t *testing.T) {
+	c := qt.New(t)
+	srcYaml := `
+info:
+  title: Src
+  version: src
+paths:
+  /foo:
+    get:
+    description: get a foo
+    responses:
+      200:
+      contents:
+        application/json:
+        schema:
+          type: object
+`
+	src := mustLoad(c, srcYaml)
+	dst := &openapi3.T{}
+	vervet.Merge(dst, src, false)
+	c.Assert(dst.Paths, qt.HasLen, 1)
+}
+
 func mustLoadFile(c *qt.C, path string) *openapi3.T {
 	doc, err := vervet.NewDocumentFile(testdata.Path(path))
 	c.Assert(err, qt.IsNil)