mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-09-15 12:18:57 +00:00
fix: support integer keys when marshaling JSON
This commit is contained in:
@@ -43,5 +43,5 @@ spec:
|
|||||||
m := th.Run(".", th.MakeDefaultOptions())
|
m := th.Run(".", th.MakeDefaultOptions())
|
||||||
_, err := m.AsYaml()
|
_, err := m.AsYaml()
|
||||||
require.Error(t, err)
|
require.Error(t, err)
|
||||||
assert.Contains(t, err.Error(), "mapping key \"env\" already defined")
|
assert.Contains(t, err.Error(), "key \"env\" already set in map")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import (
|
|||||||
"sigs.k8s.io/kustomize/kyaml/sliceutil"
|
"sigs.k8s.io/kustomize/kyaml/sliceutil"
|
||||||
"sigs.k8s.io/kustomize/kyaml/utils"
|
"sigs.k8s.io/kustomize/kyaml/utils"
|
||||||
"sigs.k8s.io/kustomize/kyaml/yaml/internal/k8sgen/pkg/labels"
|
"sigs.k8s.io/kustomize/kyaml/yaml/internal/k8sgen/pkg/labels"
|
||||||
|
k8syaml "sigs.k8s.io/yaml"
|
||||||
)
|
)
|
||||||
|
|
||||||
// MakeNullNode returns an RNode that represents an empty document.
|
// MakeNullNode returns an RNode that represents an empty document.
|
||||||
@@ -983,20 +984,11 @@ func (rn *RNode) MarshalJSON() ([]byte, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if yNode.Kind == SequenceNode {
|
b, err := k8syaml.YAMLToJSONStrict([]byte(s))
|
||||||
var a []interface{}
|
if err != nil {
|
||||||
if err := Unmarshal([]byte(s), &a); err != nil {
|
return nil, errors.Wrap(err)
|
||||||
return nil, err
|
|
||||||
}
|
}
|
||||||
return json.Marshal(a)
|
return b, nil
|
||||||
}
|
|
||||||
|
|
||||||
m := map[string]interface{}{}
|
|
||||||
if err := Unmarshal([]byte(s), &m); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return json.Marshal(m)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// UnmarshalJSON overwrites this RNode with data from []byte.
|
// UnmarshalJSON overwrites this RNode with data from []byte.
|
||||||
|
|||||||
Reference in New Issue
Block a user