From 6618f397973ad0caaf6933029286009d8bf77bc2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Jun 2014 14:08:48 -0700
Subject: [PATCH] providers/aws: diff properly

---
 builtin/providers/aws/resource_provider.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/builtin/providers/aws/resource_provider.go b/builtin/providers/aws/resource_provider.go
index aadf7f0e7..3025bcc2f 100644
--- a/builtin/providers/aws/resource_provider.go
+++ b/builtin/providers/aws/resource_provider.go
@@ -28,6 +28,7 @@ func (p *ResourceProvider) Apply(
 	result := &terraform.ResourceState{
 		ID: "foo",
 	}
+	result = result.MergeDiff(d)
 
 	return result, nil
 }