Merge pull request #53173 from alrs/fix-strategicpatch-swallowed-errors

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix strategicpatch swallowed errors **What this PR does / why we need it**: Fixes four dropped error variables in `apimachinery`. ```release-note NONE ```

Merge pull request #53173 from alrs/fix-strategicpatch-swallowed-errors
d52c708b · Kubernetes Submit Queue · GitHub · d9e529ad · 1bdc6574 · d52c708b
Commit d52c708b authored Oct 26, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 26, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

patch.go .../src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go +12 -0

No files found.
--- a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go
@@ -515,6 +515,9 @@ func normalizeSliceOrder(toSort, order []interface{}, mergeKey string, kind refl
 			return nil, err
 		}
 		toSort, toDelete, err = extractToDeleteItems(toSort)
+		if err != nil {
+			return nil, err
+		}
 	}

 	sort.SliceStable(toSort, func(i, j int) bool {
@@ -554,7 +557,13 @@ func diffLists(original, modified []interface{}, t reflect.Type, mergeKey string
 	switch kind {
 	case reflect.Map:
 		patchList, deleteList, err = diffListsOfMaps(original, modified, t, mergeKey, diffOptions)
+		if err != nil {
+			return nil, nil, nil, err
+		}
 		patchList, err = normalizeSliceOrder(patchList, modified, mergeKey, kind)
+		if err != nil {
+			return nil, nil, nil, err
+		}
 		orderSame, err := isOrderSame(original, modified, mergeKey)
 		if err != nil {
 			return nil, nil, nil, err
@@ -580,6 +589,9 @@ func diffLists(original, modified []interface{}, t reflect.Type, mergeKey string
 		return nil, nil, nil, mergepatch.ErrNoListOfLists
 	default:
 		patchList, deleteList, err = diffListsOfScalars(original, modified, diffOptions)
+		if err != nil {
+			return nil, nil, nil, err
+		}
 		patchList, err = normalizeSliceOrder(patchList, modified, mergeKey, kind)
 		// generate the setElementOrder list when there are content changes or order changes
 		if diffOptions.SetElementOrder && ((!diffOptions.IgnoreDeletions && len(deleteList) > 0) ||