helper/resource: verify refresh+plan after each step

I forgot to add `Computed: true` when I made the "key_name" field
optional in #1751.

This made the behavior:

 * Name generated in Create and set as ID
 * Follow up plan (without refresh) was nice and empty
 * During refresh, name gets cleared out on Read, causing a bad diff on
   subsequent plans

We can automatically catch bugs like this if we add yet another
verification step to our resource acceptance tests -> a post
Refresh+Plan that we verify is empty.

I left the non-refresh Plan verification in, because it's important that
_both_ of these are empty after an Apply.
This commit is contained in:
Paul Hinze 2015-04-30 10:13:32 -05:00
parent 89b50f7790
commit 149e52ad1f
2 changed files with 27 additions and 1 deletions

View File

@ -240,7 +240,8 @@ func testStep(
}
}
// Verify that Plan is now empty and we don't have a perpetual diff issue
// Now, verify that Plan is now empty and we don't have a perpetual diff issue
// We do this with TWO plans. One without a refresh.
if p, err := ctx.Plan(); err != nil {
return state, fmt.Errorf("Error on follow-up plan: %s", err)
} else {
@ -250,6 +251,21 @@ func testStep(
}
}
// And another after a Refresh.
state, err = ctx.Refresh()
if err != nil {
return state, fmt.Errorf(
"Error on follow-up refresh: %s", err)
}
if p, err := ctx.Plan(); err != nil {
return state, fmt.Errorf("Error on second follow-up plan: %s", err)
} else {
if p.Diff != nil && !p.Diff.Empty() {
return state, fmt.Errorf(
"After applying this step and refreshing, the plan was not empty:\n\n%s", p)
}
}
return state, err
}

View File

@ -3,6 +3,7 @@ package resource
import (
"fmt"
"os"
"sync/atomic"
"testing"
"github.com/hashicorp/terraform/terraform"
@ -23,6 +24,15 @@ func TestTest(t *testing.T) {
mp.ApplyReturn = &terraform.InstanceState{
ID: "foo",
}
var refreshCount int32
mp.RefreshFn = func(*terraform.InstanceInfo, *terraform.InstanceState) (*terraform.InstanceState, error) {
atomic.AddInt32(&refreshCount, 1)
if atomic.LoadInt32(&refreshCount) == 1 {
return &terraform.InstanceState{ID: "foo"}, nil
} else {
return nil, nil
}
}
checkDestroy := false
checkStep := false