ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

command: Fix TestApply_destroy for new provider and state types

This commit is contained in:
Martin Atkins 2018-09-30 08:20:32 -07:00
parent 4ee15ec604
commit db3ea65e8b
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
command/apply_destroy_test.go
View File

@ -11,6 +11,7 @@ import (
"github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/configschema"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/statefile"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
@ -32,7 +33,16 @@ func TestApply_destroy(t *testing.T) {
statePath := testStateFile(t, originalState) statePath := testStateFile(t, originalState)
p := testProvider() p := testProvider()
p.GetSchemaReturn = applyFixtureSchema() p.GetSchemaReturn = &terraform.ProviderSchema{
ResourceTypes: map[string]*configschema.Block{
"test_instance": {
Attributes: map[string]*configschema.Attribute{
"id": {Type: cty.String, Computed: true},
"ami": {Type: cty.String, Optional: true},
},
},
},
}
ui := new(cli.MockUi) ui := new(cli.MockUi)
c := &ApplyCommand{ c := &ApplyCommand{
@ -65,15 +75,15 @@ func TestApply_destroy(t *testing.T) {
} }
defer f.Close() defer f.Close()
state, err := terraform.ReadState(f) stateFile, err := statefile.Read(f)
if err != nil { if err != nil {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)
} }
if state == nil { if stateFile.State == nil {
t.Fatal("state should not be nil") t.Fatal("state should not be nil")
} }
actualStr := strings.TrimSpace(state.String()) actualStr := strings.TrimSpace(stateFile.State.String())
expectedStr := strings.TrimSpace(testApplyDestroyStr) expectedStr := strings.TrimSpace(testApplyDestroyStr)
if actualStr != expectedStr { if actualStr != expectedStr {
t.Fatalf("bad:\n\n%s\n\n%s", actualStr, expectedStr) t.Fatalf("bad:\n\n%s\n\n%s", actualStr, expectedStr)
@ -85,13 +95,13 @@ func TestApply_destroy(t *testing.T) {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)
} }
backupState, err := terraform.ReadState(f) backupStateFile, err := statefile.Read(f)
f.Close() f.Close()
if err != nil { if err != nil {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)
} }
actualStr = strings.TrimSpace(backupState.String()) actualStr = strings.TrimSpace(backupStateFile.State.String())
expectedStr = strings.TrimSpace(originalState.String()) expectedStr = strings.TrimSpace(originalState.String())
if actualStr != expectedStr { if actualStr != expectedStr {
t.Fatalf("bad:\n\n%s\n\n%s", actualStr, expectedStr) t.Fatalf("bad:\n\n%s\n\n%s", actualStr, expectedStr)