Merge pull request #1847 from TimeIncOSS/add-fqdn-to-route53
provider/aws: Add expanded name as output to route53_record
This commit is contained in:
commit
6409c5b826
|
@ -3,6 +3,7 @@
|
||||||
IMPROVEMENTS:
|
IMPROVEMENTS:
|
||||||
|
|
||||||
* provider/aws: `aws_s3_bucket` exports `hosted_zone_id` and `region` [GH-1865]
|
* provider/aws: `aws_s3_bucket` exports `hosted_zone_id` and `region` [GH-1865]
|
||||||
|
* provider/aws: `aws_route53_record` exports `fqdn` [GH-1847]
|
||||||
|
|
||||||
BUG FIXES:
|
BUG FIXES:
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,11 @@ func resourceAwsRoute53Record() *schema.Resource {
|
||||||
ForceNew: true,
|
ForceNew: true,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"fqdn": &schema.Schema{
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Computed: true,
|
||||||
|
},
|
||||||
|
|
||||||
"type": &schema.Schema{
|
"type": &schema.Schema{
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Required: true,
|
Required: true,
|
||||||
|
@ -216,6 +221,8 @@ func resourceAwsRoute53RecordRead(d *schema.ResourceData, meta interface{}) erro
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
en := expandRecordName(d.Get("name").(string), *zoneRecord.HostedZone.Name)
|
en := expandRecordName(d.Get("name").(string), *zoneRecord.HostedZone.Name)
|
||||||
|
log.Printf("[DEBUG] Expanded record name: %s", en)
|
||||||
|
d.Set("fqdn", en)
|
||||||
|
|
||||||
lopts := &route53.ListResourceRecordSetsInput{
|
lopts := &route53.ListResourceRecordSetsInput{
|
||||||
HostedZoneID: aws.String(cleanZoneID(zone)),
|
HostedZoneID: aws.String(cleanZoneID(zone)),
|
||||||
|
|
|
@ -106,5 +106,5 @@ Alias records support the following:
|
||||||
|
|
||||||
## Attributes Reference
|
## Attributes Reference
|
||||||
|
|
||||||
No attributes are exported.
|
* `fqdn` - [FQDN](http://en.wikipedia.org/wiki/Fully_qualified_domain_name) built using the zone domain and `name`
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue