fix bug

cmd/add.go

@@ -96,11 +96,10 @@ func getAddConfig(kubeconfig string) (*clientcmdapi.Config, error) {
 		log.Fatal("Only support add 1 context.")
 	}
 
-	name := getName()
+	name := getName(kubeconfig)
 	err = nameCheck(name)
 	if err != nil {
-		Error.Println(err)
-		os.Exit(-1)
+		log.Fatal(err)
 	}
 	suffix := HashSuf(config)
 	username := fmt.Sprintf("user-%v", suffix)
@@ -151,7 +150,10 @@ func fileExists(path string) bool {
 	return true
 }
 
-func getName() string {
+func getName(kubeconfig string) string {
+	if file == ""{
+		return kubeconfig
+	}
 	if name == "" {
 		n := strings.Split(file, "/")
 		result := strings.Split(n[len(n)-1], ".")

cmd/merge.go

@@ -22,6 +22,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	clientcmdlatest "k8s.io/client-go/tools/clientcmd/api/latest"
+	"log"
 	"os"
 	"sigs.k8s.io/yaml"
 	"strings"
@@ -60,8 +61,7 @@ func (mc MergeCommand) runMerge(command *cobra.Command, args []string) error {
 	for _, yaml := range files {
 		config, err := LoadClientConfig(yaml)
 		if err != nil {
-			fmt.Println(err)
-			os.Exit(-1)
+			log.Fatal(err)
 		}
 		name := nameHandle(yaml)
 		commandLineFile, _ := ioutil.TempFile("", "")

cmd/rename.go

@@ -60,7 +60,7 @@ func (rc *RenameCommand) runRename(command *cobra.Command, args []string) error
 		rename := PromptUI("Rename", kubeName)
 		if rename != kubeName {
 			if _, ok := config.Contexts[rename]; ok {
-				log.Fatal("Name: %s already exists", rename)
+				log.Fatalf("Name: %s already exists", rename)
 			} else {
 				if obj, ok := config.Contexts[kubeName]; ok {
 					config.Contexts[rename] = obj

cmd/utils.go

@@ -46,7 +46,7 @@ func ModifyKubeConfig(config *clientcmdapi.Config) error {
 	pathOptions := clientcmd.NewDefaultPathOptions()
 
 	if err := clientcmd.ModifyConfig(pathOptions, *config, true); err != nil {
-		log.Println("Unexpected error: %v", err)
+		log.Printf("Unexpected error: %v", err)
 		return err
 	}
 	return nil

go.mod

@@ -1,6 +1,6 @@
 module github.com/sunny0826/kubecm
 
-go 1.12
+go 1.13
 
 require (
 	github.com/bndr/gotabulate v1.1.2