mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-09-15 12:18:57 +00:00
support array index in PathGetter
This commit is contained in:
@@ -6,6 +6,7 @@ package yaml
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"regexp"
|
"regexp"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/davecgh/go-spew/spew"
|
"github.com/davecgh/go-spew/spew"
|
||||||
@@ -123,6 +124,41 @@ func (e ElementSetter) Filter(rn *RNode) (*RNode, error) {
|
|||||||
return NewRNode(e.Element), nil
|
return NewRNode(e.Element), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetElementByIndex will return a Filter which can be applied to a sequence
|
||||||
|
// node to get the element specified by the index
|
||||||
|
func GetElementByIndex(index string) ElementPicker {
|
||||||
|
return ElementPicker{Index: index}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ElementPicker picks the element with a specified index. Index starts from
|
||||||
|
// 0 to len(list) - 1. a hyphen ("-") means the last index.
|
||||||
|
type ElementPicker struct {
|
||||||
|
Index string
|
||||||
|
}
|
||||||
|
|
||||||
|
// Filter implements Filter
|
||||||
|
func (p ElementPicker) Filter(rn *RNode) (*RNode, error) {
|
||||||
|
lastElement := false
|
||||||
|
idx, err := strconv.Atoi(p.Index)
|
||||||
|
if err != nil {
|
||||||
|
if p.Index != "-" {
|
||||||
|
return nil, errors.Errorf("unknown index %s", p.Index)
|
||||||
|
}
|
||||||
|
lastElement = true
|
||||||
|
}
|
||||||
|
elems, err := rn.Elements()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if lastElement {
|
||||||
|
return elems[len(elems)-1], nil
|
||||||
|
}
|
||||||
|
if idx < 0 || idx >= len(elems) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return elems[idx], nil
|
||||||
|
}
|
||||||
|
|
||||||
// Clear returns a FieldClearer
|
// Clear returns a FieldClearer
|
||||||
func Clear(name string) FieldClearer {
|
func Clear(name string) FieldClearer {
|
||||||
return FieldClearer{Name: name}
|
return FieldClearer{Name: name}
|
||||||
@@ -364,12 +400,14 @@ type PathGetter struct {
|
|||||||
// Each path part may be one of:
|
// Each path part may be one of:
|
||||||
// * FieldMatcher -- e.g. "spec"
|
// * FieldMatcher -- e.g. "spec"
|
||||||
// * Map Key -- e.g. "app.k8s.io/version"
|
// * Map Key -- e.g. "app.k8s.io/version"
|
||||||
// * List Entry -- e.g. "[name=nginx]" or "[=-jar]"
|
// * List Entry -- e.g. "[name=nginx]" or "[=-jar]" or "0"
|
||||||
//
|
//
|
||||||
// Map Keys and Fields are equivalent.
|
// Map Keys and Fields are equivalent.
|
||||||
// See FieldMatcher for more on Fields and Map Keys.
|
// See FieldMatcher for more on Fields and Map Keys.
|
||||||
//
|
//
|
||||||
// List Entries are specified as map entry to match [fieldName=fieldValue].
|
// List Entries can be specified as map entry to match [fieldName=fieldValue]
|
||||||
|
// or a postional index like 0 to get the element. - is special and means the
|
||||||
|
// last element.
|
||||||
// See Elem for more on List Entries.
|
// See Elem for more on List Entries.
|
||||||
//
|
//
|
||||||
// Examples:
|
// Examples:
|
||||||
@@ -382,6 +420,8 @@ type PathGetter struct {
|
|||||||
// * The leaf Node (final path) will be created with a Kind matching Create
|
// * The leaf Node (final path) will be created with a Kind matching Create
|
||||||
// * Intermediary Nodes will be created as either a MappingNodes or
|
// * Intermediary Nodes will be created as either a MappingNodes or
|
||||||
// SequenceNodes as appropriate for each's Path location.
|
// SequenceNodes as appropriate for each's Path location.
|
||||||
|
// * If a list item is specified by a index (an offset or "-"), this item will
|
||||||
|
// not be created even Create is set.
|
||||||
Create yaml.Kind `yaml:"create,omitempty"`
|
Create yaml.Kind `yaml:"create,omitempty"`
|
||||||
|
|
||||||
// Style is the style to apply to created value Nodes.
|
// Style is the style to apply to created value Nodes.
|
||||||
@@ -402,9 +442,12 @@ func (l PathGetter) Filter(rn *RNode) (*RNode, error) {
|
|||||||
if len(l.Path) > i+1 {
|
if len(l.Path) > i+1 {
|
||||||
nextPart = l.Path[i+1]
|
nextPart = l.Path[i+1]
|
||||||
}
|
}
|
||||||
if IsListIndex(part) {
|
switch {
|
||||||
|
case IsListIndex(part):
|
||||||
match, err = l.doElem(match, part)
|
match, err = l.doElem(match, part)
|
||||||
} else {
|
case isPositionalIndex(part):
|
||||||
|
match, err = match.Pipe(GetElementByIndex(part))
|
||||||
|
default:
|
||||||
fieldPath = append(fieldPath, part)
|
fieldPath = append(fieldPath, part)
|
||||||
match, err = l.doField(match, part, l.getKind(nextPart))
|
match, err = l.doField(match, part, l.getKind(nextPart))
|
||||||
}
|
}
|
||||||
@@ -641,6 +684,16 @@ func IsListIndex(p string) bool {
|
|||||||
return strings.HasPrefix(p, "[") && strings.HasSuffix(p, "]")
|
return strings.HasPrefix(p, "[") && strings.HasSuffix(p, "]")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// isPositionalIndex returns true if the index is a positional
|
||||||
|
// index like 0, 1..., or - (last element)
|
||||||
|
func isPositionalIndex(index string) bool {
|
||||||
|
if index == "-" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
_, err := strconv.Atoi(index)
|
||||||
|
return err == nil
|
||||||
|
}
|
||||||
|
|
||||||
// SplitIndexNameValue splits a lookup part Val index into the field name
|
// SplitIndexNameValue splits a lookup part Val index into the field name
|
||||||
// and field value to match.
|
// and field value to match.
|
||||||
// e.g. splits [name=nginx] into (name, nginx)
|
// e.g. splits [name=nginx] into (name, nginx)
|
||||||
|
|||||||
@@ -57,6 +57,36 @@ func TestAppend(t *testing.T) {
|
|||||||
assert.Nil(t, rn)
|
assert.Nil(t, rn)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetElementByIndex(t *testing.T) {
|
||||||
|
node, err := Parse(`
|
||||||
|
- 0
|
||||||
|
- 1
|
||||||
|
- 2
|
||||||
|
`)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
rn, err := node.Pipe(GetElementByIndex("0"))
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, "0\n", assertNoErrorString(t)(rn.String()))
|
||||||
|
|
||||||
|
rn, err = node.Pipe(GetElementByIndex("2"))
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, "2\n", assertNoErrorString(t)(rn.String()))
|
||||||
|
|
||||||
|
rn, err = node.Pipe(GetElementByIndex("-"))
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, "2\n", assertNoErrorString(t)(rn.String()))
|
||||||
|
|
||||||
|
_, err = node.Pipe(GetElementByIndex("#"))
|
||||||
|
assert.Errorf(t, err, "unknown index #")
|
||||||
|
|
||||||
|
rn, _ = node.Pipe(GetElementByIndex("-1"))
|
||||||
|
assert.Nil(t, rn)
|
||||||
|
|
||||||
|
rn, _ = node.Pipe(GetElementByIndex("4"))
|
||||||
|
assert.Nil(t, rn)
|
||||||
|
}
|
||||||
|
|
||||||
func TestGetElementByKey(t *testing.T) {
|
func TestGetElementByKey(t *testing.T) {
|
||||||
node, err := Parse(`
|
node, err := Parse(`
|
||||||
- b: c
|
- b: c
|
||||||
@@ -340,6 +370,18 @@ j: k
|
|||||||
p: q
|
p: q
|
||||||
`, assertNoErrorString(t)(rn.String()))
|
`, assertNoErrorString(t)(rn.String()))
|
||||||
|
|
||||||
|
rn, err = node.Pipe(Lookup("a", "b", "0"))
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, s, assertNoErrorString(t)(node.String()))
|
||||||
|
assert.Equal(t, `f: g
|
||||||
|
`, assertNoErrorString(t)(rn.String()))
|
||||||
|
|
||||||
|
rn, err = node.Pipe(Lookup("a", "b", "-", "h"))
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, s, assertNoErrorString(t)(node.String()))
|
||||||
|
assert.Equal(t, `i
|
||||||
|
`, assertNoErrorString(t)(rn.String()))
|
||||||
|
|
||||||
rn, err = node.Pipe(Lookup("l"))
|
rn, err = node.Pipe(Lookup("l"))
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Equal(t, s, assertNoErrorString(t)(node.String()))
|
assert.Equal(t, s, assertNoErrorString(t)(node.String()))
|
||||||
@@ -384,6 +426,16 @@ j: k
|
|||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Equal(t, s, assertNoErrorString(t)(node.String()))
|
assert.Equal(t, s, assertNoErrorString(t)(node.String()))
|
||||||
assert.Nil(t, rn)
|
assert.Nil(t, rn)
|
||||||
|
|
||||||
|
rn, err = node.Pipe(Lookup("a", "b", "-1"))
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, s, assertNoErrorString(t)(node.String()))
|
||||||
|
assert.Nil(t, rn)
|
||||||
|
|
||||||
|
rn, err = node.Pipe(Lookup("a", "b", "99"))
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, s, assertNoErrorString(t)(node.String()))
|
||||||
|
assert.Nil(t, rn)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestSetField_Fn(t *testing.T) {
|
func TestSetField_Fn(t *testing.T) {
|
||||||
|
|||||||
Reference in New Issue
Block a user