mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-03 19:58:17 +00:00
Add method to create strategic merge patch.
This commit is contained in:
jackgr
@@ -26,19 +26,26 @@ import (
|
||||
"github.com/ghodss/yaml"
|
||||
)
|
||||
|
||||
type TestCases struct {
|
||||
StrategicMergePatchCases []StrategicMergePatchCase
|
||||
SortMergeListTestCases []SortMergeListCase
|
||||
type StrategicMergePatchTestCases struct {
|
||||
TestCases []StrategicMergePatchTestCase
|
||||
}
|
||||
|
||||
type StrategicMergePatchCase struct {
|
||||
type SortMergeListTestCases struct {
|
||||
TestCases []SortMergeListTestCase
|
||||
}
|
||||
|
||||
type StrategicMergePatchTestCaseData struct {
|
||||
Original map[string]interface{}
|
||||
Patch map[string]interface{}
|
||||
Modified map[string]interface{}
|
||||
}
|
||||
|
||||
type StrategicMergePatchTestCase struct {
|
||||
Description string
|
||||
Patch map[string]interface{}
|
||||
Original map[string]interface{}
|
||||
Result map[string]interface{}
|
||||
StrategicMergePatchTestCaseData
|
||||
}
|
||||
|
||||
type SortMergeListCase struct {
|
||||
type SortMergeListTestCase struct {
|
||||
Description string
|
||||
Original map[string]interface{}
|
||||
Sorted map[string]interface{}
|
||||
@@ -47,6 +54,7 @@ type SortMergeListCase struct {
|
||||
type MergeItem struct {
|
||||
Name string
|
||||
Value string
|
||||
Other string
|
||||
MergingList []MergeItem `patchStrategy:"merge" patchMergeKey:"name"`
|
||||
NonMergingList []MergeItem
|
||||
MergingIntList []int `patchStrategy:"merge"`
|
||||
@@ -55,220 +63,10 @@ type MergeItem struct {
|
||||
SimpleMap map[string]string
|
||||
}
|
||||
|
||||
var testCaseData = []byte(`
|
||||
strategicMergePatchCases:
|
||||
- description: add new field
|
||||
original:
|
||||
name: 1
|
||||
patch:
|
||||
value: 1
|
||||
result:
|
||||
name: 1
|
||||
value: 1
|
||||
- description: remove field and add new field
|
||||
original:
|
||||
name: 1
|
||||
patch:
|
||||
name: null
|
||||
value: 1
|
||||
result:
|
||||
value: 1
|
||||
- description: merge arrays of scalars
|
||||
original:
|
||||
mergingIntList:
|
||||
- 1
|
||||
- 2
|
||||
patch:
|
||||
mergingIntList:
|
||||
- 2
|
||||
- 3
|
||||
result:
|
||||
mergingIntList:
|
||||
- 1
|
||||
- 2
|
||||
- 3
|
||||
- description: replace arrays of scalars
|
||||
original:
|
||||
nonMergingIntList:
|
||||
- 1
|
||||
- 2
|
||||
patch:
|
||||
nonMergingIntList:
|
||||
- 2
|
||||
- 3
|
||||
result:
|
||||
nonMergingIntList:
|
||||
- 2
|
||||
- 3
|
||||
- description: update param of list that should be merged but had element added serverside
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: a
|
||||
result:
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: a
|
||||
- name: 2
|
||||
value: 2
|
||||
- description: delete field when field is nested in a map
|
||||
original:
|
||||
simpleMap:
|
||||
key1: 1
|
||||
key2: 1
|
||||
patch:
|
||||
simpleMap:
|
||||
key2: null
|
||||
result:
|
||||
simpleMap:
|
||||
key1: 1
|
||||
- description: update nested list when nested list should not be merged
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
nonMergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- name: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
nonMergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
result:
|
||||
mergingList:
|
||||
- name: 1
|
||||
nonMergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
- name: 2
|
||||
- description: update nested list when nested list should be merged
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- name: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
result:
|
||||
mergingList:
|
||||
- name: 1
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- name: 2
|
||||
- description: update map when map should be replaced
|
||||
original:
|
||||
name: 1
|
||||
value: 1
|
||||
patch:
|
||||
value: 1
|
||||
$patch: replace
|
||||
result:
|
||||
value: 1
|
||||
- description: merge empty merge lists
|
||||
original:
|
||||
mergingList: []
|
||||
patch:
|
||||
mergingList: []
|
||||
result:
|
||||
mergingList: []
|
||||
- description: delete others in a map
|
||||
original:
|
||||
name: 1
|
||||
value: 1
|
||||
patch:
|
||||
$patch: replace
|
||||
result: {}
|
||||
- description: delete item from a merge list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- $patch: delete
|
||||
name: 1
|
||||
result:
|
||||
mergingList:
|
||||
- name: 2
|
||||
- description: add and delete item from a merge list
|
||||
original:
|
||||
merginglist:
|
||||
- name: 1
|
||||
- name: 2
|
||||
patch:
|
||||
merginglist:
|
||||
- name: 3
|
||||
- $patch: delete
|
||||
name: 1
|
||||
result:
|
||||
merginglist:
|
||||
- name: 2
|
||||
- name: 3
|
||||
- description: delete all items from a merge list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- $patch: replace
|
||||
result:
|
||||
mergingList: []
|
||||
- description: add new field inside pointers
|
||||
original:
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
patch:
|
||||
mergeItemPtr:
|
||||
- name: 2
|
||||
result:
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
- name: 2
|
||||
- description: update nested pointers
|
||||
original:
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- name: 2
|
||||
patch:
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
value: 1
|
||||
result:
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
value: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- name: 2
|
||||
sortMergeListTestCases:
|
||||
// These are test cases for SortMergeList, used to assert that it (recursively)
|
||||
// sorts both merging and non merging lists correctly.
|
||||
var sortMergeListTestCaseData = []byte(`
|
||||
testCases:
|
||||
- description: sort one list of maps
|
||||
original:
|
||||
mergingList:
|
||||
@@ -327,7 +125,7 @@ sortMergeListTestCases:
|
||||
- name: 1
|
||||
- name: 2
|
||||
- name: 3
|
||||
- description: merging list should NOT sort when nested in a non merging list
|
||||
- description: merging list should NOT sort when nested in non merging list
|
||||
original:
|
||||
nonMergingList:
|
||||
- name: 2
|
||||
@@ -350,7 +148,7 @@ sortMergeListTestCases:
|
||||
mergingList:
|
||||
- name: 2
|
||||
- name: 1
|
||||
- description: sort a very nested list of maps
|
||||
- description: sort very nested list of maps
|
||||
fieldTypes:
|
||||
original:
|
||||
mergingList:
|
||||
@@ -410,7 +208,7 @@ sortMergeListTestCases:
|
||||
- 1
|
||||
- 2
|
||||
- 3
|
||||
- description: sort one pointer of maps
|
||||
- description: sort merging list by pointer
|
||||
original:
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
@@ -423,81 +221,546 @@ sortMergeListTestCases:
|
||||
- name: 3
|
||||
`)
|
||||
|
||||
func TestStrategicMergePatch(t *testing.T) {
|
||||
tc := TestCases{}
|
||||
err := yaml.Unmarshal(testCaseData, &tc)
|
||||
if err != nil {
|
||||
t.Errorf("can't unmarshal test cases: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
var e MergeItem
|
||||
for _, c := range tc.StrategicMergePatchCases {
|
||||
result, err := StrategicMergePatchData(toJSON(c.Original), toJSON(c.Patch), e)
|
||||
if err != nil {
|
||||
t.Errorf("error patching: %v:\noriginal:\n%s\npatch:\n%s",
|
||||
err, toYAML(c.Original), toYAML(c.Patch))
|
||||
}
|
||||
|
||||
// Sort the lists that have merged maps, since order is not significant.
|
||||
result, err = sortMergeListsByName(result, e)
|
||||
if err != nil {
|
||||
t.Errorf("error sorting result object: %v", err)
|
||||
}
|
||||
cResult, err := sortMergeListsByName(toJSON(c.Result), e)
|
||||
if err != nil {
|
||||
t.Errorf("error sorting result object: %v", err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(result, cResult) {
|
||||
t.Errorf("patching failed: %s\noriginal:\n%s\npatch:\n%s\nexpected result:\n%s\ngot result:\n%s",
|
||||
c.Description, toYAML(c.Original), toYAML(c.Patch), jsonToYAML(cResult), jsonToYAML(result))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestSortMergeLists(t *testing.T) {
|
||||
tc := TestCases{}
|
||||
err := yaml.Unmarshal(testCaseData, &tc)
|
||||
tc := SortMergeListTestCases{}
|
||||
err := yaml.Unmarshal(sortMergeListTestCaseData, &tc)
|
||||
if err != nil {
|
||||
t.Errorf("can't unmarshal test cases: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
var e MergeItem
|
||||
for _, c := range tc.SortMergeListTestCases {
|
||||
sorted, err := sortMergeListsByName(toJSON(c.Original), e)
|
||||
for _, c := range tc.TestCases {
|
||||
sorted, err := sortMergeListsByName(toJSONOrFail(c.Original, t), e)
|
||||
if err != nil {
|
||||
t.Errorf("sort arrays returned error: %v", err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(sorted, toJSON(c.Sorted)) {
|
||||
t.Errorf("sorting failed: %s\ntried to sort:\n%s\nexpected:\n%s\ngot:\n%s",
|
||||
c.Description, toYAML(c.Original), toYAML(c.Sorted), jsonToYAML(sorted))
|
||||
if !reflect.DeepEqual(sorted, toJSONOrFail(c.Sorted, t)) {
|
||||
t.Errorf("sorting failed: %v\ntried to sort:\n%vexpected:\n%vgot:\n%v",
|
||||
c.Description, toYAMLOrError(c.Original), toYAMLOrError(c.Sorted), jsonToYAMLOrError(sorted))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func toYAML(v interface{}) string {
|
||||
y, err := yaml.Marshal(v)
|
||||
// These are test cases for StrategicMergePatch that cannot be generated using
|
||||
// CreateStrategicMergePatch because it doesn't use the replace directive, generate
|
||||
// duplicate integers for a merging list patch, or generate empty merging lists.
|
||||
var customStrategicMergePatchTestCaseData = []byte(`
|
||||
testCases:
|
||||
- description: unique scalars when merging lists
|
||||
original:
|
||||
mergingIntList:
|
||||
- 1
|
||||
- 2
|
||||
patch:
|
||||
mergingIntList:
|
||||
- 2
|
||||
- 3
|
||||
modified:
|
||||
mergingIntList:
|
||||
- 1
|
||||
- 2
|
||||
- 3
|
||||
- description: delete all items from merging list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- $patch: replace
|
||||
modified:
|
||||
mergingList: []
|
||||
- description: merge empty merging lists
|
||||
original:
|
||||
mergingList: []
|
||||
patch:
|
||||
mergingList: []
|
||||
modified:
|
||||
mergingList: []
|
||||
- description: delete all keys from map
|
||||
original:
|
||||
name: 1
|
||||
value: 1
|
||||
patch:
|
||||
$patch: replace
|
||||
modified: {}
|
||||
- description: add key and delete all keys from map
|
||||
original:
|
||||
name: 1
|
||||
value: 1
|
||||
patch:
|
||||
other: a
|
||||
$patch: replace
|
||||
modified:
|
||||
other: a
|
||||
`)
|
||||
|
||||
func TestCustomStrategicMergePatch(t *testing.T) {
|
||||
tc := StrategicMergePatchTestCases{}
|
||||
err := yaml.Unmarshal(customStrategicMergePatchTestCaseData, &tc)
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("yaml marshal failed: %v", err))
|
||||
t.Errorf("can't unmarshal test cases: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
for _, c := range tc.TestCases {
|
||||
cOriginal, cPatch, cModified := testCaseToJSONOrFail(t, c)
|
||||
testPatchApplication(t, cOriginal, cPatch, cModified, c.Description)
|
||||
}
|
||||
}
|
||||
|
||||
func testCaseToJSONOrFail(t *testing.T, c StrategicMergePatchTestCase) ([]byte, []byte, []byte) {
|
||||
var e MergeItem
|
||||
cOriginal := toJSONOrFail(c.Original, t)
|
||||
cPatch, err := sortMergeListsByName(toJSONOrFail(c.Patch, t), e)
|
||||
if err != nil {
|
||||
t.Errorf("error:%v sorting patch object:\n%v", err, c.Patch)
|
||||
}
|
||||
|
||||
cModified, err := sortMergeListsByName(toJSONOrFail(c.Modified, t), e)
|
||||
if err != nil {
|
||||
t.Errorf("error: %v sorting modified object:\n%v", err, c.Modified)
|
||||
}
|
||||
|
||||
return cOriginal, cPatch, cModified
|
||||
}
|
||||
|
||||
func testPatchApplication(t *testing.T, cOriginal, cPatch, cModified []byte, description string) {
|
||||
var e MergeItem
|
||||
modified, err := StrategicMergePatch(cOriginal, cPatch, e)
|
||||
if err != nil {
|
||||
t.Errorf("error applying patch: %v:\noriginal:\n%vpatch:\n%v",
|
||||
err, jsonToYAMLOrError(cOriginal), jsonToYAMLOrError(cPatch))
|
||||
}
|
||||
|
||||
// Sort the lists that have merged maps, since order is not significant.
|
||||
modified, err = sortMergeListsByName(modified, e)
|
||||
if err != nil {
|
||||
t.Errorf("error: %v sorting modified object:\n%v", err, modified)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(modified, cModified) {
|
||||
t.Errorf("patch application failed: %v\noriginal:\n%vpatch:\n%vexpected modified:\n%vgot modified:\n%v",
|
||||
description, jsonToYAMLOrError(cOriginal), jsonToYAMLOrError(cPatch),
|
||||
jsonToYAMLOrError(cModified), jsonToYAMLOrError(modified))
|
||||
}
|
||||
}
|
||||
|
||||
// These are test cases for CreateStrategicMergePatch, used to assert that it
|
||||
// generates the correct patch for a given outcome. They are also test cases for
|
||||
// StrategicMergePatch, used to assert that applying a patch yields the correct
|
||||
// outcome.
|
||||
var createStrategicMergePatchTestCaseData = []byte(`
|
||||
testCases:
|
||||
- description: add field to map
|
||||
original:
|
||||
name: 1
|
||||
patch:
|
||||
value: 1
|
||||
modified:
|
||||
name: 1
|
||||
value: 1
|
||||
- description: add field and delete field from map
|
||||
original:
|
||||
name: 1
|
||||
patch:
|
||||
name: null
|
||||
value: 1
|
||||
modified:
|
||||
value: 1
|
||||
- description: delete field from nested map
|
||||
original:
|
||||
simpleMap:
|
||||
key1: 1
|
||||
key2: 1
|
||||
patch:
|
||||
simpleMap:
|
||||
key2: null
|
||||
modified:
|
||||
simpleMap:
|
||||
key1: 1
|
||||
- description: delete all fields from map
|
||||
original:
|
||||
name: 1
|
||||
value: 1
|
||||
patch:
|
||||
name: null
|
||||
value: null
|
||||
modified: {}
|
||||
- description: add field and delete all fields from map
|
||||
original:
|
||||
name: 1
|
||||
value: 1
|
||||
patch:
|
||||
other: a
|
||||
name: null
|
||||
value: null
|
||||
modified:
|
||||
other: a
|
||||
- description: replace list of scalars
|
||||
original:
|
||||
nonMergingIntList:
|
||||
- 1
|
||||
- 2
|
||||
patch:
|
||||
nonMergingIntList:
|
||||
- 2
|
||||
- 3
|
||||
modified:
|
||||
nonMergingIntList:
|
||||
- 2
|
||||
- 3
|
||||
- description: merge lists of scalars
|
||||
original:
|
||||
mergingIntList:
|
||||
- 1
|
||||
- 2
|
||||
patch:
|
||||
mergingIntList:
|
||||
- 3
|
||||
modified:
|
||||
mergingIntList:
|
||||
- 1
|
||||
- 2
|
||||
- 3
|
||||
- description: merge lists of maps
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 3
|
||||
value: 3
|
||||
modified:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- name: 3
|
||||
value: 3
|
||||
- description: add field to map in merging list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
modified:
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- description: add duplicate field to map in merging list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
modified:
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- description: replace map field value in merging list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: a
|
||||
modified:
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: a
|
||||
- name: 2
|
||||
value: 2
|
||||
- description: delete map from merging list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
$patch: delete
|
||||
modified:
|
||||
mergingList:
|
||||
- name: 2
|
||||
- description: delete missing map from merging list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
$patch: delete
|
||||
modified:
|
||||
mergingList:
|
||||
- name: 2
|
||||
- description: add map and delete map from merging list
|
||||
original:
|
||||
merginglist:
|
||||
- name: 1
|
||||
- name: 2
|
||||
patch:
|
||||
merginglist:
|
||||
- name: 1
|
||||
$patch: delete
|
||||
- name: 3
|
||||
modified:
|
||||
merginglist:
|
||||
- name: 2
|
||||
- name: 3
|
||||
- description: delete all maps from merging list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
$patch: delete
|
||||
- name: 2
|
||||
$patch: delete
|
||||
modified:
|
||||
mergingList: []
|
||||
- description: delete all maps from partially empty merging list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
$patch: delete
|
||||
- name: 2
|
||||
$patch: delete
|
||||
modified:
|
||||
mergingList: []
|
||||
- description: delete all maps from empty merging list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
$patch: delete
|
||||
- name: 2
|
||||
$patch: delete
|
||||
modified:
|
||||
mergingList: []
|
||||
- description: delete field from map in merging list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: null
|
||||
modified:
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- description: replace non merging list nested in merging list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
nonMergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- name: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
nonMergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
modified:
|
||||
mergingList:
|
||||
- name: 1
|
||||
nonMergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
- name: 2
|
||||
- description: add field to map in merging list nested in merging list
|
||||
original:
|
||||
mergingList:
|
||||
- name: 1
|
||||
mergingList:
|
||||
- name: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- name: 2
|
||||
patch:
|
||||
mergingList:
|
||||
- name: 1
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
modified:
|
||||
mergingList:
|
||||
- name: 1
|
||||
mergingList:
|
||||
- name: 1
|
||||
value: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- name: 2
|
||||
- description: merge empty merging lists
|
||||
original:
|
||||
mergingList: []
|
||||
patch:
|
||||
{}
|
||||
modified:
|
||||
mergingList: []
|
||||
current:
|
||||
mergingList: []
|
||||
result:
|
||||
mergingList: []
|
||||
- description: add map to merging list by pointer
|
||||
original:
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
patch:
|
||||
mergeItemPtr:
|
||||
- name: 2
|
||||
modified:
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
- name: 2
|
||||
- description: add field to map in merging list by pointer
|
||||
original:
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- name: 2
|
||||
patch:
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
value: 1
|
||||
modified:
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
mergeItemPtr:
|
||||
- name: 1
|
||||
value: 1
|
||||
- name: 2
|
||||
value: 2
|
||||
- name: 2
|
||||
`)
|
||||
|
||||
func TestStrategicMergePatch(t *testing.T) {
|
||||
tc := StrategicMergePatchTestCases{}
|
||||
err := yaml.Unmarshal(createStrategicMergePatchTestCaseData, &tc)
|
||||
if err != nil {
|
||||
t.Errorf("can't unmarshal test cases: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
var e MergeItem
|
||||
for _, c := range tc.TestCases {
|
||||
cOriginal, cPatch, cModified := testCaseToJSONOrFail(t, c)
|
||||
|
||||
// Test patch generation
|
||||
patch, err := CreateStrategicMergePatch(cOriginal, cModified, e)
|
||||
if err != nil {
|
||||
t.Errorf("error generating patch: %s:\n%v", err, toYAMLOrError(c.StrategicMergePatchTestCaseData))
|
||||
}
|
||||
|
||||
// Sort the lists that have merged maps, since order is not significant.
|
||||
patch, err = sortMergeListsByName(patch, e)
|
||||
if err != nil {
|
||||
t.Errorf("error: %s sorting patch object:\n%v", err, patch)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(patch, cPatch) {
|
||||
t.Errorf("patch generation failed:\n%vgot patch:\n%v", toYAMLOrError(c.StrategicMergePatchTestCaseData), jsonToYAMLOrError(patch))
|
||||
}
|
||||
|
||||
// Test patch application
|
||||
testPatchApplication(t, cOriginal, cPatch, cModified, c.Description)
|
||||
}
|
||||
}
|
||||
|
||||
func toYAMLOrError(v interface{}) string {
|
||||
y, err := toYAML(v)
|
||||
if err != nil {
|
||||
return err.Error()
|
||||
}
|
||||
|
||||
return y
|
||||
}
|
||||
|
||||
func toJSONOrFail(v interface{}, t *testing.T) []byte {
|
||||
theJSON, err := toJSON(v)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
return theJSON
|
||||
}
|
||||
|
||||
func jsonToYAMLOrError(j []byte) string {
|
||||
y, err := jsonToYAML(j)
|
||||
if err != nil {
|
||||
return err.Error()
|
||||
}
|
||||
|
||||
return string(y)
|
||||
}
|
||||
|
||||
func toJSON(v interface{}) []byte {
|
||||
j, err := json.Marshal(v)
|
||||
func toYAML(v interface{}) (string, error) {
|
||||
y, err := yaml.Marshal(v)
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("json marshal failed: %s", spew.Sdump(v)))
|
||||
return "", fmt.Errorf("yaml marshal failed: %v\n%v", err, spew.Sdump(v))
|
||||
}
|
||||
return j
|
||||
|
||||
return string(y), nil
|
||||
}
|
||||
|
||||
func jsonToYAML(j []byte) []byte {
|
||||
func toJSON(v interface{}) ([]byte, error) {
|
||||
j, err := json.Marshal(v)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("json marshal failed: %v\n%v", err, spew.Sdump(v))
|
||||
}
|
||||
|
||||
return j, nil
|
||||
}
|
||||
|
||||
func jsonToYAML(j []byte) ([]byte, error) {
|
||||
y, err := yaml.JSONToYAML(j)
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("json to yaml failed: %v", err))
|
||||
return nil, fmt.Errorf("json to yaml failed: %v\n%v", err, j)
|
||||
}
|
||||
return y
|
||||
|
||||
return y, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user