add check for org-alternate specified without tfc-token-alternate

briskt · briskt · commit e43f39d29c7b · 2023-07-31T14:18:47.000-06:00
diff --git a/cmd/cli/multiregion/multiregion.go b/cmd/cli/multiregion/multiregion.go
@@ -100,9 +100,16 @@ func getPersistentFlags() PersistentFlags {
 		tfcTokenAlt:     getOption(flagTfcTokenAlternate, ""),
 		orgAlt:          getOption(flagOrgAlternate, viper.GetString("org")),
 	}
+
+	if pFlags.orgAlt != "" && pFlags.tfcTokenAlt == "" {
+		log.Fatalf("%[1]s was specified without %[2]s. Please include %[2]s or remove %[1]s.",
+			flagOrgAlternate, flagTfcTokenAlternate)
+	}
+
 	if pFlags.orgAlt == "" {
 		pFlags.orgAlt = pFlags.org
 	}
+
 	return pFlags
 }
 

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,16 @@ func getPersistentFlags() PersistentFlags {`
`100`	`100`	`tfcTokenAlt: getOption(flagTfcTokenAlternate, ""),`
`101`	`101`	`orgAlt: getOption(flagOrgAlternate, viper.GetString("org")),`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ if pFlags.orgAlt != "" && pFlags.tfcTokenAlt == "" {`
	`105`	`+ log.Fatalf("%[1]s was specified without %[2]s. Please include %[2]s or remove %[1]s.",`
	`106`	`+ flagOrgAlternate, flagTfcTokenAlternate)`
	`107`	`+ }`
	`108`	`+`
`103`	`109`	`if pFlags.orgAlt == "" {`
`104`	`110`	`pFlags.orgAlt = pFlags.org`
`105`	`111`	`}`
	`112`	`+`
`106`	`113`	`return pFlags`
`107`	`114`	`}`
`108`	`115`