From 5fa8702af4c71c2c45f4d6de287c584df731b187 Mon Sep 17 00:00:00 2001
From: Antoine Pelisse <apelisse@google.com>
Date: Mon, 23 Oct 2017 14:07:01 -0700
Subject: [PATCH] Fix govet in pkg/kubectl/apply

---
 pkg/kubectl/apply/parse/factory.go           | 24 +++++++++++++++++---
 pkg/kubectl/apply/parse/list_element.go      |  6 ++++-
 pkg/kubectl/apply/parse/map_element.go       |  6 ++++-
 pkg/kubectl/apply/parse/primitive_element.go |  5 +++-
 pkg/kubectl/apply/parse/type_element.go      |  6 ++++-
 pkg/kubectl/apply/strategy/utils_test.go     |  2 +-
 6 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/pkg/kubectl/apply/parse/factory.go b/pkg/kubectl/apply/parse/factory.go
index f44bcd4f3b5..c8907da4d88 100644
--- a/pkg/kubectl/apply/parse/factory.go
+++ b/pkg/kubectl/apply/parse/factory.go
@@ -86,17 +86,35 @@ func (v *ElementBuildingVisitor) getItem(s proto.Schema, name string, data apply
 		if err != nil {
 			return nil, fmt.Errorf("expected openapi Array, was %T for %v", s, kind)
 		}
-		return &listItem{name, a, apply.ListElementData{data}}, nil
+		return &listItem{
+			Name:  name,
+			Array: a,
+			ListElementData: apply.ListElementData{
+				RawElementData: data,
+			},
+		}, nil
 	case reflect.Map:
 		if k, err := getKind(s); err == nil {
-			return &typeItem{name, k, apply.MapElementData{data}}, nil
+			return &typeItem{
+				Name: name,
+				Type: k,
+				MapElementData: apply.MapElementData{
+					RawElementData: data,
+				},
+			}, nil
 		}
 		// If it looks like a map, and no openapi type is found, default to mapItem
 		m, err := getMap(s)
 		if err != nil {
 			return nil, fmt.Errorf("expected openapi Kind or Map, was %T for %v", s, kind)
 		}
-		return &mapItem{name, m, apply.MapElementData{data}}, nil
+		return &mapItem{
+			Name: name,
+			Map:  m,
+			MapElementData: apply.MapElementData{
+				RawElementData: data,
+			},
+		}, nil
 	}
 	return nil, fmt.Errorf("unsupported type type %v", kind)
 }
diff --git a/pkg/kubectl/apply/parse/list_element.go b/pkg/kubectl/apply/parse/list_element.go
index 67eabee4c55..3a16318fb0e 100644
--- a/pkg/kubectl/apply/parse/list_element.go
+++ b/pkg/kubectl/apply/parse/list_element.go
@@ -154,7 +154,11 @@ func (v ElementBuildingVisitor) doMapList(meta apply.FieldMetaImpl, item *listIt
 // Uses the "replace" strategy and identify "same" elements across lists by their index
 func (v ElementBuildingVisitor) replaceListElement(meta apply.FieldMetaImpl, item *listItem) (*apply.ListElement, error) {
 	meta.Name = item.Name
-	result := &apply.ListElement{meta, item.ListElementData, []apply.Element{}}
+	result := &apply.ListElement{
+		FieldMetaImpl:   meta,
+		ListElementData: item.ListElementData,
+		Values:          []apply.Element{},
+	}
 
 	// Use the max length to iterate over the slices
 	for i := 0; i < max(len(item.GetRecordedList()), len(item.GetLocalList()), len(item.GetRemoteList())); i++ {
diff --git a/pkg/kubectl/apply/parse/map_element.go b/pkg/kubectl/apply/parse/map_element.go
index 2ac2f0ea096..0580ab1ba11 100644
--- a/pkg/kubectl/apply/parse/map_element.go
+++ b/pkg/kubectl/apply/parse/map_element.go
@@ -39,7 +39,11 @@ func (v ElementBuildingVisitor) mapElement(meta apply.FieldMetaImpl, item *mapIt
 	}
 
 	// Return the result
-	return &apply.MapElement{meta, item.MapElementData, values}, nil
+	return &apply.MapElement{
+		FieldMetaImpl:  meta,
+		MapElementData: item.MapElementData,
+		Values:         values,
+	}, nil
 }
 
 // schemaFn returns the schema for a field or map value based on its name or key
diff --git a/pkg/kubectl/apply/parse/primitive_element.go b/pkg/kubectl/apply/parse/primitive_element.go
index 5fac5ce04ee..de393e86a50 100644
--- a/pkg/kubectl/apply/parse/primitive_element.go
+++ b/pkg/kubectl/apply/parse/primitive_element.go
@@ -21,5 +21,8 @@ import "k8s.io/kubernetes/pkg/kubectl/apply"
 // primitiveElement builds a new primitiveElement from a PrimitiveItem
 func (v ElementBuildingVisitor) primitiveElement(item *primitiveItem) (*apply.PrimitiveElement, error) {
 	meta := apply.FieldMetaImpl{Name: item.Name}
-	return &apply.PrimitiveElement{meta, item.RawElementData}, nil
+	return &apply.PrimitiveElement{
+		FieldMetaImpl:  meta,
+		RawElementData: item.RawElementData,
+	}, nil
 }
diff --git a/pkg/kubectl/apply/parse/type_element.go b/pkg/kubectl/apply/parse/type_element.go
index 314f3ed84cb..e2fa1d8b682 100644
--- a/pkg/kubectl/apply/parse/type_element.go
+++ b/pkg/kubectl/apply/parse/type_element.go
@@ -38,5 +38,9 @@ func (v ElementBuildingVisitor) typeElement(meta apply.FieldMetaImpl, item *type
 	}
 
 	// Return the result
-	return &apply.TypeElement{meta, item.MapElementData, values}, nil
+	return &apply.TypeElement{
+		FieldMetaImpl:  meta,
+		MapElementData: item.MapElementData,
+		Values:         values,
+	}, nil
 }
diff --git a/pkg/kubectl/apply/strategy/utils_test.go b/pkg/kubectl/apply/strategy/utils_test.go
index a5c226e5399..e1e895700d5 100644
--- a/pkg/kubectl/apply/strategy/utils_test.go
+++ b/pkg/kubectl/apply/strategy/utils_test.go
@@ -44,7 +44,7 @@ func runWith(instance apply.Strategy, recorded, local, remote, expected map[stri
 	Expect(err).To(BeNil())
 	resources, err := openapi.NewOpenAPIData(s)
 	Expect(err).To(BeNil())
-	parseFactory := parse.Factory{resources}
+	parseFactory := parse.Factory{Resources: resources}
 
 	parsed, err := parseFactory.CreateElement(recorded, local, remote)
 	Expect(err).Should(Not(HaveOccurred()))