github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-09-03 08:04:45 +00:00
Code Issues Projects Releases Wiki Activity

Stop using mergo.MergeWithOverwrite

Browse Source 
Use the recommended replacement instead.

Kubernetes-commit: 243a9b204e14dc9c92f08cd3252c31731b9532fd
This commit is contained in:
Mikhail Mazurskiy
2020-06-15 21:11:27 +10:00
committed by Kubernetes Publisher
parent 277eea62aa
commit 6d09f8e62e
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/clientcmd/client_config_test.go
View File

@@ -63,7 +63,7 @@ func TestMergoSemantics(t *testing.T) {
},
}
for _, data := range testDataStruct {
err := mergo.MergeWithOverwrite(&data.dst, &data.src)
err := mergo.Merge(&data.dst, &data.src, mergo.WithOverride)
if err != nil {
t.Errorf("error while merging: %s", err)
}
@@ -92,7 +92,7 @@ func TestMergoSemantics(t *testing.T) {
},
}
for _, data := range testDataMap {
err := mergo.MergeWithOverwrite(&data.dst, &data.src)
err := mergo.Merge(&data.dst, &data.src, mergo.WithOverride)
if err != nil {
t.Errorf("error while merging: %s", err)
}