From d0c6a824c86eaf75075ed48dbec3fb4df5e69b5c Mon Sep 17 00:00:00 2001 From: Jeffrey Regan Date: Fri, 1 Jun 2018 14:17:56 -0700 Subject: [PATCH] Remove util and privatize selectByGvk --- pkg/commands/{util.go => kustomizationfile.go} | 0 pkg/commands/{util_test.go => kustomizationfile_test.go} | 0 pkg/transformers/labelsandannotations.go | 3 +-- pkg/transformers/namehash.go | 5 ++--- pkg/transformers/namereference.go | 5 ++--- pkg/transformers/prefixname.go | 3 +-- pkg/{types => transformers}/selectbygvk.go | 6 +++--- pkg/{types => transformers}/selectbygvk_test.go | 4 ++-- 8 files changed, 11 insertions(+), 15 deletions(-) rename pkg/commands/{util.go => kustomizationfile.go} (100%) rename pkg/commands/{util_test.go => kustomizationfile_test.go} (100%) rename pkg/{types => transformers}/selectbygvk.go (90%) rename pkg/{types => transformers}/selectbygvk_test.go (97%) diff --git a/pkg/commands/util.go b/pkg/commands/kustomizationfile.go similarity index 100% rename from pkg/commands/util.go rename to pkg/commands/kustomizationfile.go diff --git a/pkg/commands/util_test.go b/pkg/commands/kustomizationfile_test.go similarity index 100% rename from pkg/commands/util_test.go rename to pkg/commands/kustomizationfile_test.go diff --git a/pkg/transformers/labelsandannotations.go b/pkg/transformers/labelsandannotations.go index 763380302..7d976aa33 100644 --- a/pkg/transformers/labelsandannotations.go +++ b/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) diff --git a/pkg/transformers/namehash.go b/pkg/transformers/namehash.go index a82ba6ee6..861c53ea0 100644 --- a/pkg/transformers/namehash.go +++ b/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()) } } diff --git a/pkg/transformers/namereference.go b/pkg/transformers/namereference.go index a2516ef66..68d23230f 100644 --- a/pkg/transformers/namereference.go +++ b/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 { diff --git a/pkg/transformers/prefixname.go b/pkg/transformers/prefixname.go index 4634158e8..1bc9070bb 100644 --- a/pkg/transformers/prefixname.go +++ b/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) diff --git a/pkg/types/selectbygvk.go b/pkg/transformers/selectbygvk.go similarity index 90% rename from pkg/types/selectbygvk.go rename to pkg/transformers/selectbygvk.go index 4ff1b7afb..3197c3674 100644 --- a/pkg/types/selectbygvk.go +++ b/pkg/transformers/selectbygvk.go @@ -14,20 +14,20 @@ See the License for the specific language governing permissions and limitations under the License. */ -package types +package transformers import ( "k8s.io/apimachinery/pkg/runtime/schema" ) -// SelectByGVK returns true if `selector` selects `in`; otherwise, false. +// 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 CAN select // . // selector CANNOT select // . -func SelectByGVK(in schema.GroupVersionKind, selector *schema.GroupVersionKind) bool { +func selectByGVK(in schema.GroupVersionKind, selector *schema.GroupVersionKind) bool { if selector == nil { return true } diff --git a/pkg/types/selectbygvk_test.go b/pkg/transformers/selectbygvk_test.go similarity index 97% rename from pkg/types/selectbygvk_test.go rename to pkg/transformers/selectbygvk_test.go index 0c7571983..1553ad03d 100644 --- a/pkg/types/selectbygvk_test.go +++ b/pkg/transformers/selectbygvk_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package types +package transformers import ( "testing" @@ -123,7 +123,7 @@ func TestSelectByGVK(t *testing.T) { } for _, tc := range testCases { - filtered := SelectByGVK(tc.in, tc.filter) + filtered := selectByGVK(tc.in, tc.filter) if filtered != tc.expected { t.Fatalf("unexpected filter result for test case: %v", tc.description) }