Skip to content

Commit

Permalink
terraform: don't add tainted resources to expanded graph [GH-412]
Browse files Browse the repository at this point in the history
The tainted resources are separate elements in the graph.
  • Loading branch information
mitchellh committed Oct 18, 2014
1 parent 895d978 commit b2d674b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ BUG FIXES:
* core: If a resource fails to create and has provisioners, it is
marked as tainted. [GH-434]
* core: Set types are validated to be sets. [GH-413]
* core: Fix crash case when destroying with tainted resources. [GH-412]
* providers/aws: Refresh of launch configs and autoscale groups load
the correct data and don't incorrectly recreate themselves. [GH-425]
* providers/aws: Fix case where ELB would incorrectly plan to modify
Expand All @@ -20,8 +21,8 @@ BUG FIXES:
* providers/aws: Retry deleting security groups for some amount of time
if there is a dependency violation since it is probably just eventual
consistency. [GH-436]
* providers/aws: Retry deleting subnet for some amount of time if there is a
dependency violation since probably asynchronous destroy events take
* providers/aws: Retry deleting subnet for some amount of time if there is a
dependency violation since probably asynchronous destroy events take
place still. [GH-449]
* providers/aws: Drain autoscale groups before deleting. [GH-435]
* providers/aws: Fix crash case if launch config is manually deleted. [GH-421]
Expand Down
5 changes: 0 additions & 5 deletions terraform/graph.go
Original file line number Diff line number Diff line change
Expand Up @@ -1667,11 +1667,6 @@ func (n *GraphNodeResource) Expand() (*depgraph.Graph, error) {
return n.finalizeGraph(g, false)
}

if n.State != nil {
// Add the tainted resources
graphAddTainted(g, n.State)
}

return n.finalizeGraph(g, true)
}

Expand Down

0 comments on commit b2d674b

Please sign in to comment.