Merge pull request #75 from tommy-heyde-olsen/refactored-add-exec-support

Adds shell completion for bash, zsh & fish

Author: danielfoehrKn

VERSION

@@ -1 +1 @@
-v0.7.2
+v0.8.0

cmd/main.go

@@ -24,27 +24,6 @@ import (
 func main() {
 	rootCommand := switcher.NewCommandStartSwitcher()
 
-	// if first argument is not found, assume it is a context name
-	// hence call default subcommand
-	if len(os.Args) > 1 {
-		cmd, _, err := rootCommand.Find(os.Args[1:])
-		if err != nil || cmd == nil {
-			args := append([]string{"set-context"}, os.Args[1:]...)
-			rootCommand.SetArgs(args)
-		}
-
-		// cobra somehow does  not recognize - as a valid command
-		if os.Args[1] == "-" {
-			args := append([]string{"set-previous-context"}, os.Args[1:]...)
-			rootCommand.SetArgs(args)
-		}
-
-		if os.Args[1] == "." {
-			args := append([]string{"set-last-context"}, os.Args[1:]...)
-			rootCommand.SetArgs(args)
-		}
-	}
-
 	if err := rootCommand.Execute(); err != nil {
 		fmt.Print(err)
 		os.Exit(1)

cmd/switcher/alias.go

@@ -0,0 +1,93 @@
+// Copyright 2021 The Kubeswitch authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package switcher
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/danielfoehrkn/kubeswitch/pkg/subcommands/alias"
+	"github.com/spf13/cobra"
+)
+
+var (
+	aliasContextCmd = &cobra.Command{
+		Use:   "alias",
+		Short: "Create an alias for a context. Use ALIAS=CONTEXT_NAME",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if len(args) != 1 || !strings.Contains(args[0], "=") || len(strings.Split(args[0], "=")) != 2 {
+				return fmt.Errorf("please provide the alias in the form ALIAS=CONTEXT_NAME")
+			}
+
+			arguments := strings.Split(args[0], "=")
+			ctxName, err := resolveContextName(arguments[1])
+			if err != nil {
+				return err
+			}
+
+			stores, config, err := initialize()
+			if err != nil {
+				return err
+			}
+
+			return alias.Alias(arguments[0], ctxName, stores, config, stateDirectory, noIndex)
+		},
+		SilenceErrors: true,
+	}
+
+	aliasLsCmd = &cobra.Command{
+		Use:   "ls",
+		Short: "List all existing aliases",
+		Args:  cobra.NoArgs,
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			return nil, cobra.ShellCompDirectiveNoFileComp
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return alias.ListAliases(stateDirectory)
+		},
+	}
+
+	aliasRmCmd = &cobra.Command{
+		Use:   "rm",
+		Short: "Remove an existing alias",
+		Args:  cobra.ExactArgs(1),
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			if len(args) != 0 {
+				return nil, cobra.ShellCompDirectiveNoFileComp
+			}
+			aliases, _ := alias.GetAliases(stateDirectory)
+			return aliases, cobra.ShellCompDirectiveNoFileComp
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return alias.RemoveAlias(args[0], stateDirectory)
+		},
+		SilenceErrors: true,
+	}
+)
+
+func init() {
+	aliasRmCmd.Flags().StringVar(
+		&stateDirectory,
+		"state-directory",
+		os.ExpandEnv("$HOME/.kube/switch-state"),
+		"path to the state directory.")
+
+	aliasContextCmd.AddCommand(aliasLsCmd)
+	aliasContextCmd.AddCommand(aliasRmCmd)
+
+	setFlagsForContextCommands(aliasContextCmd)
+
+	rootCommand.AddCommand(aliasContextCmd)
+}

cmd/switcher/clean.go

@@ -0,0 +1,42 @@
+// Copyright 2021 The Kubeswitch authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package switcher
+
+import (
+	"github.com/danielfoehrkn/kubeswitch/pkg/subcommands/clean"
+	"github.com/spf13/cobra"
+)
+
+var (
+	cleanCmd = &cobra.Command{
+		Use:   "clean",
+		Short: "Cleans all temporary and cached kubeconfig files",
+		Long:  `Cleans the temporary kubeconfig files created in the directory $HOME/.kube/switch_tmp and flushes every cache`,
+		Args:  cobra.NoArgs,
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			return nil, cobra.ShellCompDirectiveNoFileComp
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			stores, _, err := initialize()
+			if err != nil {
+				return err
+			}
+			return clean.Clean(stores)
+		},
+	}
+)
+
+func init() {
+	rootCommand.AddCommand(cleanCmd)
+}

cmd/switcher/completion.go

@@ -0,0 +1,55 @@
+// Copyright 2021 The Kubeswitch authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package switcher
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+var (
+	setName string
+
+	completionCmd = &cobra.Command{
+		Use:                   "completion [bash|zsh|fish]",
+		Short:                 "generate completion script",
+		Long:                  "load the completion script for switch into the current shell",
+		DisableFlagsInUseLine: true,
+		ValidArgs:             []string{"bash", "zsh", "fish"},
+		Args:                  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			root := cmd.Root()
+			if setName != "" {
+				root.Use = setName
+			}
+			switch args[0] {
+			case "bash":
+				return root.GenBashCompletion(os.Stdout)
+			case "zsh":
+				return root.GenZshCompletion(os.Stdout)
+			case "fish":
+				return root.GenFishCompletion(os.Stdout, true)
+			}
+			return fmt.Errorf("unsupported shell type: %s", args[0])
+		},
+	}
+)
+
+func init() {
+	completionCmd.Flags().StringVarP(&setName, "cmd", "c", "", "generate completion for the specified command")
+
+	rootCommand.AddCommand(completionCmd)
+}