go/ko-build
1
0
Fork 0
mirror of https://github.com/ko-build/ko.git synced 2025-07-15 23:54:17 +02:00
Code Issues Releases Activity

Use cobra's RunE wherever possible (#343)

Browse Source
This commit is contained in:
Jason Hall
2021-04-22 12:37:42 -04:00
committed by GitHub
parent 75ab99123d
commit 29cd8e09e9
6 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/commands/delete.go
View File

@ -15,7 +15,7 @@
package commands
import (
"log"
"errors"
"os"
"os/exec"
@ -23,15 +23,14 @@ import (
)
// runCmd is suitable for use with cobra.Command's Run field.
type runCmd func(*cobra.Command, []string)
type runCmd func(*cobra.Command, []string) error
// passthru returns a runCmd that simply passes our CLI arguments
// through to a binary named command.
func passthru(command string) runCmd {
return func(_ *cobra.Command, _ []string) {
return func(_ *cobra.Command, _ []string) error {
if !isKubectlAvailable() {
log.Print("error: kubectl is not available. kubectl must be installed to use ko delete.")
return
return errors.New("error: kubectl is not available. kubectl must be installed to use ko delete")
}
// Cancel on signals.
@ -49,9 +48,7 @@ func passthru(command string) runCmd {
cmd.Stdin = os.Stdin
// Run it.
if err := cmd.Run(); err != nil {
log.Fatalf("error executing %q command with args: %v; %v", command, os.Args[1:], err)
}
return cmd.Run()
}
}
@ -60,7 +57,7 @@ func addDelete(topLevel *cobra.Command) {
topLevel.AddCommand(&cobra.Command{
Use: "delete",
Short: `See "kubectl help delete" for detailed usage.`,
Run: passthru("kubectl"),
RunE: passthru("kubectl"),
// We ignore unknown flags to avoid importing everything Go exposes
// from our commands.
FParseErrWhitelist: cobra.FParseErrWhitelist{