Skip to content

Fix Shipwright CLI output message when incorrect flag is passed #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Sep 5, 2025
Merged

Fix Shipwright CLI output message when incorrect flag is passed #347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions cmd/shp/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package main
import (
goflag "flag"
"fmt"
"io"
"os"

"github.com/spf13/pflag"
Expand Down Expand Up @@ -35,14 +36,19 @@ var hiddenLogFlags = []string{
}

func main() {
streams := genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}
rootCmd := cmd.NewCmdSHP(&streams)

if err := initGoFlags(); err != nil {
fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
fmt.Fprintf(os.Stderr, "ERROR: %v\n\n", err)
// Print the CLI help in case of error.
if err = rootCmd.Help(); err != nil {
fmt.Fprintf(os.Stderr, "ERROR: %v\n\n", err)
}
os.Exit(1)
}
initPFlags()

streams := genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}
rootCmd := cmd.NewCmdSHP(&streams)
if err := rootCmd.Execute(); err != nil {
fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
os.Exit(1)
Expand All @@ -53,9 +59,13 @@ func main() {
// Any flags for "-h" or "--help" are ignored because pflag will show the usage later with all subcommands.
func initGoFlags() error {
flagset := goflag.NewFlagSet(ApplicationName, goflag.ContinueOnError)

// Discard usage and error message written to stdout and stderr in the "goflag" library.
// Instead, return the error only.
flagset.SetOutput(io.Discard)

goflag.CommandLine = flagset
klog.InitFlags(flagset)

args := []string{}
for _, arg := range os.Args[1:] {
if arg != "-h" && arg != "--help" {
Expand Down