Fixed imports

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

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/api/filters/fieldspec/fieldspec.go b/api/filters/fieldspec/fieldspec.go
@@ -5,13 +5,13 @@ package fieldspec
 
 import (
 	"fmt"
-	"sigs.k8s.io/kustomize/kyaml/pathsplitterutil"
 	"strings"
 
 	"sigs.k8s.io/kustomize/api/filters/filtersutil"
 	"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"
 )
 
@@ -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 = pathsplitterutil.PathSplitter(fltr.FieldSpec.Path, "/")
+	fltr.path = utils.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,7 +6,7 @@ package replacement
 import (
 	"errors"
 	"fmt"
-	"sigs.k8s.io/kustomize/kyaml/pathsplitterutil"
+	utils2 "sigs.k8s.io/kustomize/kyaml/utils"
 	"strings"
 
 	"sigs.k8s.io/kustomize/api/internal/utils"
@@ -115,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 := pathsplitterutil.SmarterPathSplitter(fp, ".")
+		fieldPath := utils2.SmarterPathSplitter(fp, ".")
 		var t *yaml.RNode
 		var err error
 		if target.Options != nil && target.Options.Create {
@@ -200,7 +200,7 @@ func getReplacement(nodes []*yaml.RNode, r *types.Replacement) (*yaml.RNode, err
 	if r.Source.FieldPath == "" {
 		r.Source.FieldPath = types.DefaultReplacementFieldPath
 	}
-	fieldPath := pathsplitterutil.SmarterPathSplitter(r.Source.FieldPath, ".")
+	fieldPath := utils2.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/kyaml/pathsplitterutil/pathsplitter.go → kyaml/utils/pathsplitter.go b/kyaml/pathsplitterutil/pathsplitter.go → kyaml/utils/pathsplitter.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package pathsplitterutil
+package utils
 
 import "strings"
 

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

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