github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-07-17 16:52:22 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/clientcmd/client_config.go
View File

@ -198,13 +198,13 @@ func (config *DirectClientConfig) ClientConfig() (*restclient.Config, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
mergo.MergeWithOverwrite(clientConfig, userAuthPartialConfig) mergo.Merge(clientConfig, userAuthPartialConfig, mergo.WithOverride)
serverAuthPartialConfig, err := getServerIdentificationPartialConfig(configAuthInfo, configClusterInfo) serverAuthPartialConfig, err := getServerIdentificationPartialConfig(configAuthInfo, configClusterInfo)
if err != nil { if err != nil {
return nil, err return nil, err
} }
mergo.MergeWithOverwrite(clientConfig, serverAuthPartialConfig) mergo.Merge(clientConfig, serverAuthPartialConfig, mergo.WithOverride)
} }
return clientConfig, nil return clientConfig, nil
@ -225,7 +225,7 @@ func getServerIdentificationPartialConfig(configAuthInfo clientcmdapi.AuthInfo,
configClientConfig.CAData = configClusterInfo.CertificateAuthorityData configClientConfig.CAData = configClusterInfo.CertificateAuthorityData
configClientConfig.Insecure = configClusterInfo.InsecureSkipTLSVerify configClientConfig.Insecure = configClusterInfo.InsecureSkipTLSVerify
configClientConfig.ServerName = configClusterInfo.TLSServerName configClientConfig.ServerName = configClusterInfo.TLSServerName
mergo.MergeWithOverwrite(mergedConfig, configClientConfig) mergo.Merge(mergedConfig, configClientConfig, mergo.WithOverride)
return mergedConfig, nil return mergedConfig, nil
} }
@ -294,8 +294,8 @@ func (config *DirectClientConfig) getUserIdentificationPartialConfig(configAuthI
promptedConfig := makeUserIdentificationConfig(*promptedAuthInfo) promptedConfig := makeUserIdentificationConfig(*promptedAuthInfo)
previouslyMergedConfig := mergedConfig previouslyMergedConfig := mergedConfig
mergedConfig = &restclient.Config{} mergedConfig = &restclient.Config{}
mergo.MergeWithOverwrite(mergedConfig, promptedConfig) mergo.Merge(mergedConfig, promptedConfig, mergo.WithOverride)
mergo.MergeWithOverwrite(mergedConfig, previouslyMergedConfig) mergo.Merge(mergedConfig, previouslyMergedConfig, mergo.WithOverride)
config.promptedCredentials.username = mergedConfig.Username config.promptedCredentials.username = mergedConfig.Username
config.promptedCredentials.password = mergedConfig.Password config.promptedCredentials.password = mergedConfig.Password
} }
@ -463,12 +463,12 @@ func (config *DirectClientConfig) getContext() (clientcmdapi.Context, error) {
mergedContext := clientcmdapi.NewContext() mergedContext := clientcmdapi.NewContext()
if configContext, exists := contexts[contextName]; exists { if configContext, exists := contexts[contextName]; exists {
mergo.MergeWithOverwrite(mergedContext, configContext) mergo.Merge(mergedContext, configContext, mergo.WithOverride)
} else if required { } else if required {
return clientcmdapi.Context{}, fmt.Errorf("context %q does not exist", contextName) return clientcmdapi.Context{}, fmt.Errorf("context %q does not exist", contextName)
} }
if config.overrides != nil { if config.overrides != nil {
mergo.MergeWithOverwrite(mergedContext, config.overrides.Context) mergo.Merge(mergedContext, config.overrides.Context, mergo.WithOverride)
} }
return *mergedContext, nil return *mergedContext, nil
@ -481,12 +481,12 @@ func (config *DirectClientConfig) getAuthInfo() (clientcmdapi.AuthInfo, error) {
mergedAuthInfo := clientcmdapi.NewAuthInfo() mergedAuthInfo := clientcmdapi.NewAuthInfo()
if configAuthInfo, exists := authInfos[authInfoName]; exists { if configAuthInfo, exists := authInfos[authInfoName]; exists {
mergo.MergeWithOverwrite(mergedAuthInfo, configAuthInfo) mergo.Merge(mergedAuthInfo, configAuthInfo, mergo.WithOverride)
} else if required { } else if required {
return clientcmdapi.AuthInfo{}, fmt.Errorf("auth info %q does not exist", authInfoName) return clientcmdapi.AuthInfo{}, fmt.Errorf("auth info %q does not exist", authInfoName)
} }
if config.overrides != nil { if config.overrides != nil {
mergo.MergeWithOverwrite(mergedAuthInfo, config.overrides.AuthInfo) mergo.Merge(mergedAuthInfo, config.overrides.AuthInfo, mergo.WithOverride)
} }
return *mergedAuthInfo, nil return *mergedAuthInfo, nil
@ -499,15 +499,15 @@ func (config *DirectClientConfig) getCluster() (clientcmdapi.Cluster, error) {
mergedClusterInfo := clientcmdapi.NewCluster() mergedClusterInfo := clientcmdapi.NewCluster()
if config.overrides != nil { if config.overrides != nil {
mergo.MergeWithOverwrite(mergedClusterInfo, config.overrides.ClusterDefaults) mergo.Merge(mergedClusterInfo, config.overrides.ClusterDefaults, mergo.WithOverride)
} }
if configClusterInfo, exists := clusterInfos[clusterInfoName]; exists { if configClusterInfo, exists := clusterInfos[clusterInfoName]; exists {
mergo.MergeWithOverwrite(mergedClusterInfo, configClusterInfo) mergo.Merge(mergedClusterInfo, configClusterInfo, mergo.WithOverride)
} else if required { } else if required {
return clientcmdapi.Cluster{}, fmt.Errorf("cluster %q does not exist", clusterInfoName) return clientcmdapi.Cluster{}, fmt.Errorf("cluster %q does not exist", clusterInfoName)
} }
if config.overrides != nil { if config.overrides != nil {
mergo.MergeWithOverwrite(mergedClusterInfo, config.overrides.ClusterInfo) mergo.Merge(mergedClusterInfo, config.overrides.ClusterInfo, mergo.WithOverride)
} }
// * An override of --insecure-skip-tls-verify=true and no accompanying CA/CA data should clear already-set CA/CA data // * An override of --insecure-skip-tls-verify=true and no accompanying CA/CA data should clear already-set CA/CA data

4
tools/clientcmd/client_config_test.go
View File

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

8
tools/clientcmd/loader.go
View File

@ -226,7 +226,7 @@ func (rules *ClientConfigLoadingRules) Load() (*clientcmdapi.Config, error) {
mapConfig := clientcmdapi.NewConfig() mapConfig := clientcmdapi.NewConfig()
for _, kubeconfig := range kubeconfigs { for _, kubeconfig := range kubeconfigs {
mergo.MergeWithOverwrite(mapConfig, kubeconfig) mergo.Merge(mapConfig, kubeconfig, mergo.WithOverride)
} }
// merge all of the struct values in the reverse order so that priority is given correctly // merge all of the struct values in the reverse order so that priority is given correctly
@ -234,14 +234,14 @@ func (rules *ClientConfigLoadingRules) Load() (*clientcmdapi.Config, error) {
nonMapConfig := clientcmdapi.NewConfig() nonMapConfig := clientcmdapi.NewConfig()
for i := len(kubeconfigs) - 1; i >= 0; i-- { for i := len(kubeconfigs) - 1; i >= 0; i-- {
kubeconfig := kubeconfigs[i] kubeconfig := kubeconfigs[i]
mergo.MergeWithOverwrite(nonMapConfig, kubeconfig) mergo.Merge(nonMapConfig, kubeconfig, mergo.WithOverride)
} }
// since values are overwritten, but maps values are not, we can merge the non-map config on top of the map config and // since values are overwritten, but maps values are not, we can merge the non-map config on top of the map config and
// get the values we expect. // get the values we expect.
config := clientcmdapi.NewConfig() config := clientcmdapi.NewConfig()
mergo.MergeWithOverwrite(config, mapConfig) mergo.Merge(config, mapConfig, mergo.WithOverride)
mergo.MergeWithOverwrite(config, nonMapConfig) mergo.Merge(config, nonMapConfig, mergo.WithOverride)
if rules.ResolvePaths() { if rules.ResolvePaths() {
if err := ResolveLocalPaths(config); err != nil { if err := ResolveLocalPaths(config); err != nil {