From eff11efff3cd66551f7a37479d0c53f33c81b505 Mon Sep 17 00:00:00 2001
From: AMeng <alexbmeng@gmail.com>
Date: Fri, 19 Aug 2016 11:10:57 -0600
Subject: [PATCH 1/2] provider/aws: Support Import aws_elasticache_cluster

---
 .../import_aws_elasticache_cluster_test.go    | 28 +++++++++++++++++++
 .../aws/resource_aws_elasticache_cluster.go   |  3 ++
 .../source/docs/import/importability.html.md  |  2 +-
 .../aws/r/elasticache_cluster.html.markdown   |  9 ++++++
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 builtin/providers/aws/import_aws_elasticache_cluster_test.go

diff --git a/builtin/providers/aws/import_aws_elasticache_cluster_test.go b/builtin/providers/aws/import_aws_elasticache_cluster_test.go
new file mode 100644
index 000000000..c0da43fca
--- /dev/null
+++ b/builtin/providers/aws/import_aws_elasticache_cluster_test.go
@@ -0,0 +1,28 @@
+package aws
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccAWSElasticacheCluster_importBasic(t *testing.T) {
+	resourceName := "aws_elasticache_cluster.bar"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSElasticacheClusterDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccAWSElasticacheClusterConfig,
+			},
+
+			resource.TestStep{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
diff --git a/builtin/providers/aws/resource_aws_elasticache_cluster.go b/builtin/providers/aws/resource_aws_elasticache_cluster.go
index d24201457..794a7f882 100644
--- a/builtin/providers/aws/resource_aws_elasticache_cluster.go
+++ b/builtin/providers/aws/resource_aws_elasticache_cluster.go
@@ -200,6 +200,9 @@ func resourceAwsElasticacheCluster() *schema.Resource {
 		Read:   resourceAwsElasticacheClusterRead,
 		Update: resourceAwsElasticacheClusterUpdate,
 		Delete: resourceAwsElasticacheClusterDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 
 		Schema: resourceSchema,
 	}
diff --git a/website/source/docs/import/importability.html.md b/website/source/docs/import/importability.html.md
index f0a297370..d08fb6b67 100644
--- a/website/source/docs/import/importability.html.md
+++ b/website/source/docs/import/importability.html.md
@@ -48,6 +48,7 @@ To make a resource importable, please see the
 * aws_eip
 * aws_elastic_beanstalk_application
 * aws_elastic_beanstalk_environment
+* aws_elasticache_cluster
 * aws_elasticache_parameter_group
 * aws_elasticache_subnet_group
 * aws_elb
@@ -149,4 +150,3 @@ To make a resource importable, please see the
 * triton_key
 * triton_machine
 * triton_vlan
-
diff --git a/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown b/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown
index 9f24185b8..04bd84fb3 100644
--- a/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown
+++ b/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown
@@ -119,3 +119,12 @@ The following attributes are exported:
 
 [1]: https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ModifyCacheCluster.html
 [2]: https://docs.aws.amazon.com/fr_fr/AmazonElastiCache/latest/UserGuide/Clusters.Modify.html
+
+
+## Import
+
+ElastiCache Clusters can be imported using the `cluster_id`, e.g.
+
+```
+$ terraform import aws_elasticache_cluster.my_cluster my_cluster
+```

From 01cfeb806213d8d4e0530687990dd2e6735a4c03 Mon Sep 17 00:00:00 2001
From: AMeng <alexbmeng@gmail.com>
Date: Fri, 19 Aug 2016 12:32:38 -0600
Subject: [PATCH 2/2] provider/aws: Set AWS region in elasticache cluster
 import test

---
 builtin/providers/aws/import_aws_elasticache_cluster_test.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/builtin/providers/aws/import_aws_elasticache_cluster_test.go b/builtin/providers/aws/import_aws_elasticache_cluster_test.go
index c0da43fca..f1e951bc1 100644
--- a/builtin/providers/aws/import_aws_elasticache_cluster_test.go
+++ b/builtin/providers/aws/import_aws_elasticache_cluster_test.go
@@ -1,12 +1,17 @@
 package aws
 
 import (
+	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
 )
 
 func TestAccAWSElasticacheCluster_importBasic(t *testing.T) {
+	oldvar := os.Getenv("AWS_DEFAULT_REGION")
+	os.Setenv("AWS_DEFAULT_REGION", "us-east-1")
+	defer os.Setenv("AWS_DEFAULT_REGION", oldvar)
+
 	resourceName := "aws_elasticache_cluster.bar"
 
 	resource.Test(t, resource.TestCase{