airship/airshipctl
Code Issues Proposed changes

Merge "Remove unused kubernetes String functions"

Browse Source
This commit is contained in:
Zuul 2020-03-26 22:43:08 +00:00 committed by Gerrit Code Review
commit b5c7167094
2 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/config/config.go
View File

@ -1010,35 +1010,3 @@ func ValidClusterType(clusterType string) error {
}
return fmt.Errorf("cluster type must be one of %v", AllClusterTypes)
}
/* ______________________________
PLACEHOLDER UNTIL I IDENTIFY if CLIENTADM
HAS SOMETHING LIKE THIS
*/
func KClusterString(cluster *clientcmdapi.Cluster) string {
yamlData, err := yaml.Marshal(&cluster)
if err != nil {
return ""
}
return string(yamlData)
}
func KContextString(context *clientcmdapi.Context) string {
yamlData, err := yaml.Marshal(&context)
if err != nil {
return ""
}
return string(yamlData)
}
func KAuthInfoString(authInfo *clientcmdapi.AuthInfo) string {
yamlData, err := yaml.Marshal(&authInfo)
if err != nil {
return ""
}
return string(yamlData)
}

31
pkg/config/config_test.go
View File

@ -416,37 +416,6 @@ func TestPurge(t *testing.T) {
assert.Falsef(t, os.IsExist(err), "Purge failed to remove file at %v", conf.LoadedConfigPath())
}
func TestKClusterString(t *testing.T) {
conf, cleanup := testutil.InitConfig(t)
defer cleanup(t)
kClusters := conf.KubeConfig().Clusters
for kClust := range kClusters {
assert.NotEmpty(t, config.KClusterString(kClusters[kClust]))
}
assert.EqualValues(t, config.KClusterString(nil), "null\n")
}
func TestKContextString(t *testing.T) {
conf, cleanup := testutil.InitConfig(t)
defer cleanup(t)
kContexts := conf.KubeConfig().Contexts
for kCtx := range kContexts {
assert.NotEmpty(t, config.KContextString(kContexts[kCtx]))
}
assert.EqualValues(t, config.KClusterString(nil), "null\n")
}
func TestKAuthInfoString(t *testing.T) {
conf, cleanup := testutil.InitConfig(t)
defer cleanup(t)
kAuthInfos := conf.KubeConfig().AuthInfos
for kAi := range kAuthInfos {
assert.NotEmpty(t, config.KAuthInfoString(kAuthInfos[kAi]))
}
assert.EqualValues(t, config.KAuthInfoString(nil), "null\n")
}
func TestComplexName(t *testing.T) {
cName := "aCluster"
ctName := config.Ephemeral