Revert "Refactor to simplify region validation"

This reverts commit 333e75a.
veracode · Oct 30, 2023 · 3ce906c · 3ce906c
1 parent 333e75a
commit 3ce906c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -26,7 +26,7 @@ func main() {
 
 	flag.Parse()
 
-	if !utils.IsValidRegion(*region) {
+	if *region != "" && utils.IsValidRegion(*region) == false {
 		utils.ErrorAndExitWithUsage(fmt.Sprintf("Invalid region \"%s\". Must be either \"commercial\", \"us\" or \"european\"", *region))
 	}
 

diff --git a/utils/platform_url.go b/utils/platform_url.go
@@ -84,11 +84,9 @@ func ParseBaseUrlFromRegion(region string) string {
 }
 
 func IsValidRegion(region string) bool {
-	if len(region) > 0 {
-		for _, regionData := range regions {
-			if regionData.ID == region {
-				return true
-			}
+	for _, regionData := range regions {
+		if regionData.ID == region {
+			return true
 		}
 	}
 	return false