Merge pull request #3912 from hashicorp/b-target-orphans

Allow targeting orphan nodes

terraform/context_plan_test.go

@@ -1627,6 +1627,53 @@ STATE:
  }
 }
 
+func TestContext2Plan_targetedOrphan(t *testing.T) {
+ m := testModule(t, "plan-targeted-orphan")
+ p := testProvider("aws")
+ p.DiffFn = testDiffFn
+ ctx := testContext2(t, &ContextOpts{
+ Module: m,
+ Providers: map[string]ResourceProviderFactory{
+ "aws": testProviderFuncFixed(p),
+ },
+ State: &State{
+ Modules: []*ModuleState{
+ &ModuleState{
+ Path: rootModulePath,
+ Resources: map[string]*ResourceState{
+ "aws_instance.orphan": &ResourceState{
+ Type: "aws_instance",
+ Primary: &InstanceState{
+ ID: "i-789xyz",
+ },
+ },
+ },
+ },
+ },
+ },
+ Destroy: true,
+ Targets: []string{"aws_instance.orphan"},
+ })
+
+ plan, err := ctx.Plan()
+ if err != nil {
+ t.Fatalf("err: %s", err)
+ }
+
+ actual := strings.TrimSpace(plan.String())
+ expected := strings.TrimSpace(`DIFF:
+
+DESTROY: aws_instance.orphan
+
+STATE:
+
+aws_instance.orphan:
+ ID = i-789xyz`)
+ if actual != expected {
+ t.Fatalf("expected:\n%s\n\ngot:\n%s", expected, actual)
+ }
+}
+
 func TestContext2Plan_provider(t *testing.T) {
  m := testModule(t, "plan-provider")
  p := testProvider("aws")

terraform/graph_builder.go

@@ -105,9 +105,8 @@ func (b *BuiltinGraphBuilder) Steps(path []string) []GraphTransformer {
  // Create all our resources from the configuration and state
  &ConfigTransformer{Module: b.Root},
  &OrphanTransformer{
- State: b.State,
- Module: b.Root,
- Targeting: len(b.Targets) > 0,
+ State: b.State,
+ Module: b.Root,
  },
 
  // Output-related transformations

terraform/graph_config_node_resource.go

@@ -163,9 +163,9 @@ func (n *GraphNodeConfigResource) DynamicExpand(ctx EvalContext) (*Graph, error)
  // expand orphans, which have all the same semantics in a destroy
  // as a primary.
  steps = append(steps, &OrphanTransformer{
- State:  state,
- View:  n.Resource.Id(),
- Targeting: len(n.Targets) > 0,
+ State: state,
+ View: n.Resource.Id(),
+ Targets: n.Targets,
  })
 
  steps = append(steps, &DeposedTransformer{

terraform/test-fixtures/plan-targeted-orphan/main.tf

@@ -0,0 +1,6 @@
+# This resource was previously "created" and the fixture represents
+# it being destroyed subsequently
+
+/*resource "aws_instance" "orphan" {*/
+ /*foo = "bar"*/
+/*}*/

terraform/transform_orphan.go

@@ -2,7 +2,7 @@ package terraform
 
 import (
  "fmt"
- "log"
+ "strings"
 
  "github.com/hashicorp/terraform/config"
  "github.com/hashicorp/terraform/config/module"
@@ -29,7 +29,7 @@ type OrphanTransformer struct {
  // Targets are user-specified resources to target. We need to be aware of
  // these so we don't improperly identify orphans when they've just been
  // filtered out of the graph via targeting.
- Targeting bool
+ Targets []ResourceAddress
 
  // View, if non-nil will set a view on the module state.
  View string
@@ -41,13 +41,6 @@ func (t *OrphanTransformer) Transform(g *Graph) error {
  return nil
  }
 
- if t.Targeting {
- log.Printf("Skipping orphan transformer because we have targets.")
- // If we are in a run where we are targeting nodes, we won't process
- // orphans for this run.
- return nil
- }
-
  // Build up all our state representatives
  resourceRep := make(map[string]struct{})
  for _, v := range g.Vertices() {
@@ -74,8 +67,24 @@ func (t *OrphanTransformer) Transform(g *Graph) error {
  state = state.View(t.View)
  }
 
- // Go over each resource orphan and add it to the graph.
  resourceOrphans := state.Orphans(config)
+ if len(t.Targets) > 0 {
+ var targetedOrphans []string
+ for _, o := range resourceOrphans {
+ targeted := false
+ for _, t := range t.Targets {
+ prefix := fmt.Sprintf("%s.%s.%d", t.Type, t.Name, t.Index)
+ if strings.HasPrefix(o, prefix) {
+ targeted = true
+ }
+ }
+ if targeted {
+ targetedOrphans = append(targetedOrphans, o)
+ }
+ }
+ resourceOrphans = targetedOrphans
+ }
+
  resourceVertexes = make([]dag.Vertex, len(resourceOrphans))
  for i, k := range resourceOrphans {
  // If this orphan is represented by some other node somehow,
@@ -173,6 +182,10 @@ type graphNodeOrphanResource struct {
  dependentOn []string
 }
 
+func (n *graphNodeOrphanResource) ResourceAddress() *ResourceAddress {
+ return n.ResourceAddress()
+}
+
 func (n *graphNodeOrphanResource) DependableName() []string {
  return []string{n.dependableName()}
 }