From a5a34675c085218c38c0876bc7e4b913720f3585 Mon Sep 17 00:00:00 2001 From: Yann Hamon Date: Mon, 8 Mar 2021 18:14:24 +0100 Subject: [PATCH] Fix usage of -h --- acceptance.bats | 6 ++++++ cmd/kubeconform/main.go | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/acceptance.bats b/acceptance.bats index e310a9e..78cf792 100755 --- a/acceptance.bats +++ b/acceptance.bats @@ -5,6 +5,12 @@ resetCacheFolder() { mkdir -p cache } +@test "Pass when displaying help with -h" { + run bin/kubeconform -h + [ "$status" -eq 0 ] + [ "${lines[0]}" == 'Usage: bin/kubeconform [OPTION]... [FILE OR FOLDER]...' ] +} + @test "Pass when parsing a valid Kubernetes config YAML file" { run bin/kubeconform -summary fixtures/valid.yaml [ "$status" -eq 0 ] diff --git a/cmd/kubeconform/main.go b/cmd/kubeconform/main.go index 0273682..6ac0e7e 100644 --- a/cmd/kubeconform/main.go +++ b/cmd/kubeconform/main.go @@ -46,7 +46,9 @@ func processResults(cancel context.CancelFunc, o output.Output, validationResult func realMain() int { cfg, out, err := config.FromFlags(os.Args[0], os.Args[1:]) - if out != "" { + if cfg.Help { + return 0 + } else if out != "" { fmt.Println(out) return 1 } else if err != nil {