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

helper/resource: Preserve provider address when shimming to old state 

It's important to preserve the provider address because during the destroy
phase of provider tests we'll use the references in the state to determine
which providers are required, and so without this attempts to override
the provider using the "provider" meta-argument can cause failures at
destroy time when the wrong provider gets selected.

(This is particularly acute in the google-beta provider tests because that
provider is _always_ used with provider = "google-beta" to override the
default behavior of using the normal "google" provider.)
This commit is contained in:
Martin Atkins 2019-03-19 14:45:16 -07:00
parent a710447eaf
commit 35df450dc0
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
helper/resource/state_shim.go
View File

@ -62,6 +62,7 @@ func shimNewState(newState *states.State, providers map[string]terraform.Resourc
Attributes: flatmap,
Tainted: i.Current.Status == states.ObjectTainted,
},
Provider: res.ProviderConfig.String(),
}
if i.Current.SchemaVersion != 0 {
resState.Primary.Meta = map[string]interface{}{

23
helper/resource/state_shim_test.go
View File

@ -192,7 +192,8 @@ func TestStateShim(t *testing.T) {
},
Resources: map[string]*terraform.ResourceState{
"test_thing.baz": &terraform.ResourceState{
Type: "test_thing",
Type: "test_thing",
Provider: "provider.test",
Primary: &terraform.InstanceState{
ID: "baz",
Attributes: map[string]string{
@ -202,7 +203,8 @@ func TestStateShim(t *testing.T) {
},
},
"test_thing.foo": &terraform.ResourceState{
Type: "test_thing",
Type: "test_thing",
Provider: "provider.test",
Primary: &terraform.InstanceState{
ID: "foo",
Attributes: map[string]string{
@ -221,7 +223,8 @@ func TestStateShim(t *testing.T) {
Path: []string{"root", "child"},
Resources: map[string]*terraform.ResourceState{
"test_thing.baz": &terraform.ResourceState{
Type: "test_thing",
Type: "test_thing",
Provider: "module.child.provider.test",
Primary: &terraform.InstanceState{
ID: "bar",
Attributes: map[string]string{
@ -241,7 +244,8 @@ func TestStateShim(t *testing.T) {
Dependencies: []string{"data.test_data_thing.foo"},
},
"data.test_data_thing.foo": &terraform.ResourceState{
Type: "test_data_thing",
Type: "test_data_thing",
Provider: "module.child.provider.test",
Primary: &terraform.InstanceState{
ID: "bar",
Attributes: map[string]string{
@ -251,7 +255,8 @@ func TestStateShim(t *testing.T) {
},
},
"test_thing.lots.0": &terraform.ResourceState{
Type: "test_thing",
Type: "test_thing",
Provider: "module.child.provider.test",
Primary: &terraform.InstanceState{
ID: "0",
Attributes: map[string]string{
@ -261,7 +266,8 @@ func TestStateShim(t *testing.T) {
},
},
"test_thing.lots.1": &terraform.ResourceState{
Type: "test_thing",
Type: "test_thing",
Provider: "module.child.provider.test",
Primary: &terraform.InstanceState{
ID: "1",
Attributes: map[string]string{
@ -272,7 +278,8 @@ func TestStateShim(t *testing.T) {
},
},
"test_thing.single_count": &terraform.ResourceState{
Type: "test_thing",
Type: "test_thing",
Provider: "module.child.provider.test",
Primary: &terraform.InstanceState{
ID: "single",
Attributes: map[string]string{
@ -314,6 +321,6 @@ func TestStateShim(t *testing.T) {
}
if !expected.Equal(shimmed) {
t.Fatalf("\nexpected state:\n%s\n\ngot state:\n%s", expected, shimmed)
t.Fatalf("wrong result state\ngot:\n%s\n\nwant:\n%s", expected, shimmed)
}
}