From e579c1c90fd701ae61bb84b97530d0b066c40434 Mon Sep 17 00:00:00 2001
From: Jake Champlin <jake.champlin.27@gmail.com>
Date: Wed, 11 Jan 2017 17:38:02 -0500
Subject: [PATCH 1/2] provider/aws: Add import to route53 record

Allows the user to run:

```
terraform import aws_route53_record.record_name <record_id>
```

Fixes: #10941
---
 .../aws/import_aws_route53_record_test.go     | 28 +++++++++++++++++++
 .../aws/resource_aws_route53_record.go        |  4 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 builtin/providers/aws/import_aws_route53_record_test.go

diff --git a/builtin/providers/aws/import_aws_route53_record_test.go b/builtin/providers/aws/import_aws_route53_record_test.go
new file mode 100644
index 0000000000..69644ddeb4
--- /dev/null
+++ b/builtin/providers/aws/import_aws_route53_record_test.go
@@ -0,0 +1,28 @@
+package aws
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccAwsRoute53Record_importBasic(t *testing.T) {
+	resourceName := "aws_route53_record.default"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckRoute53RecordDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccRoute53RecordConfig,
+			},
+			{
+				ResourceName:            resourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"weight"},
+			},
+		},
+	})
+}
diff --git a/builtin/providers/aws/resource_aws_route53_record.go b/builtin/providers/aws/resource_aws_route53_record.go
index d7d4cadcad..4d612fec3d 100644
--- a/builtin/providers/aws/resource_aws_route53_record.go
+++ b/builtin/providers/aws/resource_aws_route53_record.go
@@ -27,7 +27,9 @@ func resourceAwsRoute53Record() *schema.Resource {
 		Read:   resourceAwsRoute53RecordRead,
 		Update: resourceAwsRoute53RecordUpdate,
 		Delete: resourceAwsRoute53RecordDelete,
-
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 		SchemaVersion: 2,
 		MigrateState:  resourceAwsRoute53RecordMigrateState,
 		Schema: map[string]*schema.Schema{

From 2bd3c26fb11bd3d51cdf364c78f36ba767956475 Mon Sep 17 00:00:00 2001
From: Jake Champlin <jake.champlin.27@gmail.com>
Date: Wed, 11 Jan 2017 17:43:26 -0500
Subject: [PATCH 2/2] Add documentation for route53_record import

---
 .../docs/providers/aws/r/route53_record.html.markdown    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/website/source/docs/providers/aws/r/route53_record.html.markdown b/website/source/docs/providers/aws/r/route53_record.html.markdown
index 80230e7f24..b74c8e56d5 100644
--- a/website/source/docs/providers/aws/r/route53_record.html.markdown
+++ b/website/source/docs/providers/aws/r/route53_record.html.markdown
@@ -133,3 +133,12 @@ Weighted routing policies support the following:
 ## Attributes Reference
 
 * `fqdn` - [FQDN](https://en.wikipedia.org/wiki/Fully_qualified_domain_name) built using the zone domain and `name`
+
+
+## Import
+
+Route53 Records can be imported using ID of the record, e.g.
+
+```
+$ terraform import aws_route53_record.myrecord Z4KAPRWWNC7JR_dev.example.com_NS
+```
\ No newline at end of file