diff --git a/builtin/providers/google/import_dns_managed_zone_test.go b/builtin/providers/google/import_dns_managed_zone_test.go new file mode 100644 index 0000000000..751663516e --- /dev/null +++ b/builtin/providers/google/import_dns_managed_zone_test.go @@ -0,0 +1,28 @@ +package google + +import ( + "testing" + + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccDnsManagedZone_importBasic(t *testing.T) { + resourceName := "google_dns_managed_zone.foobar" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckDnsManagedZoneDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccDnsManagedZone_basic, + }, + + resource.TestStep{ + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} diff --git a/builtin/providers/google/resource_dns_managed_zone.go b/builtin/providers/google/resource_dns_managed_zone.go index 8181e278b6..f35e7dd87e 100644 --- a/builtin/providers/google/resource_dns_managed_zone.go +++ b/builtin/providers/google/resource_dns_managed_zone.go @@ -14,7 +14,9 @@ func resourceDnsManagedZone() *schema.Resource { Create: resourceDnsManagedZoneCreate, Read: resourceDnsManagedZoneRead, Delete: resourceDnsManagedZoneDelete, - + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, Schema: map[string]*schema.Schema{ "dns_name": &schema.Schema{ Type: schema.TypeString, @@ -109,6 +111,9 @@ func resourceDnsManagedZoneRead(d *schema.ResourceData, meta interface{}) error } d.Set("name_servers", zone.NameServers) + d.Set("name", zone.Name) + d.Set("dns_name", zone.DnsName) + d.Set("description", zone.Description) return nil } diff --git a/website/source/docs/import/importability.html.md b/website/source/docs/import/importability.html.md index 8fbdb48786..15d1b90900 100644 --- a/website/source/docs/import/importability.html.md +++ b/website/source/docs/import/importability.html.md @@ -150,6 +150,7 @@ To make a resource importable, please see the * google_compute_instance_group_manager * google_compute_instance_template * google_compute_target_pool +* google_dns_managed_zone * google_project ### OpenStack