Sort contexts before listing them (#1016)

It was annoying to have a different order for the context every time I ran `kubecm switch` Signed-off-by: Yarden Shoham <[email protected]>
sunny0826 · Nov 1, 2024 · aa50f46 · aa50f46
1 parent 21244ba
commit aa50f46
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/cmd/delete.go b/cmd/delete.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"slices"
 
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/tools/clientcmd"
@@ -112,6 +113,7 @@ func selectDeleteContext(config *clientcmdapi.Config) (string, string, error) {
 			kubeItems = append([]Needle{{Name: key, Cluster: obj.Cluster, User: obj.AuthInfo, Center: "(*)"}}, kubeItems...)
 		}
 	}
+	slices.SortFunc(kubeItems, compareKubeItems)
 	// exit option
 	kubeItems, err := ExitOption(kubeItems)
 	if err != nil {

diff --git a/cmd/export.go b/cmd/export.go
@@ -3,6 +3,8 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"slices"
+
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
@@ -93,6 +95,7 @@ func selectExportContext(config *clientcmdapi.Config) (string, string, error) {
 			kubeItems = append([]Needle{{Name: key, Cluster: obj.Cluster, User: obj.AuthInfo, Center: "(*)"}}, kubeItems...)
 		}
 	}
+	slices.SortFunc(kubeItems, compareKubeItems)
 	// exit option
 	kubeItems, err := ExitOption(kubeItems)
 	if err != nil {

diff --git a/cmd/rename.go b/cmd/rename.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"slices"
 
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/tools/clientcmd"
@@ -42,6 +43,7 @@ func (rc *RenameCommand) runRename(command *cobra.Command, args []string) error
 			kubeItems = append([]Needle{{Name: key, Cluster: obj.Cluster, User: obj.AuthInfo, Center: "(*)"}}, kubeItems...)
 		}
 	}
+	slices.SortFunc(kubeItems, compareKubeItems)
 	var kubeName string
 	var rename string
 	// args option

diff --git a/cmd/switch.go b/cmd/switch.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"slices"
 
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 
@@ -81,6 +82,7 @@ func handleOperation(config *clientcmdapi.Config) (*clientcmdapi.Config, error)
 			kubeItems = append([]Needle{{Name: key, Cluster: obj.Cluster, User: obj.AuthInfo, Center: "(*)"}}, kubeItems...)
 		}
 	}
+	slices.SortFunc(kubeItems, compareKubeItems)
 	// exit option
 	kubeItems, err := ExitOption(kubeItems)
 	if err != nil {

diff --git a/cmd/utils.go b/cmd/utils.go
@@ -452,6 +452,10 @@ func CheckAndTransformFilePath(path string, autoCreate bool) (string, error) {
 	return path, nil
 }
 
+func compareKubeItems(a, b Needle) int {
+	return strings.Compare(a.Name, b.Name)
+}
+
 // CheckValidContext check and clean mismatched AuthInfo and Cluster
 func CheckValidContext(clear bool, config *clientcmdapi.Config) *clientcmdapi.Config {
 	for key, obj := range config.Contexts {