diff --git a/datamodel/low/base/example.go b/datamodel/low/base/example.go index a84ccb9b..2ddf5418 100644 --- a/datamodel/low/base/example.go +++ b/datamodel/low/base/example.go @@ -89,15 +89,7 @@ func (ex *Example) Build(ctx context.Context, keyNode, root *yaml.Node, _ *index expChildNodes := low.ExtractNodesRecursive(ctx, vn) expChildNodes.Range(func(k, v interface{}) bool { if arr, ko := v.([]*yaml.Node); ko { - if ext, ok := ex.Nodes.Load(k); ok { - if extArr, kk := ext.([]*yaml.Node); kk { - ex.Nodes.Store(k, append(extArr, arr...)) - } else { - ex.Nodes.Store(k, arr) - } - } else { - ex.Nodes.Store(k, arr) - } + ex.Nodes.Store(k, arr) } return true }) diff --git a/datamodel/low/base/schema.go b/datamodel/low/base/schema.go index 3abddba2..e1fdba54 100644 --- a/datamodel/low/base/schema.go +++ b/datamodel/low/base/schema.go @@ -727,9 +727,6 @@ func (s *Schema) Build(ctx context.Context, root *yaml.Node, idx *index.SpecInde discriminator.AddNode(key.(int), g) } } - if n, ok := val.(*yaml.Node); ok { - discriminator.AddNode(key.(int), n) - } return true }) } diff --git a/datamodel/low/v3/server_test.go b/datamodel/low/v3/server_test.go index fc133944..abfe2668 100644 --- a/datamodel/low/v3/server_test.go +++ b/datamodel/low/v3/server_test.go @@ -50,6 +50,12 @@ variables: low.GenerateHashString(s.Value)) assert.Equal(t, 1, orderedmap.Len(n.GetExtensions())) + + // check nodes on variables + for k := n.Variables.Value.First(); k != nil; k = k.Next() { + assert.NotNil(t, k.Value().Value.GetKeyNode()) + assert.NotNil(t, k.Value().Value.GetRootNode()) + } } func TestServer_Build_NoVars(t *testing.T) {