Further isolate unstructured with factories.

2026-07-17 01:39:06 +00:00 · 2018-10-08 14:17:50 -07:00
parent 4eb2757847
commit 1af119db80
9 changed files with 405 additions and 313 deletions
--- a/pkg/resmap/factory.go
+++ b/pkg/resmap/factory.go
@@ -0,0 +1,89 @@
+/*
+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 resmap
+
+import (
+	"fmt"
+
+	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/pkg/ifc"
+	internal "sigs.k8s.io/kustomize/pkg/internal/error"
+	"sigs.k8s.io/kustomize/pkg/resource"
+)
+
+// Factory makes instances of ResMap.
+type Factory struct {
+	resF *resource.Factory
+}
+
+// NewFactory returns a new resmap.Factory.
+func NewFactory(rf *resource.Factory) *Factory {
+	return &Factory{resF: rf}
+}
+
+// RF returns a resource.Factory.
+func (rmF *Factory) RF() *resource.Factory {
+	return rmF.resF
+}
+
+// FromFiles returns a ResMap given a resource path slice.
+func (rmF *Factory) FromFiles(
+	loader ifc.Loader, paths []string) (ResMap, error) {
+	var result []ResMap
+	for _, path := range paths {
+		content, err := loader.Load(path)
+		if err != nil {
+			return nil, errors.Wrap(err, "Load from path "+path+" failed")
+		}
+		res, err := rmF.newResMapFromBytes(content)
+		if err != nil {
+			return nil, internal.Handler(err, path)
+		}
+		result = append(result, res)
+	}
+	return MergeWithoutOverride(result...)
+}
+
+// newResMapFromBytes decodes a list of objects in byte array format.
+func (rmF *Factory) newResMapFromBytes(b []byte) (ResMap, error) {
+	resources, err := rmF.resF.SliceFromBytes(b)
+	if err != nil {
+		return nil, err
+	}
+
+	result := ResMap{}
+	for _, res := range resources {
+		id := res.Id()
+		if _, found := result[id]; found {
+			return result, fmt.Errorf("GroupVersionKindName: %#v already exists b the map", id)
+		}
+		result[id] = res
+	}
+	return result, nil
+}
+
+func newResMapFromResourceSlice(resources []*resource.Resource) (ResMap, error) {
+	result := ResMap{}
+	for _, res := range resources {
+		id := res.Id()
+		if _, found := result[id]; found {
+			return nil, fmt.Errorf("duplicated %#v is not allowed", id)
+		}
+		result[id] = res
+	}
+	return result, nil
+}
--- a/pkg/resmap/factory_test.go
+++ b/pkg/resmap/factory_test.go
@@ -0,0 +1,115 @@
+/*
+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 resmap
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+
+	"sigs.k8s.io/kustomize/pkg/internal/loadertest"
+	"sigs.k8s.io/kustomize/pkg/resid"
+)
+
+func TestFromFiles(t *testing.T) {
+
+	resourceStr := `apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dply1
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dply2
+---
+# some comment
+---
+---
+`
+
+	l := loadertest.NewFakeLoader("/home/seans/project")
+	if ferr := l.AddFile("/home/seans/project/deployment.yaml", []byte(resourceStr)); ferr != nil {
+		t.Fatalf("Error adding fake file: %v\n", ferr)
+	}
+	expected := ResMap{resid.NewResId(deploy, "dply1"): rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "apps/v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name": "dply1",
+			},
+		}),
+		resid.NewResId(deploy, "dply2"): rf.FromMap(
+			map[string]interface{}{
+				"apiVersion": "apps/v1",
+				"kind":       "Deployment",
+				"metadata": map[string]interface{}{
+					"name": "dply2",
+				},
+			}),
+	}
+
+	m, _ := rmF.FromFiles(
+		l, []string{"/home/seans/project/deployment.yaml"})
+	if len(m) != 2 {
+		t.Fatalf("%#v should contain 2 appResource, but got %d", m, len(m))
+	}
+
+	if err := expected.ErrorIfNotEqual(m); err != nil {
+		t.Fatalf("actual doesn't match expected: %v", err)
+	}
+}
+
+func TestFromBytes(t *testing.T) {
+	encoded := []byte(`apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cm1
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cm2
+`)
+	expected := ResMap{
+		resid.NewResId(cmap, "cm1"): rf.FromMap(
+			map[string]interface{}{
+				"apiVersion": "v1",
+				"kind":       "ConfigMap",
+				"metadata": map[string]interface{}{
+					"name": "cm1",
+				},
+			}),
+		resid.NewResId(cmap, "cm2"): rf.FromMap(
+			map[string]interface{}{
+				"apiVersion": "v1",
+				"kind":       "ConfigMap",
+				"metadata": map[string]interface{}{
+					"name": "cm2",
+				},
+			}),
+	}
+	m, err := rmF.newResMapFromBytes(encoded)
+	fmt.Printf("%v\n", m)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !reflect.DeepEqual(m, expected) {
+		t.Fatalf("%#v doesn't match expected %#v", m, expected)
+	}
+}
--- a/pkg/resmap/resmap.go
+++ b/pkg/resmap/resmap.go
@@ -25,9 +25,7 @@ import (

 	"github.com/ghodss/yaml"
 	"github.com/golang/glog"
-	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/pkg/ifc"
-	internal "sigs.k8s.io/kustomize/pkg/internal/error"
 	"sigs.k8s.io/kustomize/pkg/resid"
 	"sigs.k8s.io/kustomize/pkg/resource"
 )
@@ -135,69 +133,6 @@ func (m ResMap) FilterBy(inputId resid.ResId) ResMap {
 	return result
 }

-// Factory makes instances of ResMap.
-type Factory struct {
-	resF *resource.Factory
-}
-
-// NewFactory returns a new resmap.Factory.
-func NewFactory(rf *resource.Factory) *Factory {
-	return &Factory{resF: rf}
-}
-
-// RF returns a resource.Factory.
-func (rmF *Factory) RF() *resource.Factory {
-	return rmF.resF
-}
-
-// FromFiles returns a ResMap given a resource path slice.
-func (rmF *Factory) FromFiles(
-	loader ifc.Loader, paths []string) (ResMap, error) {
-	var result []ResMap
-	for _, path := range paths {
-		content, err := loader.Load(path)
-		if err != nil {
-			return nil, errors.Wrap(err, "Load from path "+path+" failed")
-		}
-		res, err := rmF.newResMapFromBytes(content)
-		if err != nil {
-			return nil, internal.Handler(err, path)
-		}
-		result = append(result, res)
-	}
-	return MergeWithoutOverride(result...)
-}
-
-// newResMapFromBytes decodes a list of objects in byte array format.
-func (rmF *Factory) newResMapFromBytes(b []byte) (ResMap, error) {
-	resources, err := rmF.resF.SliceFromBytes(b)
-	if err != nil {
-		return nil, err
-	}
-
-	result := ResMap{}
-	for _, res := range resources {
-		id := res.Id()
-		if _, found := result[id]; found {
-			return result, fmt.Errorf("GroupVersionKindName: %#v already exists b the map", id)
-		}
-		result[id] = res
-	}
-	return result, nil
-}
-
-func newResMapFromResourceSlice(resources []*resource.Resource) (ResMap, error) {
-	result := ResMap{}
-	for _, res := range resources {
-		id := res.Id()
-		if _, found := result[id]; found {
-			return nil, fmt.Errorf("duplicated %#v is not allowed", id)
-		}
-		result[id] = res
-	}
-	return result, nil
-}
-
 // MergeWithoutOverride combines multiple ResMap instances, failing on key collision
 // and skipping nil maps. In case if all of the maps are nil, an empty ResMap is returned.
 func MergeWithoutOverride(maps ...ResMap) (ResMap, error) {
--- a/pkg/resmap/resmap_test.go
+++ b/pkg/resmap/resmap_test.go
@@ -17,14 +17,12 @@ limitations under the License.
 package resmap

 import (
-	"fmt"
 	"reflect"
 	"testing"

 	"sigs.k8s.io/kustomize/internal/k8sdeps"
 	"sigs.k8s.io/kustomize/pkg/gvk"
 	"sigs.k8s.io/kustomize/pkg/ifc"
-	"sigs.k8s.io/kustomize/pkg/internal/loadertest"
 	"sigs.k8s.io/kustomize/pkg/resid"
 	"sigs.k8s.io/kustomize/pkg/resource"
 )
@@ -273,95 +271,6 @@ func TestErrorIfNotEqual(t *testing.T) {

 }

-func TestNewMapFromFiles(t *testing.T) {
-
-	resourceStr := `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dply1
---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dply2
---
-# some comment
---
---
-`
-
-	l := loadertest.NewFakeLoader("/home/seans/project")
-	if ferr := l.AddFile("/home/seans/project/deployment.yaml", []byte(resourceStr)); ferr != nil {
-		t.Fatalf("Error adding fake file: %v\n", ferr)
-	}
-	expected := ResMap{resid.NewResId(deploy, "dply1"): rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "apps/v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name": "dply1",
-			},
-		}),
-		resid.NewResId(deploy, "dply2"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "apps/v1",
-				"kind":       "Deployment",
-				"metadata": map[string]interface{}{
-					"name": "dply2",
-				},
-			}),
-	}
-
-	m, _ := rmF.FromFiles(
-		l, []string{"/home/seans/project/deployment.yaml"})
-	if len(m) != 2 {
-		t.Fatalf("%#v should contain 2 appResource, but got %d", m, len(m))
-	}
-
-	if err := expected.ErrorIfNotEqual(m); err != nil {
-		t.Fatalf("actual doesn't match expected: %v", err)
-	}
-}
-
-func TestNewMapFromBytes(t *testing.T) {
-	encoded := []byte(`apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cm1
---
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cm2
-`)
-	expected := ResMap{
-		resid.NewResId(cmap, "cm1"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "ConfigMap",
-				"metadata": map[string]interface{}{
-					"name": "cm1",
-				},
-			}),
-		resid.NewResId(cmap, "cm2"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "ConfigMap",
-				"metadata": map[string]interface{}{
-					"name": "cm2",
-				},
-			}),
-	}
-	m, err := rmF.newResMapFromBytes(encoded)
-	fmt.Printf("%v\n", m)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if !reflect.DeepEqual(m, expected) {
-		t.Fatalf("%#v doesn't match expected %#v", m, expected)
-	}
-}
-
 func TestMergeWithoutOverride(t *testing.T) {
 	input1 := ResMap{
 		resid.NewResId(deploy, "deploy1"): rf.FromMap(