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

Co-authored-by: sarjamil <sjamil@salesforce.com>
kubernetes-sigs · Apr 19, 2022 · 12f06d1 · 12f06d1
1 parent 9d5491c
commit 12f06d1
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/api/filters/fieldspec/fieldspec.go b/api/filters/fieldspec/fieldspec.go
@@ -5,10 +5,10 @@ package fieldspec
 
 import (
 	"fmt"
+	"sigs.k8s.io/kustomize/kyaml/pathsplitterutil"
 	"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"
@@ -49,7 +49,7 @@ func (fltr Filter) Filter(obj *yaml.RNode) (*yaml.RNode, error) {
 	if match := isMatchGVK(fltr.FieldSpec, obj); !match {
 		return obj, nil
 	}
-	fltr.path = utils.PathSplitter(fltr.FieldSpec.Path, "/")
+	fltr.path = pathsplitterutil.PathSplitter(fltr.FieldSpec.Path, "/")
 	if err := fltr.filter(obj); err != nil {
 		return nil, errors.WrapPrefixf(err,
 			"considering field '%s' of object %s", fltr.FieldSpec.Path, resid.FromRNode(obj))

diff --git a/api/filters/replacement/replacement.go b/api/filters/replacement/replacement.go
@@ -6,6 +6,7 @@ package replacement
 import (
 	"errors"
 	"fmt"
+	"sigs.k8s.io/kustomize/kyaml/pathsplitterutil"
 	"strings"
 
 	"sigs.k8s.io/kustomize/api/internal/utils"
@@ -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 := pathsplitterutil.SmarterPathSplitter(fp, ".")
 		var t *yaml.RNode
 		var err error
 		if target.Options != nil && target.Options.Create {
@@ -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 := pathsplitterutil.SmarterPathSplitter(r.Source.FieldPath, ".")
 
 	rn, err := source.Pipe(yaml.Lookup(fieldPath...))
 	if err != nil {

diff --git a/api/internal/builtins/AnnotationsTransformer.go b/api/internal/builtins/AnnotationsTransformer.go
diff --git a/api/internal/utils/pathsplitter.go → kyaml/pathsplitterutil/pathsplitter.go b/api/internal/utils/pathsplitter.go → kyaml/pathsplitterutil/pathsplitter.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package utils
+package pathsplitterutil
 
 import "strings"
 

diff --git a/api/internal/utils/pathsplitter_test.go → kyaml/pathsplitterutil/pathsplitter_test.go b/api/internal/utils/pathsplitter_test.go → kyaml/pathsplitterutil/pathsplitter_test.go
@@ -1,13 +1,13 @@
 // Copyright 2021 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package utils_test
+package pathsplitterutil_test
 
 import (
+	. "sigs.k8s.io/kustomize/kyaml/pathsplitterutil"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	. "sigs.k8s.io/kustomize/api/internal/utils"
 )
 
 func TestPathSplitter(t *testing.T) {

diff --git a/kyaml/yaml/rnode.go b/kyaml/yaml/rnode.go
@@ -9,6 +9,7 @@ import (
 	"io/ioutil"
 	"log"
 	"regexp"
+	"sigs.k8s.io/kustomize/kyaml/pathsplitterutil"
 	"strconv"
 	"strings"
 
@@ -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 := pathsplitterutil.SmarterPathSplitter(path, ".")
 	rn, err := rn.Pipe(Lookup(fields...))
 	if err != nil {
 		return nil, err

diff --git a/kyaml/yaml/rnode_test.go b/kyaml/yaml/rnode_test.go
@@ -2310,7 +2310,7 @@ func TestGetAnnotations(t *testing.T) {
 }
 
 func TestGetFieldValueWithDot(t *testing.T) {
-	t.Skip()
+	//t.Skip()
 
 	const input = `
 kind: Pod