diff --git a/.changelog/6406.txt b/.changelog/6406.txt new file mode 100644 index 0000000000..571c912423 --- /dev/null +++ b/.changelog/6406.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +dns: added `managed_zone_id` attribute to `google_dns_managed_zone` data source +``` diff --git a/google-beta/data_source_dns_managed_zone.go b/google-beta/data_source_dns_managed_zone.go index 40426a68e3..734fe2ac8f 100644 --- a/google-beta/data_source_dns_managed_zone.go +++ b/google-beta/data_source_dns_managed_zone.go @@ -26,6 +26,12 @@ func dataSourceDnsManagedZone() *schema.Resource { Computed: true, }, + "managed_zone_id": { + Type: schema.TypeInt, + Computed: true, + Description: `Unique identifier for the resource; defined by the server.`, + }, + "name_servers": { Type: schema.TypeList, Computed: true, @@ -69,18 +75,21 @@ func dataSourceDnsManagedZoneRead(d *schema.ResourceData, meta interface{}) erro return handleNotFoundError(err, d, fmt.Sprintf("dataSourceDnsManagedZone %q", name)) } - if err := d.Set("name_servers", zone.NameServers); err != nil { - return fmt.Errorf("Error setting name_servers: %s", err) + if err := d.Set("dns_name", zone.DnsName); err != nil { + return fmt.Errorf("Error setting dns_name: %s", err) } if err := d.Set("name", zone.Name); err != nil { return fmt.Errorf("Error setting name: %s", err) } - if err := d.Set("dns_name", zone.DnsName); err != nil { - return fmt.Errorf("Error setting dns_name: %s", err) - } if err := d.Set("description", zone.Description); err != nil { return fmt.Errorf("Error setting description: %s", err) } + if err := d.Set("managed_zone_id", zone.Id); err != nil { + return fmt.Errorf("Error setting managed_zone_id: %s", err) + } + if err := d.Set("name_servers", zone.NameServers); err != nil { + return fmt.Errorf("Error setting name_servers: %s", err) + } if err := d.Set("visibility", zone.Visibility); err != nil { return fmt.Errorf("Error setting visibility: %s", err) } diff --git a/google-beta/data_source_dns_managed_zone_test.go b/google-beta/data_source_dns_managed_zone_test.go index acdbc17fab..e3b0a28f33 100644 --- a/google-beta/data_source_dns_managed_zone_test.go +++ b/google-beta/data_source_dns_managed_zone_test.go @@ -27,7 +27,6 @@ func TestAccDataSourceDnsManagedZone_basic(t *testing.T) { "forwarding_config.#": {}, "force_destroy": {}, "labels.#": {}, - "managed_zone_id": {}, "creation_time": {}, "reverse_lookup": {}, },