make signature consistent

Author: briskt

cmd/cli/flags/flags.go

@@ -26,17 +26,26 @@ const (
 	TfcTokenAlternate = "tfc-token-alternate"
 )
 
-func NewStringFlag(command *cobra.Command, name, value, usage string) {
+func NewStringFlag(command *cobra.Command, name, shorthand string, value, usage string) {
 	var s string
-	command.PersistentFlags().StringVar(&s, name, value, usage)
+
+	if shorthand == "" {
+		command.PersistentFlags().StringVar(&s, name, value, usage)
+	} else {
+		command.PersistentFlags().StringVarP(&s, name, shorthand, value, usage)
+	}
 	if err := viper.BindPFlag(name, command.PersistentFlags().Lookup(name)); err != nil {
 		log.Fatalln("Error: unable to bind flag:", err)
 	}
 }
 
 func NewBoolFlag(command *cobra.Command, name, shorthand string, value bool, usage string) {
 	var b bool
-	command.PersistentFlags().BoolVarP(&b, name, shorthand, value, usage)
+	if shorthand == "" {
+		command.PersistentFlags().BoolVar(&b, name, value, usage)
+	} else {
+		command.PersistentFlags().BoolVarP(&b, name, shorthand, value, usage)
+	}
 	if err := viper.BindPFlag(name, command.PersistentFlags().Lookup(name)); err != nil {
 		log.Fatalln("Error: unable to bind flag:", err)
 	}

cmd/cli/multiregion/multiregion.go

@@ -29,10 +29,10 @@ func SetupMultiregionCmd(parentCommand *cobra.Command) {
 	InitSetupCmd(multiregionCmd)
 	InitStatusCmd(multiregionCmd)
 
-	flags.NewStringFlag(multiregionCmd, flags.DomainName, "", "Domain name")
-	flags.NewStringFlag(multiregionCmd, flags.Env, envProd, "Execution environment")
-	flags.NewStringFlag(multiregionCmd, flags.Region2, "", "Secondary AWS region")
-	flags.NewStringFlag(multiregionCmd, flags.TfcToken, "", "Token for Terraform Cloud authentication")
+	flags.NewStringFlag(multiregionCmd, flags.DomainName, "", "", "Domain name")
+	flags.NewStringFlag(multiregionCmd, flags.Env, "", envProd, "Execution environment")
+	flags.NewStringFlag(multiregionCmd, flags.Region2, "", "", "Secondary AWS region")
+	flags.NewStringFlag(multiregionCmd, flags.TfcToken, "", "", "Token for Terraform Cloud authentication")
 	flags.NewStringFlag(multiregionCmd, flags.OrgAlternate, "", "Alternate Terraform Cloud organization")
 	flags.NewStringFlag(multiregionCmd, flags.TfcTokenAlternate, "", "Alternate token for Terraform Cloud")
 }

cmd/cli/root.go

@@ -30,9 +30,9 @@ in a second AWS region, and to initiate a secondary region failover action.`,
 
 	rootCmd.PersistentFlags().StringVar(&configFile, flags.Config, "", "Config file")
 
-	flags.NewStringFlag(rootCmd, flags.Org, "", requiredPrefix+"Terraform Cloud organization")
-	flags.NewStringFlag(rootCmd, flags.Idp, "", requiredPrefix+"IDP key (short name)")
-	flags.NewStringFlag(rootCmd, flags.Region, "", "AWS region")
+	flags.NewStringFlag(rootCmd, flags.Org, "", "", requiredPrefix+"Terraform Cloud organization")
+	flags.NewStringFlag(rootCmd, flags.Idp, "", "", requiredPrefix+"IDP key (short name)")
+	flags.NewStringFlag(rootCmd, flags.Region, "", "", "AWS region")
 	flags.NewBoolFlag(rootCmd, flags.ReadOnlyMode, "r", false, "read-only mode persists no changes")
 
 	SetupVersionCmd(rootCmd)