mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-06-12 01:14:22 +00:00
fix forward slash in value add path
This commit is contained in:
@@ -98,7 +98,17 @@ var _ kio.Filter = Filter{}
|
|||||||
func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
|
func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
|
||||||
_, err := kio.FilterAll(yaml.FilterFunc(
|
_, err := kio.FilterAll(yaml.FilterFunc(
|
||||||
func(node *yaml.RNode) (*yaml.RNode, error) {
|
func(node *yaml.RNode) (*yaml.RNode, error) {
|
||||||
fields := strings.Split(f.FieldPath, "/")
|
var fields []string
|
||||||
|
// if there is forward slash '/' in the field name, a back slash '\'
|
||||||
|
// will be used to escape it.
|
||||||
|
for _, f := range strings.Split(f.FieldPath, "/") {
|
||||||
|
if len(fields) > 0 && strings.HasSuffix(fields[len(fields)-1], "\\") {
|
||||||
|
concatField := strings.TrimSuffix(fields[len(fields)-1], "\\") + "/" + f
|
||||||
|
fields = append(fields[:len(fields)-1], concatField)
|
||||||
|
} else {
|
||||||
|
fields = append(fields, f)
|
||||||
|
}
|
||||||
|
}
|
||||||
// TODO: support SequenceNode.
|
// TODO: support SequenceNode.
|
||||||
// Presumably here one could look for array indices (digits) at
|
// Presumably here one could look for array indices (digits) at
|
||||||
// the end of the field path (as described in IETF RFC 6902 JSON),
|
// the end of the field path (as described in IETF RFC 6902 JSON),
|
||||||
|
|||||||
@@ -94,6 +94,20 @@ spec:
|
|||||||
FilePathPosition: 2,
|
FilePathPosition: 2,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"backSlash": {
|
||||||
|
input: `
|
||||||
|
kind: SomeKind
|
||||||
|
`,
|
||||||
|
expectedOutput: `
|
||||||
|
kind: SomeKind
|
||||||
|
spec:
|
||||||
|
resourceRef/external: valueAdded
|
||||||
|
`,
|
||||||
|
filter: Filter{
|
||||||
|
Value: "valueAdded",
|
||||||
|
FieldPath: "spec/resourceRef\\/external",
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for tn, tc := range testCases {
|
for tn, tc := range testCases {
|
||||||
|
|||||||
Reference in New Issue
Block a user