Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added code for fields with dots(.) in their names work as needed #4591

Merged
merged 7 commits into from May 2, 2022
Merged

Added code for fields with dots(.) in their names work as needed #4591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
12f06d1
Added code for fields with dots(.) in their names work as needed
annelau21 Apr 19, 2022
32fd007
Fixed imports
annelau21 Apr 19, 2022
4482fbe
Removed comments
annelau21 Apr 19, 2022
4036f2c
Fix filter method
annelau21 Apr 19, 2022
540adc7
Fixed failing tests
annelau21 Apr 19, 2022
a793066
Remove comments
annelau21 Apr 19, 2022
6bc0469
Add co-author to PR.
annelau21 Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/filters/fieldspec/fieldspec.go
View file
Open in desktop
Expand Up @@ -8,10 +8,10 @@ import (
"strings"

"sigs.k8s.io/kustomize/api/filters/filtersutil"
"sigs.k8s.io/kustomize/api/internal/utils"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kyaml/errors"
"sigs.k8s.io/kustomize/kyaml/resid"
"sigs.k8s.io/kustomize/kyaml/utils"
"sigs.k8s.io/kustomize/kyaml/yaml"
)

Expand Down
5 changes: 3 additions & 2 deletions api/filters/replacement/replacement.go
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@ import (
"sigs.k8s.io/kustomize/api/resource"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kyaml/resid"
kyaml_utils "sigs.k8s.io/kustomize/kyaml/utils"
"sigs.k8s.io/kustomize/kyaml/yaml"
)

Expand Down Expand Up @@ -114,7 +115,7 @@ func rejectId(rejects []*types.Selector, id *resid.ResId) bool {

func applyToNode(node *yaml.RNode, value *yaml.RNode, target *types.TargetSelector) error {
for _, fp := range target.FieldPaths {
fieldPath := utils.SmarterPathSplitter(fp, ".")
fieldPath := kyaml_utils.SmarterPathSplitter(fp, ".")
var t *yaml.RNode
var err error
if target.Options != nil && target.Options.Create {
Expand Down Expand Up @@ -199,7 +200,7 @@ func getReplacement(nodes []*yaml.RNode, r *types.Replacement) (*yaml.RNode, err
if r.Source.FieldPath == "" {
r.Source.FieldPath = types.DefaultReplacementFieldPath
}
fieldPath := utils.SmarterPathSplitter(r.Source.FieldPath, ".")
fieldPath := kyaml_utils.SmarterPathSplitter(r.Source.FieldPath, ".")

rn, err := source.Pipe(yaml.Lookup(fieldPath...))
if err != nil {
Expand Down
0 api/internal/utils/pathsplitter.go → kyaml/utils/pathsplitter.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion api/internal/utils/pathsplitter_test.go → kyaml/utils/pathsplitter_test.go
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
. "sigs.k8s.io/kustomize/api/internal/utils"
. "sigs.k8s.io/kustomize/kyaml/utils"
)

func TestPathSplitter(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion kyaml/yaml/rnode.go
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ import (
"sigs.k8s.io/kustomize/kyaml/errors"
"sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml"
"sigs.k8s.io/kustomize/kyaml/sliceutil"
"sigs.k8s.io/kustomize/kyaml/utils"
"sigs.k8s.io/kustomize/kyaml/yaml/internal/k8sgen/pkg/labels"
)

Expand Down Expand Up @@ -1207,7 +1208,7 @@ func (rn *RNode) GetString(path string) (string, error) {
// assuming we keep the var feature in kustomize.
// The other end of this is: refvar.go:updateNodeValue.
func (rn *RNode) GetFieldValue(path string) (interface{}, error) {
fields := convertSliceIndex(strings.Split(path, "."))
fields := convertSliceIndex(utils.SmarterPathSplitter(path, "."))
rn, err := rn.Pipe(Lookup(fields...))
if err != nil {
return nil, err
Expand Down
4 changes: 0 additions & 4 deletions kyaml/yaml/rnode_test.go
View file
Open in desktop
Expand Up @@ -2310,8 +2310,6 @@ func TestGetAnnotations(t *testing.T) {
}

func TestGetFieldValueWithDot(t *testing.T) {
t.Skip()

const input = `
kind: Pod
metadata:
Expand All @@ -2330,8 +2328,6 @@ metadata:
require.NoError(t, err)
require.Equal(t, "hello-world-app", app)

// TODO: doesn't currently work; we expect to be able to escape the dot in future
// https://github.com/kubernetes-sigs/kustomize/issues/4487
fooAppName, err := labelRNode.GetFieldValue(`foo\.appname`)
require.NoError(t, err)
require.Equal(t, "hello-world-foo", fooAppName) // no field named 'foo.appname'
Expand Down