From 2bb814e3debb5be37c05212ec3b0d12ecbc646d5 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 4 May 2016 12:42:02 -0700
Subject: [PATCH] helper/schema: adapt to ID being arg to ImportState

---
 helper/schema/provider.go      | 5 +++--
 helper/schema/provider_test.go | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/helper/schema/provider.go b/helper/schema/provider.go
index eca3dcd562..6c6daff3df 100644
--- a/helper/schema/provider.go
+++ b/helper/schema/provider.go
@@ -215,7 +215,8 @@ func (p *Provider) Resources() []terraform.ResourceType {
 }
 
 func (p *Provider) ImportState(
-	info *terraform.InstanceInfo) ([]*terraform.InstanceState, error) {
+	info *terraform.InstanceInfo,
+	id string) ([]*terraform.InstanceState, error) {
 	// Find the resource
 	r, ok := p.ResourcesMap[info.Type]
 	if !ok {
@@ -229,7 +230,7 @@ func (p *Provider) ImportState(
 
 	// Create the data
 	data := r.Data(nil)
-	data.SetId(info.Id)
+	data.SetId(id)
 	data.SetType(info.Type)
 
 	// Call the import function
diff --git a/helper/schema/provider_test.go b/helper/schema/provider_test.go
index 700eabc543..ba339f6995 100644
--- a/helper/schema/provider_test.go
+++ b/helper/schema/provider_test.go
@@ -219,9 +219,8 @@ func TestProviderImportState_setsId(t *testing.T) {
 	}
 
 	_, err := p.ImportState(&terraform.InstanceInfo{
-		Id:   "bar",
 		Type: "foo",
-	})
+	}, "bar")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -251,7 +250,7 @@ func TestProviderImportState_setsType(t *testing.T) {
 
 	_, err := p.ImportState(&terraform.InstanceInfo{
 		Type: "foo",
-	})
+	}, "bar")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}