Introduce ResId and ResMap.

pkg/resource/resource.go

@@ -17,35 +17,89 @@ limitations under the License.
 package resource
 
 import (
-	"bytes"
 	"encoding/json"
-	"sort"
 
-	"github.com/ghodss/yaml"
-
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
-// Resource represents a Kubernetes Resource Object for ex. Deployment, Server
-// ConfigMap etc.
+// Resource is a Kubernetes Resource Object paired with a behavior.
 type Resource struct {
-	Data     *unstructured.Unstructured
-	Behavior string
+	unstruct *unstructured.Unstructured
+	behavior string
 }
 
-// GVKN returns Group/Version/Kind/Name for the resource.
-func (r *Resource) GVKN() types.GroupVersionKindName {
-	var emptyZVKN types.GroupVersionKindName
-	if r.Data == nil {
-		return emptyZVKN
+// NewResource returns a new instance of Resource.
+func NewResource(u *unstructured.Unstructured, b string) *Resource {
+	return &Resource{unstruct: u, behavior: b}
+}
+
+// NewBehaviorlessResource returns a new instance of Resource.
+func NewBehaviorlessResource(u *unstructured.Unstructured) *Resource {
+	return &Resource{unstruct: u}
+}
+
+// Behavior returns the behavior for the resource.
+func (r *Resource) Behavior() string {
+	return r.behavior
+}
+
+// Unstruct returns the unstructured object holding the resource.
+func (r *Resource) Unstruct() *unstructured.Unstructured {
+	return r.unstruct
+}
+
+// SetUnstruct sets a new member.
+func (r *Resource) SetUnstruct(u *unstructured.Unstructured) {
+	r.unstruct = u
+}
+
+// Id returns the ResId for the resource.
+func (r *Resource) Id() ResId {
+	var empty ResId
+	if r.unstruct == nil {
+		return empty
 	}
-	gvk := r.Data.GroupVersionKind()
-	return types.GroupVersionKindName{GVK: gvk, Name: r.Data.GetName()}
+	gvk := r.unstruct.GroupVersionKind()
+	return NewResId(gvk, r.unstruct.GetName())
 }
 
-func objectToUnstructured(in runtime.Object) (*unstructured.Unstructured, error) {
+func (r *Resource) Merge(other *Resource) {
+	r.Replace(other)
+	mergeConfigmap(r.unstruct.Object, other.unstruct.Object, r.unstruct.Object)
+}
+
+func (r *Resource) Replace(other *Resource) {
+	r.unstruct.SetLabels(mergeStringMaps(other.unstruct.GetLabels(), r.unstruct.GetLabels()))
+	r.unstruct.SetAnnotations(mergeStringMaps(other.unstruct.GetAnnotations(), r.unstruct.GetAnnotations()))
+	r.unstruct.SetName(other.unstruct.GetName())
+}
+
+// TODO: Add BinaryData once we sync to new k8s.io/api
+func mergeConfigmap(mergedTo map[string]interface{}, maps ...map[string]interface{}) {
+	mergedMap := map[string]interface{}{}
+	for _, m := range maps {
+		datamap, ok := m["data"].(map[string]interface{})
+		if ok {
+			for key, value := range datamap {
+				mergedMap[key] = value
+			}
+		}
+	}
+	mergedTo["data"] = mergedMap
+}
+
+func mergeStringMaps(maps ...map[string]string) map[string]string {
+	result := map[string]string{}
+	for _, m := range maps {
+		for key, value := range m {
+			result[key] = value
+		}
+	}
+	return result
+}
+
+func newUnstructuredFromObject(in runtime.Object) (*unstructured.Unstructured, error) {
 	marshaled, err := json.Marshal(in)
 	if err != nil {
 		return nil, err
@@ -54,38 +108,3 @@ func objectToUnstructured(in runtime.Object) (*unstructured.Unstructured, error)
 	err = out.UnmarshalJSON(marshaled)
 	return &out, err
 }
-
-// ResourceCollection is a map from GroupVersionKindName to Resource
-type ResourceCollection map[types.GroupVersionKindName]*Resource
-
-// EncodeAsYaml encodes the map `in` and output the encoded objects separated by `---`.
-func (in ResourceCollection) EncodeAsYaml() ([]byte, error) {
-	gvknList := []types.GroupVersionKindName{}
-	for gvkn := range in {
-		gvknList = append(gvknList, gvkn)
-	}
-	sort.Sort(types.ByGVKN(gvknList))
-
-	firstObj := true
-	var b []byte
-	buf := bytes.NewBuffer(b)
-	for _, gvkn := range gvknList {
-		obj := in[gvkn].Data
-		out, err := yaml.Marshal(obj)
-		if err != nil {
-			return nil, err
-		}
-		if !firstObj {
-			_, err = buf.WriteString("---\n")
-			if err != nil {
-				return nil, err
-			}
-		}
-		_, err = buf.Write(out)
-		if err != nil {
-			return nil, err
-		}
-		firstObj = false
-	}
-	return buf.Bytes(), nil
-}