terraform: destroy resources in dependent providers first

Fixes #4645

This is something that never worked (even in legacy graphs), but as we
push forward towards encouraging multi-provider usage especially with
things like the Vault data source, I want to make sure we have this
right for 0.8.

When you have a config like this:

```
resource "foo_type" "name" {}
provider "bar" { attr = "${foo_type.name.value}" }
resource "bar_type" "name" {}
```

Then the destruction ordering MUST be:

  1. `bar_type`
  2. `foo_type`

Since configuring the client for `bar_type` requires accessing data from
`foo_type`. Prior to this PR, these two would be done in parallel. This
properly pushes forward the dependency.

There are more cases I want to test but this is a basic case that is
fixed.
This commit is contained in:
Mitchell Hashimoto 2016-12-10 20:11:24 -05:00
parent c02b2471d6
commit 14d079f914
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
5 changed files with 140 additions and 15 deletions

View File

@ -2747,6 +2747,102 @@ func TestContext2Apply_multiProvider(t *testing.T) {
} }
} }
func TestContext2Apply_multiProviderDestroy(t *testing.T) {
m := testModule(t, "apply-multi-provider-destroy")
p := testProvider("aws")
p.ApplyFn = testApplyFn
p.DiffFn = testDiffFn
p2 := testProvider("do")
p2.ApplyFn = testApplyFn
p2.DiffFn = testDiffFn
var state *State
// First, create the instances
{
ctx := testContext2(t, &ContextOpts{
Module: m,
Providers: map[string]ResourceProviderFactory{
"aws": testProviderFuncFixed(p),
"vault": testProviderFuncFixed(p2),
},
})
if _, err := ctx.Plan(); err != nil {
t.Fatalf("err: %s", err)
}
s, err := ctx.Apply()
if err != nil {
t.Fatalf("err: %s", err)
}
state = s
}
// Destroy them
{
// Verify that aws_instance.bar is destroyed first
var checked bool
var called int32
var lock sync.Mutex
applyFn := func(
info *InstanceInfo,
is *InstanceState,
id *InstanceDiff) (*InstanceState, error) {
lock.Lock()
defer lock.Unlock()
if info.HumanId() == "aws_instance.bar" {
checked = true
// Sleep to allow parallel execution
time.Sleep(50 * time.Millisecond)
// Verify that called is 0 (dep not called)
if atomic.LoadInt32(&called) != 0 {
return nil, fmt.Errorf("nothing else should be called")
}
}
atomic.AddInt32(&called, 1)
return testApplyFn(info, is, id)
}
// Set the apply functions
p.ApplyFn = applyFn
p2.ApplyFn = applyFn
ctx := testContext2(t, &ContextOpts{
Destroy: true,
State: state,
Module: m,
Providers: map[string]ResourceProviderFactory{
"aws": testProviderFuncFixed(p),
"vault": testProviderFuncFixed(p2),
},
})
if _, err := ctx.Plan(); err != nil {
t.Fatalf("err: %s", err)
}
s, err := ctx.Apply()
if err != nil {
t.Fatalf("err: %s", err)
}
if !checked {
t.Fatal("should be checked")
}
state = s
}
checkStateString(t, state, `<no state>`)
}
func TestContext2Apply_multiVar(t *testing.T) { func TestContext2Apply_multiVar(t *testing.T) {
m := testModule(t, "apply-multi-var") m := testModule(t, "apply-multi-var")
p := testProvider("aws") p := testProvider("aws")

View File

@ -81,13 +81,6 @@ func (b *ApplyGraphBuilder) Steps() []GraphTransformer {
// Attach the state // Attach the state
&AttachStateTransformer{State: b.State}, &AttachStateTransformer{State: b.State},
// Destruction ordering
&DestroyEdgeTransformer{Module: b.Module, State: b.State},
GraphTransformIf(
func() bool { return !b.Destroy },
&CBDEdgeTransformer{Module: b.Module, State: b.State},
),
// Create all the providers // Create all the providers
&MissingProviderTransformer{Providers: b.Providers, Concrete: concreteProvider}, &MissingProviderTransformer{Providers: b.Providers, Concrete: concreteProvider},
&ProviderTransformer{}, &ProviderTransformer{},
@ -95,6 +88,13 @@ func (b *ApplyGraphBuilder) Steps() []GraphTransformer {
&ParentProviderTransformer{}, &ParentProviderTransformer{},
&AttachProviderConfigTransformer{Module: b.Module}, &AttachProviderConfigTransformer{Module: b.Module},
// Destruction ordering
&DestroyEdgeTransformer{Module: b.Module, State: b.State},
GraphTransformIf(
func() bool { return !b.Destroy },
&CBDEdgeTransformer{Module: b.Module, State: b.State},
),
// Provisioner-related transformations // Provisioner-related transformations
GraphTransformIf( GraphTransformIf(
func() bool { return !b.Destroy }, func() bool { return !b.Destroy },

View File

@ -0,0 +1,9 @@
resource "vault_instance" "foo" {}
provider "aws" {
addr = "${vault_instance.foo.id}"
}
resource "aws_instance" "bar" {
foo = "bar"
}

View File

@ -38,8 +38,8 @@ type GraphNodeCreator interface {
// example: VPC with subnets, the VPC can't be deleted while there are // example: VPC with subnets, the VPC can't be deleted while there are
// still subnets. // still subnets.
type DestroyEdgeTransformer struct { type DestroyEdgeTransformer struct {
// Module and State are only needed to look up dependencies in // These are needed to properly build the graph of dependencies
// any way possible. Either can be nil if not availabile. // to determine what a destroy node depends on. Any of these can be nil.
Module *module.Tree Module *module.Tree
State *State State *State
} }
@ -115,10 +115,20 @@ func (t *DestroyEdgeTransformer) Transform(g *Graph) error {
// Example: resource A is force new, then destroy A AND create A are // Example: resource A is force new, then destroy A AND create A are
// in the graph. BUT if resource A is just pure destroy, then only // in the graph. BUT if resource A is just pure destroy, then only
// destroy A is in the graph, and create A is not. // destroy A is in the graph, and create A is not.
providerFn := func(a *NodeAbstractProvider) dag.Vertex {
return &NodeApplyableProvider{NodeAbstractProvider: a}
}
steps := []GraphTransformer{ steps := []GraphTransformer{
// Add outputs and metadata
&OutputTransformer{Module: t.Module}, &OutputTransformer{Module: t.Module},
&AttachResourceConfigTransformer{Module: t.Module}, &AttachResourceConfigTransformer{Module: t.Module},
&AttachStateTransformer{State: t.State}, &AttachStateTransformer{State: t.State},
// Add providers since they can affect destroy order as well
&MissingProviderTransformer{AllowAny: true, Concrete: providerFn},
&ProviderTransformer{},
&AttachProviderConfigTransformer{Module: t.Module},
&ReferenceTransformer{}, &ReferenceTransformer{},
} }
@ -170,9 +180,13 @@ func (t *DestroyEdgeTransformer) Transform(g *Graph) error {
refs = append(refs, raw.(dag.Vertex)) refs = append(refs, raw.(dag.Vertex))
} }
refNames := make([]string, len(refs))
for i, ref := range refs {
refNames[i] = dag.VertexName(ref)
}
log.Printf( log.Printf(
"[TRACE] DestroyEdgeTransformer: creation node %q references %v", "[TRACE] DestroyEdgeTransformer: creation node %q references %s",
dag.VertexName(v), refs) dag.VertexName(v), refNames)
// If we have no references, then we won't need to do anything // If we have no references, then we won't need to do anything
if len(refs) == 0 { if len(refs) == 0 {

View File

@ -114,6 +114,10 @@ type MissingProviderTransformer struct {
// Providers is the list of providers we support. // Providers is the list of providers we support.
Providers []string Providers []string
// AllowAny will not check that a provider is supported before adding
// it to the graph.
AllowAny bool
// Concrete, if set, overrides how the providers are made. // Concrete, if set, overrides how the providers are made.
Concrete ConcreteProviderNodeFunc Concrete ConcreteProviderNodeFunc
} }
@ -170,10 +174,12 @@ func (t *MissingProviderTransformer) Transform(g *Graph) error {
ptype = p[:idx] ptype = p[:idx]
} }
if _, ok := supported[ptype]; !ok { if !t.AllowAny {
// If we don't support the provider type, skip it. if _, ok := supported[ptype]; !ok {
// Validation later will catch this as an error. // If we don't support the provider type, skip it.
continue // Validation later will catch this as an error.
continue
}
} }
// Add the missing provider node to the graph // Add the missing provider node to the graph