terraform: ensure provisioner runs only on instance create

This commit is contained in:
Armon Dadgar 2014-09-22 11:15:22 -07:00
parent bea81d7710
commit cdce8208f3
4 changed files with 94 additions and 1 deletions

View File

@ -592,6 +592,11 @@ func (c *Context) applyWalkFn() depgraph.WalkFunc {
handleHook(h.PreApply(r.Id, is, diff)) handleHook(h.PreApply(r.Id, is, diff))
} }
// We create a new instance if there was no ID
// previously or the diff requires re-creating the
// underlying instance
createNew := is.ID == "" || diff.RequiresNew()
// With the completed diff, apply! // With the completed diff, apply!
log.Printf("[DEBUG] %s: Executing Apply", r.Id) log.Printf("[DEBUG] %s: Executing Apply", r.Id)
is, applyerr := r.Provider.Apply(r.Info, is, diff) is, applyerr := r.Provider.Apply(r.Info, is, diff)
@ -633,7 +638,7 @@ func (c *Context) applyWalkFn() depgraph.WalkFunc {
// Additionally, we need to be careful to not run this if there // Additionally, we need to be careful to not run this if there
// was an error during the provider apply. // was an error during the provider apply.
tainted := false tainted := false
if applyerr == nil && is.ID != "" && len(r.Provisioners) > 0 { if applyerr == nil && createNew && len(r.Provisioners) > 0 {
for _, h := range c.hooks { for _, h := range c.hooks {
handleHook(h.PreProvisionResource(r.Id, is)) handleHook(h.PreProvisionResource(r.Id, is))
} }

View File

@ -683,6 +683,83 @@ func TestContextApply_provisionerResourceRef(t *testing.T) {
} }
} }
// Provisioner should NOT run on a diff, only create
func TestContextApply_Provisioner_Diff(t *testing.T) {
c := testConfig(t, "apply-provisioner-diff")
p := testProvider("aws")
pr := testProvisioner()
p.ApplyFn = testApplyFn
p.DiffFn = testDiffFn
pr.ApplyFn = func(rs *InstanceState, c *ResourceConfig) error {
return nil
}
ctx := testContext(t, &ContextOpts{
Config: c,
Providers: map[string]ResourceProviderFactory{
"aws": testProviderFuncFixed(p),
},
Provisioners: map[string]ResourceProvisionerFactory{
"shell": testProvisionerFuncFixed(pr),
},
})
if _, err := ctx.Plan(nil); err != nil {
t.Fatalf("err: %s", err)
}
state, err := ctx.Apply()
if err != nil {
t.Fatalf("err: %s", err)
}
actual := strings.TrimSpace(state.String())
expected := strings.TrimSpace(testTerraformApplyProvisionerDiffStr)
if actual != expected {
t.Fatalf("bad: \n%s", actual)
}
// Verify apply was invoked
if !pr.ApplyCalled {
t.Fatalf("provisioner not invoked")
}
pr.ApplyCalled = false
// Change the state to force a diff
mod := state.RootModule()
mod.Resources["aws_instance.bar"].Primary.Attributes["foo"] = "baz"
// Re-create context with state
ctx = testContext(t, &ContextOpts{
Config: c,
Providers: map[string]ResourceProviderFactory{
"aws": testProviderFuncFixed(p),
},
Provisioners: map[string]ResourceProvisionerFactory{
"shell": testProvisionerFuncFixed(pr),
},
State: state,
})
if _, err := ctx.Plan(nil); err != nil {
t.Fatalf("err: %s", err)
}
state2, err := ctx.Apply()
if err != nil {
t.Fatalf("err: %s", err)
}
actual = strings.TrimSpace(state2.String())
if actual != expected {
t.Fatalf("bad: \n%s", actual)
}
// Verify apply was NOT invoked
if pr.ApplyCalled {
t.Fatalf("provisioner invoked")
}
}
func TestContextApply_outputDiffVars(t *testing.T) { func TestContextApply_outputDiffVars(t *testing.T) {
c := testConfig(t, "apply-good") c := testConfig(t, "apply-good")
p := testProvider("aws") p := testProvider("aws")

View File

@ -153,6 +153,13 @@ aws_instance.bar:
type = aws_instance type = aws_instance
` `
const testTerraformApplyProvisionerDiffStr = `
aws_instance.bar:
ID = foo
foo = bar
type = aws_instance
`
const testTerraformApplyDestroyStr = ` const testTerraformApplyDestroyStr = `
<no state> <no state>
` `

View File

@ -0,0 +1,4 @@
resource "aws_instance" "bar" {
foo = "bar"
provisioner "shell" {}
}