Run gofmt

Author: jennybuckley

internal/fixture/state.go

@@ -88,7 +88,7 @@ func (s *State) Update(obj typed.YAMLObject, version fieldpath.APIVersion, manag
 		return err
 	}
 	tv, err := s.Parser.FromYAML(obj)
-	s.Live , err = s.Updater.Converter.Convert(s.Live, version)
+	s.Live, err = s.Updater.Converter.Convert(s.Live, version)
 	if err != nil {
 		return err
 	}
@@ -112,7 +112,7 @@ func (s *State) Apply(obj typed.YAMLObject, version fieldpath.APIVersion, manage
 	if err != nil {
 		return err
 	}
-	s.Live , err = s.Updater.Converter.Convert(s.Live, version)
+	s.Live, err = s.Updater.Converter.Convert(s.Live, version)
 	if err != nil {
 		return err
 	}

merge/key_test.go

@@ -1,29 +1,29 @@
 /*
 Copyright 2019 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 merge_test
- 
+
 import (
 	"testing"
- 
+
 	"sigs.k8s.io/structured-merge-diff/fieldpath"
 	. "sigs.k8s.io/structured-merge-diff/internal/fixture"
 	"sigs.k8s.io/structured-merge-diff/typed"
 )
- 
+
 var associativeListParser = func() typed.ParseableType {
 	parser, err := typed.NewParser(`types:
 - name: type
@@ -54,7 +54,7 @@ var associativeListParser = func() typed.ParseableType {
 	}
 	return parser.Type("type")
 }()
- 
+
 func TestUpdateAssociativeLists(t *testing.T) {
 	tests := map[string]TestCase{
 		"removing_obsolete_applied_structs": {
@@ -95,7 +95,7 @@ func TestUpdateAssociativeLists(t *testing.T) {
 			},
 		},
 	}
- 
+
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
 			if err := test.Test(associativeListParser); err != nil {

merge/multiple_appliers_test.go

@@ -825,7 +825,7 @@ func TestMultipleAppliersRealConversion(t *testing.T) {
 }
 
 // repeatingConverter repeats a single letterkey v times, where v is the version.
-type repeatingConverter struct{
+type repeatingConverter struct {
 	typed.ParseableType
 }
 
@@ -856,7 +856,7 @@ func (r repeatingConverter) Convert(v *typed.TypedValue, version fieldpath.APIVe
 			if len(spaces) == 0 {
 				break
 			}
-			c := line[len(spaces):len(spaces)+1]
+			c := line[len(spaces) : len(spaces)+1]
 			c = strings.Repeat(c, versionNumber)
 			str2 = fmt.Sprintf("%v\n%v%v:", str2, spaces, c)
 		}
@@ -869,15 +869,15 @@ func (r repeatingConverter) Convert(v *typed.TypedValue, version fieldpath.APIVe
 }
 
 func countLeadingSpace(line string) int {
-        spaces := 0
-        for _, letter := range line {
-                if letter == ' ' {
-                        spaces++
-                } else {
-                        break
-                }
-        }
-        return spaces
+	spaces := 0
+	for _, letter := range line {
+		if letter == ' ' {
+			spaces++
+		} else {
+			break
+		}
+	}
+	return spaces
 }
 
 // Convert implements merge.Converter

merge/nested_test.go

@@ -1,29 +1,29 @@
 /*
 Copyright 2019 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 merge_test
- 
+
 import (
 	"testing"
- 
+
 	"sigs.k8s.io/structured-merge-diff/fieldpath"
 	. "sigs.k8s.io/structured-merge-diff/internal/fixture"
 	"sigs.k8s.io/structured-merge-diff/typed"
 )
- 
+
 var nestedTypeParser = func() typed.ParseableType {
 	parser, err := typed.NewParser(`types:
 - name: type
@@ -103,7 +103,7 @@ var nestedTypeParser = func() typed.ParseableType {
 	}
 	return parser.Type("type")
 }()
- 
+
 func TestUpdateNestedType(t *testing.T) {
 	tests := map[string]TestCase{
 		"listOfLists_change_value": {
@@ -483,7 +483,7 @@ func TestUpdateNestedType(t *testing.T) {
 			},
 		},
 	}
- 
+
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
 			if err := test.Test(nestedTypeParser); err != nil {

merge/update.go

@@ -249,7 +249,6 @@ func (s *Updater) addBackOwnedItems(merged, pruned *typed.TypedValue, managedFie
 	return pruned, nil
 }
 
-
 // addBackDanglingItems makes sure that the only items removed by prune are items that were
 // previously owned by the currently applying manager. This will add back unowned items and items
 // which are owned by Updaters that shouldn't be removed.

typed/merge.go

@@ -405,7 +405,7 @@ func (w *mergingWalker) doUntyped(t schema.Untyped) (errs ValidationErrors) {
 	}
 	if t.ElementRelationship == schema.Deduced {
 		// Merge using the lhs's type on a shallow copy of the merge walker,
-		// to get rid of the merged output 
+		// to get rid of the merged output
 		w2 := *w
 		w2.typeRef = schema.DeduceType(w.lhs)
 		w2.merge()

typed/toset_test.go

@@ -166,8 +166,8 @@ var fieldsetCases = []fieldsetTestCase{{
 		{`{"arbitraryWavelengthColor":{"IR":255}}`, _NS(_P("arbitraryWavelengthColor"))},
 		{`{"args":[]}`, _NS(_P("args"))},
 		{`{"args":null}`, _NS(_P("args"))},
-		{`{"args":[null]}`,_NS(_P("args"))},
-		{`{"args":[{"key":"a","value":"b"},{"key":"c","value":"d"}]}`,_NS(_P("args"))},
+		{`{"args":[null]}`, _NS(_P("args"))},
+		{`{"args":[{"key":"a","value":"b"},{"key":"c","value":"d"}]}`, _NS(_P("args"))},
 	},
 }, {
 	name:         "associative list",