public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-05 17:52:38 +00:00
Code Issues Projects Releases Wiki Activity

Bring google_dns_managed_zones to ga (#2154)

Browse Source
This commit is contained in:
Riley Karson 2018-10-02 16:08:04 -07:00 committed by GitHub
parent a4a453dc1b
commit bb4c9374bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
google/dns_operation.go
View File

@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"google.golang.org/api/dns/v1beta2" "google.golang.org/api/dns/v1"
) )
type DnsOperationWaiter struct { type DnsOperationWaiter struct {

7
google/resource_dns_managed_zone.go
View File

@ -6,7 +6,6 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"google.golang.org/api/dns/v1" "google.golang.org/api/dns/v1"
dnsBeta "google.golang.org/api/dns/v1beta2"
) )
func resourceDnsManagedZone() *schema.Resource { func resourceDnsManagedZone() *schema.Resource {
@ -126,7 +125,7 @@ func resourceDnsManagedZoneUpdate(d *schema.ResourceData, meta interface{}) erro
return err return err
} }
zone := &dnsBeta.ManagedZone{ zone := &dns.ManagedZone{
Name: d.Get("name").(string), Name: d.Get("name").(string),
DnsName: d.Get("dns_name").(string), DnsName: d.Get("dns_name").(string),
Description: d.Get("description").(string), Description: d.Get("description").(string),
@ -136,12 +135,12 @@ func resourceDnsManagedZoneUpdate(d *schema.ResourceData, meta interface{}) erro
zone.Labels = expandLabels(d) zone.Labels = expandLabels(d)
} }
op, err := config.clientDnsBeta.ManagedZones.Patch(project, d.Id(), zone).Do() op, err := config.clientDns.ManagedZones.Patch(project, d.Id(), zone).Do()
if err != nil { if err != nil {
return err return err
} }
err = dnsOperationWait(config.clientDnsBeta, op, project, "Updating DNS Managed Zone") err = dnsOperationWait(config.clientDns, op, project, "Updating DNS Managed Zone")
if err != nil { if err != nil {
return err return err
} }