actions/kubeconform
9
0
Fork 0
mirror of https://github.com/yannh/kubeconform.git synced 2026-02-20 10:27:02 +00:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Improve handling of cmdline errors (#91)

Browse source 
Improve handling of cmdline errors
This commit is contained in:
Yann Hamon 2022-01-06 12:39:24 +01:00 committed by GitHub
parent 607c90a0a9
commit 85b30f8c2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cmd/kubeconform/main.go
View file

@ -48,15 +48,23 @@ func processResults(cancel context.CancelFunc, o output.Output, validationResult
func realMain() int { func realMain() int {
cfg, out, err := config.FromFlags(os.Args[0], os.Args[1:]) cfg, out, err := config.FromFlags(os.Args[0], os.Args[1:])
if cfg.Help { if out != "" {
return 0 o := os.Stderr
} else if cfg.Version { errCode := 1
if cfg.Help {
o = os.Stdout
errCode = 0
}
fmt.Fprintln(o, out)
return errCode
}
if cfg.Version {
fmt.Println(version) fmt.Println(version)
return 0 return 0
} else if out != "" { }
fmt.Println(out)
return 1 if err != nil {
} else if err != nil {
fmt.Fprintf(os.Stderr, "failed parsing command line: %s\n", err.Error()) fmt.Fprintf(os.Stderr, "failed parsing command line: %s\n", err.Error())
return 1 return 1
} }

5
pkg/config/config.go
View file

@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"flag" "flag"
"fmt" "fmt"
"os"
"strings" "strings"
) )
@ -82,9 +81,7 @@ func FromFlags(progName string, args []string) (Config, string, error) {
flags.BoolVar(&c.Help, "h", false, "show help information") flags.BoolVar(&c.Help, "h", false, "show help information")
flags.BoolVar(&c.Version, "v", false, "show version information") flags.BoolVar(&c.Version, "v", false, "show version information")
flags.Usage = func() { flags.Usage = func() {
fmt.Fprintf(os.Stderr, "Usage: %s [OPTION]... [FILE OR FOLDER]...\n", progName) fmt.Fprintf(&buf, "Usage: %s [OPTION]... [FILE OR FOLDER]...\n", progName)
flags.SetOutput(os.Stderr)
flags.PrintDefaults() flags.PrintDefaults()
} }