Merge pull request #5777 from edmundcraske/edmundcraske-patch-1

Fix route53 set_identifier logic
This commit is contained in:
Paul Hinze 2016-03-22 09:47:13 -05:00
commit 9000883e23
1 changed files with 6 additions and 0 deletions

View File

@ -455,6 +455,9 @@ func resourceAwsRoute53RecordBuildSet(d *schema.ResourceData, zoneName string) (
} }
if v, ok := d.GetOk("failover"); ok { if v, ok := d.GetOk("failover"); ok {
if _, ok := d.GetOk("set_identifier"); !ok {
return nil, fmt.Errorf(`provider.aws: aws_route53_record: %s: "set_identifier": required field is not set when "failover" is set`, d.Get("name").(string))
}
rec.Failover = aws.String(v.(string)) rec.Failover = aws.String(v.(string))
} }
@ -468,6 +471,9 @@ func resourceAwsRoute53RecordBuildSet(d *schema.ResourceData, zoneName string) (
w := d.Get("weight").(int) w := d.Get("weight").(int)
if w > -1 { if w > -1 {
if _, ok := d.GetOk("set_identifier"); !ok {
return nil, fmt.Errorf(`provider.aws: aws_route53_record: %s: "set_identifier": required field is not set when "weight" is set`, d.Get("name").(string))
}
rec.Weight = aws.Int64(int64(w)) rec.Weight = aws.Int64(int64(w))
} }