fixes region validation (#44)

turnerlabs · Mar 20, 2019 · 7d90ae4 · 7d90ae4
1 parent eb68b9a
commit 7d90ae4
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 6 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -115,12 +115,8 @@ CloudWatch Logs, and Amazon Route 53 into an easy-to-use CLI.`,
 			}
 		}
 
-		for _, validRegion := range validRegions {
-			if region == validRegion {
-				break
-			}
-
-			console.IssueExit("Invalid region: %s [valid regions: %s]", region, strings.Join(validRegions, ", "))
+		if err := validateRegion(region); err != nil {
+			console.IssueExit(err.Error())
 		}
 
 		config := &aws.Config{
@@ -268,3 +264,17 @@ func validateCpuAndMemory(inputCpuUnits, inputMebibytes string) error {
 func validateMebibytes(mebibytes, min, max int64) bool {
 	return mebibytes >= min && mebibytes <= max && mebibytes%mebibytesInGibibyte == 0
 }
+
+func validateRegion(region string) error {
+	found := false
+	for _, validRegion := range validRegions {
+		if region == validRegion {
+			found = true
+			break
+		}
+	}
+	if !found {
+		return fmt.Errorf("Invalid region: %s [valid regions: %s]", region, strings.Join(validRegions, ", "))
+	}
+	return nil
+}
diff --git a/cmd/root_test.go b/cmd/root_test.go
@@ -93,3 +93,25 @@ func TestReadEnvFileMissing(t *testing.T) {
 		t.Errorf("Expected 0 results, got %d results", len(results))
 	}
 }
+
+func TestRegion(t *testing.T) {
+	region := "us-east-1"
+	err := validateRegion(region)
+	if err != nil {
+		t.Error(err)
+	}
+	region = "ap-south-1"
+	err = validateRegion(region)
+	if err != nil {
+		t.Error(err)
+	}
+
+}
+
+func TestRegion_Invalid(t *testing.T) {
+	region := "invalid"
+	err := validateRegion(region)
+	if err == nil {
+		t.Error("expecting invalid region")
+	}
+}