From cb96bc0c768091a1eca6e8c3b6f31b4942753c03 Mon Sep 17 00:00:00 2001
From: dlorenc <dlorenc@google.com>
Date: Sun, 11 Jul 2021 09:06:11 -0500
Subject: [PATCH] Fix help message outputs. (#366)
Signed-off-by: Dan Lorenc <dlorenc@google.com>
---
cmd/rekor-cli/app/timestamp.go | 1 -
cmd/rekor-cli/app/upload.go | 10 ++++------
cmd/rekor-cli/app/verify.go | 1 -
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/cmd/rekor-cli/app/timestamp.go b/cmd/rekor-cli/app/timestamp.go
index c3a3f53..e081b14 100644
--- a/cmd/rekor-cli/app/timestamp.go
+++ b/cmd/rekor-cli/app/timestamp.go
@@ -197,7 +197,6 @@ var timestampCmd = &cobra.Command{
}
if err := validateTimestampFlags(); err != nil {
log.Logger.Error(err)
- _ = cmd.Help()
return err
}
return nil
diff --git a/cmd/rekor-cli/app/upload.go b/cmd/rekor-cli/app/upload.go
index 0b54c93..efea229 100644
--- a/cmd/rekor-cli/app/upload.go
+++ b/cmd/rekor-cli/app/upload.go
@@ -20,7 +20,6 @@ import (
"crypto/ecdsa"
"crypto/sha256"
"fmt"
- "os"
"github.com/cyberphone/json-canonicalization/go/src/webpki.org/jsoncanonicalizer"
"github.com/go-openapi/swag"
@@ -54,16 +53,15 @@ func (u *uploadCmdOutput) String() string {
var uploadCmd = &cobra.Command{
Use: "upload",
Short: "Upload an artifact to Rekor",
- PreRun: func(cmd *cobra.Command, args []string) {
+ PreRunE: func(cmd *cobra.Command, args []string) error {
// these are bound here so that they are not overwritten by other commands
if err := viper.BindPFlags(cmd.Flags()); err != nil {
- log.Logger.Fatal("Error initializing cmd line args: ", err)
+ return err
}
if err := validateArtifactPFlags(false, false); err != nil {
- log.Logger.Error(err)
- _ = cmd.Help()
- os.Exit(1)
+ return err
}
+ return nil
},
Long: `This command takes the public key, signature and URL of the release artifact and uploads it to the rekor server.`,
Run: format.WrapCmd(func(args []string) (interface{}, error) {
diff --git a/cmd/rekor-cli/app/verify.go b/cmd/rekor-cli/app/verify.go
index e661ae5..f3005ad 100644
--- a/cmd/rekor-cli/app/verify.go
+++ b/cmd/rekor-cli/app/verify.go
@@ -79,7 +79,6 @@ var verifyCmd = &cobra.Command{
return fmt.Errorf("error initializing cmd line args: %s", err)
}
if err := validateArtifactPFlags(true, true); err != nil {
- _ = cmd.Help()
return err
}
return nil
--
GitLab