Merge pull request #9 from bvankampen/bug-fix

bugfixes and multiple supported extensions (yaml, config, conf)

Author: bvankampen

VERSION

@@ -1 +1 @@
-1.3.1
+1.4

internal/config/main.go

@@ -17,7 +17,7 @@ const (
 var defaultConf = AppConfig{
 	KubeconfigDir:       "~/.kube",
 	KubeconfigFile:      "config",
-	ExtraKubeconfigDirs: []string{"~/Downloads"},
+	ExtraKubeconfigDirs: []string{},
 	ShowKubeConfig:      true,
 	CreateLink:          true,
 }

internal/kubeconfig/main.go

@@ -36,16 +36,28 @@ func loadKubeConfig(dir string, file string) (api.Config, error) {
 	return *config, nil
 }
 
+func checkSuffixes(fileName string) bool {
+	suffixes := []string{".yaml", ".config", ".conf"}
+	for _, suffix := range suffixes {
+		if strings.HasSuffix(fileName, suffix) {
+			return true
+		}
+	}
+	return false
+}
+
 func loadKubeConfigsFromDirectory(dir string) []api.Config {
 	var apiConfigs []api.Config
 	dir, _ = homedir.Expand(dir)
 	files, err := os.ReadDir(dir)
 	if err != nil {
-		logrus.Fatalf("Error reading directory: %s (%v)", dir, err)
+		logrus.Errorf("Error reading directory: %s (%v)", dir, err)
+		return nil
 	}
 	for _, file := range files {
 		if !file.IsDir() {
-			if strings.HasSuffix(file.Name(), ".yaml") {
+			// if strings.HasSuffix(file.Name(), ".yaml") {
+			if checkSuffixes(file.Name()) {
 				config, err := loadKubeConfig(dir, file.Name())
 				if err == nil {
 					apiConfigs = append(apiConfigs, config)
@@ -57,6 +69,11 @@ func loadKubeConfigsFromDirectory(dir string) []api.Config {
 }
 
 func LoadKubeConfigs(appconfig config.AppConfig) ([]api.Config, api.Config) {
+	kubeConfigDir, _ := homedir.Expand(appconfig.KubeconfigDir)
+	_, err := os.ReadDir(kubeConfigDir)
+	if err != nil {
+		logrus.Fatalf("Error reading kubeconfig directory: %s (%v)", kubeConfigDir, err)
+	}
 	apiConfigs := loadKubeConfigsFromDirectory(appconfig.KubeconfigDir)
 	for _, dir := range appconfig.ExtraKubeconfigDirs {
 		apiConfigs = append(apiConfigs, loadKubeConfigsFromDirectory(dir)...)

internal/ui/app_main.go

@@ -117,6 +117,9 @@ func (ui *UI) deleteConfigByIndex(index int) {
 }
 
 func (ui *UI) getConfigByIndex(index int) (string, api.Config, *api.Context) {
+	if ui.list.GetItemCount() == 0 {
+		return "", api.Config{}, &api.Context{}
+	}
 	contextName, _ := ui.list.GetItemText(index)
 	for _, config := range ui.kubeConfigs {
 		for name, context := range config.Contexts {
@@ -133,12 +136,14 @@ func (ui *UI) createInfoTable() *tview.Table {
 	infoTable.SetBorder(true)
 	infoTable.SetTitle("Cluster")
 	name, config, context := ui.getConfigByIndex(ui.list.GetCurrentItem())
-	addtoTable(infoTable, "Context", name)
-	addtoTable(infoTable, "Cluster", context.Cluster)
-	addtoTable(infoTable, "User", context.AuthInfo)
+	if name != "" {
+		addtoTable(infoTable, "Context", name)
+		addtoTable(infoTable, "Cluster", context.Cluster)
+		addtoTable(infoTable, "User", context.AuthInfo)
 
-	addtoTable(infoTable, "Server", config.Clusters[context.Cluster].Server)
-	addtoTable(infoTable, "File", context.LocationOfOrigin)
+		addtoTable(infoTable, "Server", config.Clusters[context.Cluster].Server)
+		addtoTable(infoTable, "File", context.LocationOfOrigin)
+	}
 	return infoTable
 }
 
@@ -186,6 +191,9 @@ func (ui *UI) createAppMain() {
 	ui.mainFlex.AddItem(ui.views, 0, 2, false)
 	ui.list.SetCurrentItem(currentIndex)
 	ui.redrawAppMain()
+	if ui.list.GetItemCount() == 0 {
+		ui.ErrorMessage("No (other) configs found, nothing to choose from.")
+	}
 }
 
 func (ui *UI) redrawAppMain() {