Remove util and privatize selectByGvk

pkg/transformers/labelsandannotations.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/resmap"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
 )
 
 // mapTransformer contains a map string->string and path configs
@@ -61,7 +60,7 @@ func (o *mapTransformer) Transform(m resmap.ResMap) error {
 		obj := m[id].Unstruct()
 		objMap := obj.UnstructuredContent()
 		for _, path := range o.pathConfigs {
-			if !types.SelectByGVK(id.Gvk(), path.GroupVersionKind) {
+			if !selectByGVK(id.Gvk(), path.GroupVersionKind) {
 				continue
 			}
 			err := mutateField(objMap, path.Path, path.CreateIfNotPresent, o.addMap)

pkg/transformers/namehash.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/kubernetes-sigs/kustomize/pkg/hash"
 	"github.com/kubernetes-sigs/kustomize/pkg/resmap"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -43,10 +42,10 @@ func NewNameHashTransformer() Transformer {
 func (o *nameHashTransformer) Transform(m resmap.ResMap) error {
 	for id, obj := range m {
 		switch {
-		case types.SelectByGVK(id.Gvk(), &schema.GroupVersionKind{Version: "v1", Kind: "ConfigMap"}):
+		case selectByGVK(id.Gvk(), &schema.GroupVersionKind{Version: "v1", Kind: "ConfigMap"}):
 			appendHashForConfigMap(obj.Unstruct())
 
-		case types.SelectByGVK(id.Gvk(), &schema.GroupVersionKind{Version: "v1", Kind: "Secret"}):
+		case selectByGVK(id.Gvk(), &schema.GroupVersionKind{Version: "v1", Kind: "Secret"}):
 			appendHashForSecret(obj.Unstruct())
 		}
 	}

pkg/transformers/namereference.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/resmap"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
@@ -57,7 +56,7 @@ func (o *nameReferenceTransformer) Transform(
 		objMap := obj.UnstructuredContent()
 		for _, referencePathConfig := range o.pathConfigs {
 			for _, path := range referencePathConfig.pathConfigs {
-				if !types.SelectByGVK(id.Gvk(), path.GroupVersionKind) {
+				if !selectByGVK(id.Gvk(), path.GroupVersionKind) {
 					continue
 				}
 				err := mutateField(objMap, path.Path, path.CreateIfNotPresent,
@@ -82,7 +81,7 @@ func (o *nameReferenceTransformer) updateNameReference(
 		}
 
 		for id, obj := range m {
-			if !types.SelectByGVK(id.Gvk(), &GVK) {
+			if !selectByGVK(id.Gvk(), &GVK) {
 				continue
 			}
 			if id.Name() == s {

pkg/transformers/prefixname.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 
 	"github.com/kubernetes-sigs/kustomize/pkg/resmap"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
 )
 
 // namePrefixTransformer contains the prefix and the path config for each field that
@@ -62,7 +61,7 @@ func (o *namePrefixTransformer) Transform(m resmap.ResMap) error {
 		obj := m[id].Unstruct()
 		objMap := obj.UnstructuredContent()
 		for _, path := range o.pathConfigs {
-			if !types.SelectByGVK(id.Gvk(), path.GroupVersionKind) {
+			if !selectByGVK(id.Gvk(), path.GroupVersionKind) {
 				continue
 			}
 			err := mutateField(objMap, path.Path, path.CreateIfNotPresent, o.addPrefix)

pkg/transformers/selectbygvk.go

@@ -0,0 +1,50 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package transformers
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// selectByGVK returns true if `selector` selects `in`; otherwise, false.
+// If `selector` and `in` are the same, return true.
+// If `selector` is nil, it is considered as a wildcard and always return true.
+// e.g. selector <Group: "", Version: "", Kind: "Deployment"> CAN select
+// <Group: "extensions", Version: "v1beta1", Kind: "Deployment">.
+// selector <Group: "apps", Version: "", Kind: "Deployment"> CANNOT select
+// <Group: "extensions", Version: "v1beta1", Kind: "Deployment">.
+func selectByGVK(in schema.GroupVersionKind, selector *schema.GroupVersionKind) bool {
+	if selector == nil {
+		return true
+	}
+	if len(selector.Group) > 0 {
+		if in.Group != selector.Group {
+			return false
+		}
+	}
+	if len(selector.Version) > 0 {
+		if in.Version != selector.Version {
+			return false
+		}
+	}
+	if len(selector.Kind) > 0 {
+		if in.Kind != selector.Kind {
+			return false
+		}
+	}
+	return true
+}

pkg/transformers/selectbygvk_test.go

@@ -0,0 +1,131 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package transformers
+
+import (
+	"testing"
+
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+func TestSelectByGVK(t *testing.T) {
+	type testCase struct {
+		description string
+		in          schema.GroupVersionKind
+		filter      *schema.GroupVersionKind
+		expected    bool
+	}
+	testCases := []testCase{
+		{
+			description: "nil filter",
+			in:          schema.GroupVersionKind{},
+			filter:      nil,
+			expected:    true,
+		},
+		{
+			description: "gvk matches",
+			in: schema.GroupVersionKind{
+				Group:   "group1",
+				Version: "version1",
+				Kind:    "kind1",
+			},
+			filter: &schema.GroupVersionKind{
+				Group:   "group1",
+				Version: "version1",
+				Kind:    "kind1",
+			},
+			expected: true,
+		},
+		{
+			description: "group doesn't matches",
+			in: schema.GroupVersionKind{
+				Group:   "group1",
+				Version: "version1",
+				Kind:    "kind1",
+			},
+			filter: &schema.GroupVersionKind{
+				Group:   "group2",
+				Version: "version1",
+				Kind:    "kind1",
+			},
+			expected: false,
+		},
+		{
+			description: "version doesn't matches",
+			in: schema.GroupVersionKind{
+				Group:   "group1",
+				Version: "version1",
+				Kind:    "kind1",
+			},
+			filter: &schema.GroupVersionKind{
+				Group:   "group1",
+				Version: "version2",
+				Kind:    "kind1",
+			},
+			expected: false,
+		},
+		{
+			description: "kind doesn't matches",
+			in: schema.GroupVersionKind{
+				Group:   "group1",
+				Version: "version1",
+				Kind:    "kind1",
+			},
+			filter: &schema.GroupVersionKind{
+				Group:   "group1",
+				Version: "version1",
+				Kind:    "kind2",
+			},
+			expected: false,
+		},
+		{
+			description: "no version in filter",
+			in: schema.GroupVersionKind{
+				Group:   "group1",
+				Version: "version1",
+				Kind:    "kind1",
+			},
+			filter: &schema.GroupVersionKind{
+				Group:   "group1",
+				Version: "",
+				Kind:    "kind1",
+			},
+			expected: true,
+		},
+		{
+			description: "only kind is set in filter",
+			in: schema.GroupVersionKind{
+				Group:   "group1",
+				Version: "version1",
+				Kind:    "kind1",
+			},
+			filter: &schema.GroupVersionKind{
+				Group:   "",
+				Version: "",
+				Kind:    "kind1",
+			},
+			expected: true,
+		},
+	}
+
+	for _, tc := range testCases {
+		filtered := selectByGVK(tc.in, tc.filter)
+		if filtered != tc.expected {
+			t.Fatalf("unexpected filter result for test case: %v", tc.description)
+		}
+	}
+}