Merge pull request #6253 from ewbankkit/issue-6242

r/aws_dx_gateway: Use a single Amazon-side ASN validator
hashicorp · Oct 30, 2018 · 3e0a371 · 3e0a371
2 parents a8674b4 + 41c5c4b
commit 3e0a371
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 62 deletions.
diff --git a/aws/resource_aws_dx_gateway.go b/aws/resource_aws_dx_gateway.go
@@ -31,7 +31,7 @@ func resourceAwsDxGateway() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: validateDxGatewayAmazonSideAsn,
+				ValidateFunc: validateAmazonSideAsn,
 			},
 		},
 

diff --git a/aws/resource_aws_vpn_gateway.go b/aws/resource_aws_vpn_gateway.go
@@ -35,7 +35,7 @@ func resourceAwsVpnGateway() *schema.Resource {
 				Optional:     true,
 				ForceNew:     true,
 				Computed:     true,
-				ValidateFunc: validateVpnGatewayAmazonSideAsn,
+				ValidateFunc: validateAmazonSideAsn,
 			},
 
 			"vpc_id": {

diff --git a/aws/validators.go b/aws/validators.go
@@ -1793,7 +1793,7 @@ func validateDynamoDbStreamSpec(d *schema.ResourceDiff) error {
 	return nil
 }
 
-func validateVpnGatewayAmazonSideAsn(v interface{}, k string) (ws []string, errors []error) {
+func validateAmazonSideAsn(v interface{}, k string) (ws []string, errors []error) {
 	value := v.(string)
 
 	// http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateVpnGateway.html
@@ -1814,22 +1814,6 @@ func validateVpnGatewayAmazonSideAsn(v interface{}, k string) (ws []string, erro
 	return
 }
 
-func validateDxGatewayAmazonSideAsn(v interface{}, k string) (ws []string, errors []error) {
-	value := v.(string)
-
-	// https://docs.aws.amazon.com/directconnect/latest/APIReference/API_CreateDirectConnectGateway.html
-	asn, err := strconv.ParseInt(value, 10, 64)
-	if err != nil {
-		errors = append(errors, fmt.Errorf("%q (%q) must be a 64-bit integer", k, v))
-		return
-	}
-
-	if (asn < 64512) || (asn > 65534 && asn < 4200000000) || (asn > 4294967294) {
-		errors = append(errors, fmt.Errorf("%q (%q) must be in the range 64512 to 65534 or 4200000000 to 4294967294", k, v))
-	}
-	return
-}
-
 func validateIotThingTypeName(v interface{}, k string) (ws []string, errors []error) {
 	value := v.(string)
 	if !regexp.MustCompile(`[a-zA-Z0-9:_-]+`).MatchString(value) {

diff --git a/aws/validators_test.go b/aws/validators_test.go
@@ -2693,7 +2693,7 @@ func TestValidateCognitoUserPoolId(t *testing.T) {
 	}
 }
 
-func TestValidateVpnGatewayAmazonSideAsn(t *testing.T) {
+func TestValidateAmazonSideAsn(t *testing.T) {
 	validAsns := []string{
 		"7224",
 		"9059",
@@ -2709,7 +2709,7 @@ func TestValidateVpnGatewayAmazonSideAsn(t *testing.T) {
 		"4294967294",
 	}
 	for _, v := range validAsns {
-		_, errors := validateVpnGatewayAmazonSideAsn(v, "amazon_side_asn")
+		_, errors := validateAmazonSideAsn(v, "amazon_side_asn")
 		if len(errors) != 0 {
 			t.Fatalf("%q should be a valid ASN: %q", v, errors)
 		}
@@ -2730,47 +2730,7 @@ func TestValidateVpnGatewayAmazonSideAsn(t *testing.T) {
 		"9999999999",
 	}
 	for _, v := range invalidAsns {
-		_, errors := validateVpnGatewayAmazonSideAsn(v, "amazon_side_asn")
-		if len(errors) == 0 {
-			t.Fatalf("%q should be an invalid ASN", v)
-		}
-	}
-}
-
-func TestValidateDxGatewayAmazonSideAsn(t *testing.T) {
-	validAsns := []string{
-		"64512",
-		"64513",
-		"65533",
-		"65534",
-		"4200000000",
-		"4200000001",
-		"4294967293",
-		"4294967294",
-	}
-	for _, v := range validAsns {
-		_, errors := validateDxGatewayAmazonSideAsn(v, "amazon_side_asn")
-		if len(errors) != 0 {
-			t.Fatalf("%q should be a valid ASN: %q", v, errors)
-		}
-	}
-
-	invalidAsns := []string{
-		"1",
-		"ABCDEFG",
-		"",
-		"7224",
-		"9059",
-		"10124",
-		"17493",
-		"64511",
-		"65535",
-		"4199999999",
-		"4294967295",
-		"9999999999",
-	}
-	for _, v := range invalidAsns {
-		_, errors := validateDxGatewayAmazonSideAsn(v, "amazon_side_asn")
+		_, errors := validateAmazonSideAsn(v, "amazon_side_asn")
 		if len(errors) == 0 {
 			t.Fatalf("%q should be an invalid ASN", v)
 		}