Skip to content

Commit

Permalink
Merge pull request #7606 from terraform-providers/f-aws_route53_recor…
Browse files Browse the repository at this point in the history 
…d-alias-validation

resource/aws_route53_record: Add validation for alias name and zone_id arguments
  • Loading branch information
@bflad
bflad authored Feb 21, 2019
2 parents 12522ea + 5496db8 commit b9dba0b
Show file tree
Hide file tree
Showing 2 changed files with 129 additions and 17 deletions.
6 changes: 4 additions & 2 deletions aws/resource_aws_route53_record.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ func resourceAwsRoute53Record() *schema.Resource {
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"zone_id": {
Type: schema.TypeString,
Required: true,
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringLenBetween(1, 32),
},

"name": {
Expand All @@ -112,6 +113,7 @@ func resourceAwsRoute53Record() *schema.Resource {
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
return strings.EqualFold(old, new)
},
ValidateFunc: validation.StringLenBetween(1, 1024),
},

"evaluate_target_health": {
Expand Down
140 changes: 125 additions & 15 deletions aws/resource_aws_route53_record_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,11 +395,11 @@ func TestAccAWSRoute53Record_weighted_basic(t *testing.T) {
})
}

func TestAccAWSRoute53Record_alias(t *testing.T) {
func TestAccAWSRoute53Record_Alias_Elb(t *testing.T) {
var record1 route53.ResourceRecordSet

rs := acctest.RandString(10)
config := fmt.Sprintf(testAccRoute53ElbAliasRecord, rs)
config := fmt.Sprintf(testAccRoute53RecordConfigAliasElb, rs)
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
IDRefreshName: "aws_route53_record.alias",
Expand All @@ -416,19 +416,17 @@ func TestAccAWSRoute53Record_alias(t *testing.T) {
})
}

func TestAccAWSRoute53Record_aliasUppercase(t *testing.T) {
func TestAccAWSRoute53Record_Alias_S3(t *testing.T) {
var record1 route53.ResourceRecordSet
rName := acctest.RandomWithPrefix("tf-acc-test")

rs := acctest.RandString(10)
config := fmt.Sprintf(testAccRoute53ElbAliasRecordUppercase, rs)
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
IDRefreshName: "aws_route53_record.alias",
Providers: testAccProviders,
CheckDestroy: testAccCheckRoute53RecordDestroy,
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckRoute53RecordDestroy,
Steps: []resource.TestStep{
{
Config: config,
Config: testAccRoute53RecordConfigAliasS3(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckRoute53RecordExists("aws_route53_record.alias", &record1),
),
Expand All @@ -437,17 +435,43 @@ func TestAccAWSRoute53Record_aliasUppercase(t *testing.T) {
})
}

func TestAccAWSRoute53Record_s3_alias(t *testing.T) {
func TestAccAWSRoute53Record_Alias_VpcEndpoint(t *testing.T) {
var record1 route53.ResourceRecordSet
rName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_route53_record.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckRoute53RecordDestroy,
Steps: []resource.TestStep{
{
Config: testAccRoute53S3AliasRecord(rName),
Config: testAccRoute53RecordConfigAliasCustomVpcEndpointSwappedAliasAttributes(rName),
ExpectError: regexp.MustCompile(`expected length of`),
},
{
Config: testAccRoute53RecordConfigCustomVpcEndpoint(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckRoute53RecordExists(resourceName, &record1),
),
},
},
})
}

func TestAccAWSRoute53Record_Alias_Uppercase(t *testing.T) {
var record1 route53.ResourceRecordSet

rs := acctest.RandString(10)
config := fmt.Sprintf(testAccRoute53RecordConfigAliasElbUppercase, rs)
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
IDRefreshName: "aws_route53_record.alias",
Providers: testAccProviders,
CheckDestroy: testAccCheckRoute53RecordDestroy,
Steps: []resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testAccCheckRoute53RecordExists("aws_route53_record.alias", &record1),
),
Expand Down Expand Up @@ -1182,7 +1206,7 @@ resource "aws_route53_record" "ap-northeast-1" {
}
`

const testAccRoute53ElbAliasRecord = `
const testAccRoute53RecordConfigAliasElb = `
resource "aws_route53_zone" "main" {
name = "notexample.com"
}
Expand Down Expand Up @@ -1212,7 +1236,7 @@ resource "aws_elb" "main" {
}
`

const testAccRoute53ElbAliasRecordUppercase = `
const testAccRoute53RecordConfigAliasElbUppercase = `
resource "aws_route53_zone" "main" {
name = "notexample.com"
}
Expand Down Expand Up @@ -1242,7 +1266,7 @@ resource "aws_elb" "main" {
}
`

func testAccRoute53S3AliasRecord(rName string) string {
func testAccRoute53RecordConfigAliasS3(rName string) string {
return fmt.Sprintf(`
resource "aws_route53_zone" "main" {
name = "notexample.com"
Expand Down Expand Up @@ -1270,6 +1294,92 @@ resource "aws_route53_record" "alias" {
`, rName)
}

func testAccRoute53CustomVpcEndpointBase(rName string) string {
return fmt.Sprintf(`
resource "aws_vpc" "test" {
cidr_block = "10.0.0.0/16"
tags = {
Name = %[1]q
}
}
resource "aws_subnet" "test" {
cidr_block = "10.0.0.0/24"
vpc_id = "${aws_vpc.test.id}"
tags = {
Name = %[1]q
}
}
resource "aws_lb" "test" {
internal = true
load_balancer_type = "network"
name = %[1]q
subnets = ["${aws_subnet.test.id}"]
}
resource "aws_default_security_group" "test" {
vpc_id = "${aws_vpc.test.id}"
}
resource "aws_vpc_endpoint_service" "test" {
acceptance_required = false
network_load_balancer_arns = ["${aws_lb.test.id}"]
}
resource "aws_vpc_endpoint" "test" {
private_dns_enabled = false
security_group_ids = ["${aws_default_security_group.test.id}"]
service_name = "${aws_vpc_endpoint_service.test.service_name}"
subnet_ids = ["${aws_subnet.test.id}"]
vpc_endpoint_type = "Interface"
vpc_id = "${aws_vpc.test.id}"
}
resource "aws_route53_zone" "test" {
name = "notexample.com"
vpc {
vpc_id = "${aws_vpc.test.id}"
}
}
`, rName)
}

func testAccRoute53RecordConfigAliasCustomVpcEndpointSwappedAliasAttributes(rName string) string {
return testAccRoute53CustomVpcEndpointBase(rName) + fmt.Sprintf(`
resource "aws_route53_record" "test" {
name = "test"
type = "A"
zone_id = "${aws_route53_zone.test.zone_id}"
alias {
evaluate_target_health = false
name = "${lookup(aws_vpc_endpoint.test.dns_entry[0], "hosted_zone_id")}"
zone_id = "${lookup(aws_vpc_endpoint.test.dns_entry[0], "dns_name")}"
}
}
`)
}

func testAccRoute53RecordConfigCustomVpcEndpoint(rName string) string {
return testAccRoute53CustomVpcEndpointBase(rName) + fmt.Sprintf(`
resource "aws_route53_record" "test" {
name = "test"
type = "A"
zone_id = "${aws_route53_zone.test.zone_id}"
alias {
evaluate_target_health = false
name = "${lookup(aws_vpc_endpoint.test.dns_entry[0], "dns_name")}"
zone_id = "${lookup(aws_vpc_endpoint.test.dns_entry[0], "hosted_zone_id")}"
}
}
`)
}

const testAccRoute53WeightedElbAliasRecord = `
resource "aws_route53_zone" "main" {
name = "notexample.com"
Expand Down

0 comments on commit b9dba0b

Please sign in to comment.