mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

plugin: finish handling and executing plugins

Browse Source
This commit is contained in:
iwilltry42 2020-08-13 09:05:26 +02:00
parent a746e4f2db
commit fb0d09545b
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/root.go
View File

@ -22,6 +22,7 @@ THE SOFTWARE.
package cmd
import (
"context"
"fmt"
"io"
"io/ioutil"
@ -34,9 +35,9 @@ import (
"github.com/rancher/k3d/v3/cmd/image"
"github.com/rancher/k3d/v3/cmd/kubeconfig"
"github.com/rancher/k3d/v3/cmd/node"
cliutil "github.com/rancher/k3d/v3/cmd/util"
"github.com/rancher/k3d/v3/pkg/runtimes"
"github.com/rancher/k3d/v3/version"
log "github.com/sirupsen/logrus"
"github.com/sirupsen/logrus/hooks/writer"
)
@ -60,17 +61,6 @@ k3d is a wrapper CLI that helps you to easily create k3s clusters inside docker.
Nodes of a k3d cluster are docker containers running a k3s image.
All Nodes of a k3d cluster are part of the same docker network.`,
Run: func(cmd *cobra.Command, args []string) {
if len(args) > 1 {
parts := args[1:]
// Check if it's a built-in command, else try to execute it as a plugin
if _, _, err := cmd.Find(parts); err != nil {
if err := util.HandlePlugin(parts); err != nil {
log.Errorf("Failed to execute plugin '%+v'", parts)
log.Fatalln(err)
}
}
}
if flags.version {
printVersion()
} else {
@ -84,6 +74,19 @@ All Nodes of a k3d cluster are part of the same docker network.`,
// Execute adds all child commands to the root command and sets flags appropriately.
// This is called by main.main(). It only needs to happen once to the rootCmd.
func Execute() {
if len(os.Args) > 1 {
parts := os.Args[1:]
// Check if it's a built-in command, else try to execute it as a plugin
if _, _, err := rootCmd.Find(parts); err != nil {
pluginFound, err := cliutil.HandlePlugin(context.Background(), parts)
if err != nil {
log.Errorf("Failed to execute plugin '%+v'", parts)
log.Fatalln(err)
} else if pluginFound {
os.Exit(0)
}
}
}
if err := rootCmd.Execute(); err != nil {
log.Fatalln(err)
}

20
cmd/util/plugins.go
View File

@ -22,13 +22,17 @@ THE SOFTWARE.
package util
import (
"context"
"fmt"
"os"
"os/exec"
"strings"
k3d "github.com/rancher/k3d/v3/pkg/types"
)
func HandlePlugin(args []string) error {
// HandlePlugin takes care of finding and executing a plugin based on the longest prefix
func HandlePlugin(ctx context.Context, args []string) (bool, error) {
argsPrefix := []string{}
for _, arg := range args {
@ -53,10 +57,10 @@ func HandlePlugin(args []string) error {
}
if execPath == "" {
return nil
return false, nil
}
return ExecPlugin(execPath, args[len(argsPrefix):], os.Environ())
return true, ExecPlugin(ctx, execPath, args[len(argsPrefix):], os.Environ())
}
@ -70,7 +74,11 @@ func FindPlugin(name string) (string, bool) {
}
// ExecPlugin executes a found plugin
func ExecPlugin(path string, args []string, env []string) error {
return nil
func ExecPlugin(ctx context.Context, path string, args []string, env []string) error {
cmd := exec.CommandContext(ctx, path, args...)
cmd.Env = env
cmd.Stderr = os.Stderr
cmd.Stdout = os.Stdout
cmd.Stdin = os.Stdin
return cmd.Run()
}