From 826f23d4d4427c103492de2281497412875c78ce Mon Sep 17 00:00:00 2001
From: Buddhike de Silva <buddyspike@geeksdiary.com>
Date: Tue, 14 Apr 2020 17:22:02 +1000
Subject: [PATCH] Conditionally validate global args

For example, running version should not require
handler-command.
---
 cmd/root.go    | 17 ++++++++---------
 cmd/version.go |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/cmd/root.go b/cmd/root.go
index eae390e..ddec69a 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -23,6 +23,7 @@ import (
 	"github.com/spf13/cobra"
 
 	homedir "github.com/mitchellh/go-homedir"
+	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 )
 
@@ -39,11 +40,16 @@ var retryCount int
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   "blaster",
-	Short: "Universal message pump for message brokers",
-	Long:  `Universal message pump for message brokers`,
+	Short: "A reliable message processing pipeline",
 	// Uncomment the following line if your bare application
 	// has an action associated with it:
 	//	Run: func(cmd *cobra.Command, args []string) { },
+	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+		if cmd.Name() != "version" && handlerCommand == "" {
+			return errors.New("required flag handler-command not set")
+		}
+		return nil
+	},
 	SilenceUsage: true,
 }
 
@@ -58,12 +64,6 @@ func Execute() {
 func init() {
 	cobra.OnInitialize(initConfig)
 
-	// Here you will define your flags and configuration settings.
-	// Cobra supports persistent flags, which, if defined here,
-	// will be global for your application.
-
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.blaster.yaml)")
-
 	// Cobra also supports local flags, which will only run
 	// when this action is called directly.
 	rootCmd.PersistentFlags().StringVar(&handlerCommand, "handler-command", "", "name of handler command")
@@ -74,7 +74,6 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(&handlerURL, "handler-url", "http://localhost:8312/", "handler endpoint url")
 	rootCmd.PersistentFlags().IntVarP(&retryCount, "retry-count", "c", 0, "number of retry attempts")
 	rootCmd.PersistentFlags().UintVarP(&retryDelaySeconds, "retry-delay-seconds", "d", 1, "delay between retry attempts")
-	rootCmd.MarkPersistentFlagRequired("handler-command")
 }
 
 // initConfig reads in config file and ENV variables if set.
diff --git a/cmd/version.go b/cmd/version.go
index fe71ea8..ea8034a 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -28,7 +28,7 @@ var versionCmd = &cobra.Command{
 	Short: "Show blaster version",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("0.1.18")
+		fmt.Println("0.1.25")
 	},
 }