helper/diff: don't output ID anymore since Terraform does it

helper/diff/resource_builder.go

@@ -108,13 +108,6 @@ func (b *ResourceBuilder) Diff(
 				Type:        terraform.DiffAttrOutput,
 			}
 		}
-
-		// The ID will change
-		attrs["id"] = &terraform.ResourceAttrDiff{
-			Old:         s.ID,
-			NewComputed: true,
-			Type:        terraform.DiffAttrOutput,
-		}
 	}
 
 	// Build our resulting diff if we had attributes change

helper/diff/resource_builder_test.go

@@ -202,22 +202,18 @@ const testRBComplexDiff = `UPDATE
 
 const testRBNewDiff = `UPDATE
   IN  foo:        "" => "bar"
-  OUT id:         "" => "<computed>"
   OUT private_ip: "" => "<computed>"
 `
 
 const testRBRequiresNewDiff = `CREATE
   IN  ami:        "foo" => "bar" (forces new resource)
-  OUT id:         "1" => "<computed>"
   OUT private_ip: "127.0.0.1" => "<computed>"
 `
 
 const testRBUnknownDiff = `UPDATE
   IN  foo: "" => "${var.unknown}"
-  OUT id:  "" => "<computed>"
 `
 
 const testRBVarsDiff = `UPDATE
   IN  foo: "" => "bar"
-  OUT id:  "" => "<computed>"
 `