diff --git a/azurerm/resource_arm_dns_a_record.go b/azurerm/resource_arm_dns_a_record.go index 2ceb249b0456..8902b8d8b25b 100644 --- a/azurerm/resource_arm_dns_a_record.go +++ b/azurerm/resource_arm_dns_a_record.go @@ -58,6 +58,11 @@ func resourceArmDnsARecord() *schema.Resource { Required: true, }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -144,6 +149,7 @@ func resourceArmDnsARecordRead(d *schema.ResourceData, meta interface{}) error { d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if err := d.Set("records", flattenAzureRmDnsARecords(resp.ARecords)); err != nil { return err diff --git a/azurerm/resource_arm_dns_a_record_test.go b/azurerm/resource_arm_dns_a_record_test.go index 666cac07b091..df122d28e5c9 100644 --- a/azurerm/resource_arm_dns_a_record_test.go +++ b/azurerm/resource_arm_dns_a_record_test.go @@ -26,6 +26,7 @@ func TestAccAzureRMDnsARecord_basic(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsARecordExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "fqdn"), ), }, { diff --git a/azurerm/resource_arm_dns_aaaa_record.go b/azurerm/resource_arm_dns_aaaa_record.go index c37e573cbcd3..38bd87533274 100644 --- a/azurerm/resource_arm_dns_aaaa_record.go +++ b/azurerm/resource_arm_dns_aaaa_record.go @@ -58,6 +58,11 @@ func resourceArmDnsAAAARecord() *schema.Resource { Required: true, }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -144,6 +149,7 @@ func resourceArmDnsAaaaRecordRead(d *schema.ResourceData, meta interface{}) erro d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if err := d.Set("records", flattenAzureRmDnsAaaaRecords(resp.AaaaRecords)); err != nil { return err diff --git a/azurerm/resource_arm_dns_aaaa_record_test.go b/azurerm/resource_arm_dns_aaaa_record_test.go index d90b2b773821..6a63a1d82c5a 100644 --- a/azurerm/resource_arm_dns_aaaa_record_test.go +++ b/azurerm/resource_arm_dns_aaaa_record_test.go @@ -26,6 +26,7 @@ func TestAccAzureRMDnsAAAARecord_basic(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsAaaaRecordExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "fqdn"), ), }, { diff --git a/azurerm/resource_arm_dns_caa_record.go b/azurerm/resource_arm_dns_caa_record.go index 6f6a6c4e0eeb..0aa3150d8954 100644 --- a/azurerm/resource_arm_dns_caa_record.go +++ b/azurerm/resource_arm_dns_caa_record.go @@ -85,6 +85,11 @@ func resourceArmDnsCaaRecord() *schema.Resource { Required: true, }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -171,6 +176,7 @@ func resourceArmDnsCaaRecordRead(d *schema.ResourceData, meta interface{}) error d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if err := d.Set("record", flattenAzureRmDnsCaaRecords(resp.CaaRecords)); err != nil { return err diff --git a/azurerm/resource_arm_dns_caa_record_test.go b/azurerm/resource_arm_dns_caa_record_test.go index 0c912b8ee320..2268441f2151 100644 --- a/azurerm/resource_arm_dns_caa_record_test.go +++ b/azurerm/resource_arm_dns_caa_record_test.go @@ -26,6 +26,7 @@ func TestAccAzureRMDnsCaaRecord_basic(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsCaaRecordExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "fqdn"), ), }, { diff --git a/azurerm/resource_arm_dns_cname_record.go b/azurerm/resource_arm_dns_cname_record.go index 9c06508e78b7..226852ac2cc9 100644 --- a/azurerm/resource_arm_dns_cname_record.go +++ b/azurerm/resource_arm_dns_cname_record.go @@ -63,6 +63,11 @@ func resourceArmDnsCNameRecord() *schema.Resource { Required: true, }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -152,6 +157,7 @@ func resourceArmDnsCNameRecordRead(d *schema.ResourceData, meta interface{}) err d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if props := resp.RecordSetProperties; props != nil { if record := props.CnameRecord; record != nil { diff --git a/azurerm/resource_arm_dns_cname_record_test.go b/azurerm/resource_arm_dns_cname_record_test.go index c50f58393d37..cf08dba55ca8 100644 --- a/azurerm/resource_arm_dns_cname_record_test.go +++ b/azurerm/resource_arm_dns_cname_record_test.go @@ -26,6 +26,7 @@ func TestAccAzureRMDnsCNameRecord_basic(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsCNameRecordExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "fqdn"), ), }, { diff --git a/azurerm/resource_arm_dns_mx_record.go b/azurerm/resource_arm_dns_mx_record.go index b84c7b358a84..e170bca72aee 100644 --- a/azurerm/resource_arm_dns_mx_record.go +++ b/azurerm/resource_arm_dns_mx_record.go @@ -74,6 +74,11 @@ func resourceArmDnsMxRecord() *schema.Resource { Required: true, }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -160,6 +165,7 @@ func resourceArmDnsMxRecordRead(d *schema.ResourceData, meta interface{}) error d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if err := d.Set("record", flattenAzureRmDnsMxRecords(resp.MxRecords)); err != nil { return err diff --git a/azurerm/resource_arm_dns_mx_record_test.go b/azurerm/resource_arm_dns_mx_record_test.go index 0d8cbed8b430..2339b2b33415 100644 --- a/azurerm/resource_arm_dns_mx_record_test.go +++ b/azurerm/resource_arm_dns_mx_record_test.go @@ -26,6 +26,7 @@ func TestAccAzureRMDnsMxRecord_basic(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsMxRecordExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "fqdn"), ), }, { diff --git a/azurerm/resource_arm_dns_ns_record.go b/azurerm/resource_arm_dns_ns_record.go index d2cf2cc15f31..e1b9f0a3ab10 100644 --- a/azurerm/resource_arm_dns_ns_record.go +++ b/azurerm/resource_arm_dns_ns_record.go @@ -76,6 +76,11 @@ func resourceArmDnsNsRecord() *schema.Resource { Required: true, }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -162,6 +167,7 @@ func resourceArmDnsNsRecordRead(d *schema.ResourceData, meta interface{}) error d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if err := d.Set("records", flattenAzureRmDnsNsRecords(resp.NsRecords)); err != nil { return fmt.Errorf("Error settings `records`: %+v", err) diff --git a/azurerm/resource_arm_dns_ns_record_test.go b/azurerm/resource_arm_dns_ns_record_test.go index d93555e37e23..f46614888e67 100644 --- a/azurerm/resource_arm_dns_ns_record_test.go +++ b/azurerm/resource_arm_dns_ns_record_test.go @@ -47,6 +47,7 @@ func TestAccAzureRMDnsNsRecord_basic(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsNsRecordExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "fqdn"), ), }, { diff --git a/azurerm/resource_arm_dns_ptr_record.go b/azurerm/resource_arm_dns_ptr_record.go index 4425ba2d8aa6..e0e1ae68928d 100644 --- a/azurerm/resource_arm_dns_ptr_record.go +++ b/azurerm/resource_arm_dns_ptr_record.go @@ -58,6 +58,11 @@ func resourceArmDnsPtrRecord() *schema.Resource { Required: true, }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -145,6 +150,7 @@ func resourceArmDnsPtrRecordRead(d *schema.ResourceData, meta interface{}) error d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if err := d.Set("records", flattenAzureRmDnsPtrRecords(resp.PtrRecords)); err != nil { return err diff --git a/azurerm/resource_arm_dns_ptr_record_test.go b/azurerm/resource_arm_dns_ptr_record_test.go index a9d04c9687bf..ce3f20ead5f3 100644 --- a/azurerm/resource_arm_dns_ptr_record_test.go +++ b/azurerm/resource_arm_dns_ptr_record_test.go @@ -26,6 +26,7 @@ func TestAccAzureRMDnsPtrRecord_basic(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsPtrRecordExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "fqdn"), ), }, { diff --git a/azurerm/resource_arm_dns_srv_record.go b/azurerm/resource_arm_dns_srv_record.go index 0371a8aeea3f..b6e815b0fb97 100644 --- a/azurerm/resource_arm_dns_srv_record.go +++ b/azurerm/resource_arm_dns_srv_record.go @@ -82,6 +82,11 @@ func resourceArmDnsSrvRecord() *schema.Resource { Required: true, }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -168,6 +173,7 @@ func resourceArmDnsSrvRecordRead(d *schema.ResourceData, meta interface{}) error d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if err := d.Set("record", flattenAzureRmDnsSrvRecords(resp.SrvRecords)); err != nil { return err diff --git a/azurerm/resource_arm_dns_srv_record_test.go b/azurerm/resource_arm_dns_srv_record_test.go index 5202c3cd1b45..14fd79e26809 100644 --- a/azurerm/resource_arm_dns_srv_record_test.go +++ b/azurerm/resource_arm_dns_srv_record_test.go @@ -26,6 +26,7 @@ func TestAccAzureRMDnsSrvRecord_basic(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsSrvRecordExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "fqdn"), ), }, { diff --git a/azurerm/resource_arm_dns_txt_record.go b/azurerm/resource_arm_dns_txt_record.go index 81c78622b893..fbfbb17bcf33 100644 --- a/azurerm/resource_arm_dns_txt_record.go +++ b/azurerm/resource_arm_dns_txt_record.go @@ -64,6 +64,11 @@ func resourceArmDnsTxtRecord() *schema.Resource { Required: true, }, + "fqdn": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tags.Schema(), }, } @@ -150,6 +155,7 @@ func resourceArmDnsTxtRecordRead(d *schema.ResourceData, meta interface{}) error d.Set("resource_group_name", resGroup) d.Set("zone_name", zoneName) d.Set("ttl", resp.TTL) + d.Set("fqdn", resp.Fqdn) if err := d.Set("record", flattenAzureRmDnsTxtRecords(resp.TxtRecords)); err != nil { return err diff --git a/azurerm/resource_arm_dns_txt_record_test.go b/azurerm/resource_arm_dns_txt_record_test.go index bf342aa5120b..01b8af21f780 100644 --- a/azurerm/resource_arm_dns_txt_record_test.go +++ b/azurerm/resource_arm_dns_txt_record_test.go @@ -26,6 +26,7 @@ func TestAccAzureRMDnsTxtRecord_basic(t *testing.T) { Config: config, Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsTxtRecordExists(resourceName), + resource.TestCheckResourceAttrSet(resourceName, "fqdn"), ), }, { diff --git a/website/docs/r/dns_a_record.html.markdown b/website/docs/r/dns_a_record.html.markdown index e1388e817a0b..f3218bfe76b8 100644 --- a/website/docs/r/dns_a_record.html.markdown +++ b/website/docs/r/dns_a_record.html.markdown @@ -54,6 +54,7 @@ The following arguments are supported: The following attributes are exported: * `id` - The DNS A Record ID. +* `fqdn` - The FQDN of the DNS A Record. ## Import diff --git a/website/docs/r/dns_aaaa_record.html.markdown b/website/docs/r/dns_aaaa_record.html.markdown index 02ec3ebf1725..449e9bb62d28 100644 --- a/website/docs/r/dns_aaaa_record.html.markdown +++ b/website/docs/r/dns_aaaa_record.html.markdown @@ -54,6 +54,7 @@ The following arguments are supported: The following attributes are exported: * `id` - The DNS AAAA Record ID. +* `fqdn` - The FQDN of the DNS AAAA Record. ## Import diff --git a/website/docs/r/dns_caa_record.html.markdown b/website/docs/r/dns_caa_record.html.markdown index d6830178d923..018a357ead64 100644 --- a/website/docs/r/dns_caa_record.html.markdown +++ b/website/docs/r/dns_caa_record.html.markdown @@ -88,6 +88,7 @@ The `record` block supports: The following attributes are exported: * `id` - The DNS CAA Record ID. +* `fqdn` - The FQDN of the DNS CAA Record. ## Import diff --git a/website/docs/r/dns_cname_record.html.markdown b/website/docs/r/dns_cname_record.html.markdown index 9ceef4b60519..deeffb562f70 100644 --- a/website/docs/r/dns_cname_record.html.markdown +++ b/website/docs/r/dns_cname_record.html.markdown @@ -54,6 +54,7 @@ The following arguments are supported: The following attributes are exported: * `id` - The DNS CName Record ID. +* `fqdn` - The FQDN of the DNS CName Record. ## Import diff --git a/website/docs/r/dns_mx_record.html.markdown b/website/docs/r/dns_mx_record.html.markdown index c2b168ade93c..b03d498e74fd 100644 --- a/website/docs/r/dns_mx_record.html.markdown +++ b/website/docs/r/dns_mx_record.html.markdown @@ -72,6 +72,7 @@ The `record` block supports: The following attributes are exported: * `id` - The DNS MX Record ID. +* `fqdn` - The FQDN of the DNS MX Record. ## Import diff --git a/website/docs/r/dns_ns_record.html.markdown b/website/docs/r/dns_ns_record.html.markdown index 7e0db1c0f7ab..930b6a97c3f9 100644 --- a/website/docs/r/dns_ns_record.html.markdown +++ b/website/docs/r/dns_ns_record.html.markdown @@ -64,6 +64,7 @@ The `record` block supports: The following attributes are exported: * `id` - The DNS NS Record ID. +* `fqdn` - The FQDN of the DNS NS Record. ## Import diff --git a/website/docs/r/dns_ptr_record.html.markdown b/website/docs/r/dns_ptr_record.html.markdown index 528d727e2344..854a1b2c7376 100644 --- a/website/docs/r/dns_ptr_record.html.markdown +++ b/website/docs/r/dns_ptr_record.html.markdown @@ -54,6 +54,7 @@ The following arguments are supported: The following attributes are exported: * `id` - The DNS PTR Record ID. +* `fqdn` - The FQDN of the DNS PTR Record. ## Import diff --git a/website/docs/r/dns_srv_record.html.markdown b/website/docs/r/dns_srv_record.html.markdown index d3713d904554..2bda70ca34f6 100644 --- a/website/docs/r/dns_srv_record.html.markdown +++ b/website/docs/r/dns_srv_record.html.markdown @@ -74,6 +74,7 @@ The `record` block supports: The following attributes are exported: * `id` - The DNS SRV Record ID. +* `fqdn` - The FQDN of the DNS SRV Record. ## Import diff --git a/website/docs/r/dns_txt_record.html.markdown b/website/docs/r/dns_txt_record.html.markdown index ab9e3878fa0d..9a9c8bae38c9 100644 --- a/website/docs/r/dns_txt_record.html.markdown +++ b/website/docs/r/dns_txt_record.html.markdown @@ -68,6 +68,7 @@ The `record` block supports: The following attributes are exported: * `id` - The DNS TXT Record ID. +* `fqdn` - The FQDN of the DNS TXT Record. ## Import