github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

fix bug of swallowing missing merge key error

Browse Source
This commit is contained in:
ymqytw 2018-01-04 16:53:42 -08:00
parent e991a94d2d
commit 51f033a4f1
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go
View File

@ -1322,23 +1322,23 @@ func mergeMap(original, patch map[string]interface{}, schema LookupPatchMeta, me
// If they're both maps or lists, recurse into the value. // If they're both maps or lists, recurse into the value.
switch originalType.Kind() { switch originalType.Kind() {
case reflect.Map: case reflect.Map:
subschema, patchMeta, err := schema.LookupPatchMetadataForStruct(k) subschema, patchMeta, err2 := schema.LookupPatchMetadataForStruct(k)
if err != nil { if err2 != nil {
return nil, err return nil, err2
} }
_, patchStrategy, err := extractRetainKeysPatchStrategy(patchMeta.GetPatchStrategies()) _, patchStrategy, err2 := extractRetainKeysPatchStrategy(patchMeta.GetPatchStrategies())
if err != nil { if err2 != nil {
return nil, err return nil, err2
} }
original[k], err = mergeMapHandler(original[k], patchV, subschema, patchStrategy, mergeOptions) original[k], err = mergeMapHandler(original[k], patchV, subschema, patchStrategy, mergeOptions)
case reflect.Slice: case reflect.Slice:
subschema, patchMeta, err := schema.LookupPatchMetadataForSlice(k) subschema, patchMeta, err2 := schema.LookupPatchMetadataForSlice(k)
if err != nil { if err2 != nil {
return nil, err return nil, err2
} }
_, patchStrategy, err := extractRetainKeysPatchStrategy(patchMeta.GetPatchStrategies()) _, patchStrategy, err2 := extractRetainKeysPatchStrategy(patchMeta.GetPatchStrategies())
if err != nil { if err2 != nil {
return nil, err return nil, err2
} }
original[k], err = mergeSliceHandler(original[k], patchV, subschema, patchStrategy, patchMeta.GetPatchMergeKey(), isDeleteList, mergeOptions) original[k], err = mergeSliceHandler(original[k], patchV, subschema, patchStrategy, patchMeta.GetPatchMergeKey(), isDeleteList, mergeOptions)
default: default:

15
staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch_test.go
View File

@ -654,6 +654,21 @@ mergingIntList:
ExpectedError: "doesn't match", ExpectedError: "doesn't match",
}, },
}, },
{
Description: "missing merge key should error out",
StrategicMergePatchRawTestCaseData: StrategicMergePatchRawTestCaseData{
Original: []byte(`
mergingList:
- name: 1
value: a
`),
TwoWay: []byte(`
mergingList:
- value: b
`),
ExpectedError: "does not contain declared merge key",
},
},
} }
func TestCustomStrategicMergePatch(t *testing.T) { func TestCustomStrategicMergePatch(t *testing.T) {