only need to handle depends_on to shim old state
This commit is contained in:
parent
42bb4a644c
commit
16b368e292
|
@ -87,7 +87,7 @@ func shimNewState(newState *states.State, providers map[string]terraform.Resourc
|
||||||
resState.Primary.Meta["schema_version"] = i.Current.SchemaVersion
|
resState.Primary.Meta["schema_version"] = i.Current.SchemaVersion
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, dep := range i.Current.Dependencies {
|
for _, dep := range i.Current.DependsOn {
|
||||||
resState.Dependencies = append(resState.Dependencies, dep.String())
|
resState.Dependencies = append(resState.Dependencies, dep.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ func TestStateShim(t *testing.T) {
|
||||||
Status: states.ObjectReady,
|
Status: states.ObjectReady,
|
||||||
AttrsFlat: map[string]string{"id": "foo", "bazzle": "dazzle"},
|
AttrsFlat: map[string]string{"id": "foo", "bazzle": "dazzle"},
|
||||||
SchemaVersion: 7,
|
SchemaVersion: 7,
|
||||||
Dependencies: []addrs.Referenceable{
|
DependsOn: []addrs.Referenceable{
|
||||||
addrs.ResourceInstance{
|
addrs.ResourceInstance{
|
||||||
Resource: addrs.Resource{
|
Resource: addrs.Resource{
|
||||||
Mode: 'M',
|
Mode: 'M',
|
||||||
|
@ -52,9 +52,9 @@ func TestStateShim(t *testing.T) {
|
||||||
Name: "baz",
|
Name: "baz",
|
||||||
}.Instance(addrs.NoKey),
|
}.Instance(addrs.NoKey),
|
||||||
&states.ResourceInstanceObjectSrc{
|
&states.ResourceInstanceObjectSrc{
|
||||||
Status: states.ObjectReady,
|
Status: states.ObjectReady,
|
||||||
AttrsFlat: map[string]string{"id": "baz", "bazzle": "dazzle"},
|
AttrsFlat: map[string]string{"id": "baz", "bazzle": "dazzle"},
|
||||||
Dependencies: []addrs.Referenceable{},
|
DependsOn: []addrs.Referenceable{},
|
||||||
},
|
},
|
||||||
addrs.ProviderConfig{
|
addrs.ProviderConfig{
|
||||||
Type: "test",
|
Type: "test",
|
||||||
|
@ -70,9 +70,9 @@ func TestStateShim(t *testing.T) {
|
||||||
Name: "foo",
|
Name: "foo",
|
||||||
}.Instance(addrs.NoKey),
|
}.Instance(addrs.NoKey),
|
||||||
&states.ResourceInstanceObjectSrc{
|
&states.ResourceInstanceObjectSrc{
|
||||||
Status: states.ObjectReady,
|
Status: states.ObjectReady,
|
||||||
AttrsJSON: []byte(`{"id": "bar", "fuzzle":"wuzzle"}`),
|
AttrsJSON: []byte(`{"id": "bar", "fuzzle":"wuzzle"}`),
|
||||||
Dependencies: []addrs.Referenceable{},
|
DependsOn: []addrs.Referenceable{},
|
||||||
},
|
},
|
||||||
addrs.ProviderConfig{
|
addrs.ProviderConfig{
|
||||||
Type: "test",
|
Type: "test",
|
||||||
|
@ -87,7 +87,7 @@ func TestStateShim(t *testing.T) {
|
||||||
&states.ResourceInstanceObjectSrc{
|
&states.ResourceInstanceObjectSrc{
|
||||||
Status: states.ObjectReady,
|
Status: states.ObjectReady,
|
||||||
AttrsJSON: []byte(`{"id": "bar", "fizzle":"wizzle"}`),
|
AttrsJSON: []byte(`{"id": "bar", "fizzle":"wizzle"}`),
|
||||||
Dependencies: []addrs.Referenceable{
|
DependsOn: []addrs.Referenceable{
|
||||||
addrs.ResourceInstance{
|
addrs.ResourceInstance{
|
||||||
Resource: addrs.Resource{
|
Resource: addrs.Resource{
|
||||||
Mode: 'D',
|
Mode: 'D',
|
||||||
|
@ -112,7 +112,7 @@ func TestStateShim(t *testing.T) {
|
||||||
&states.ResourceInstanceObjectSrc{
|
&states.ResourceInstanceObjectSrc{
|
||||||
Status: states.ObjectReady,
|
Status: states.ObjectReady,
|
||||||
AttrsFlat: map[string]string{"id": "old", "fizzle": "wizzle"},
|
AttrsFlat: map[string]string{"id": "old", "fizzle": "wizzle"},
|
||||||
Dependencies: []addrs.Referenceable{
|
DependsOn: []addrs.Referenceable{
|
||||||
addrs.ResourceInstance{
|
addrs.ResourceInstance{
|
||||||
Resource: addrs.Resource{
|
Resource: addrs.Resource{
|
||||||
Mode: 'D',
|
Mode: 'D',
|
||||||
|
@ -134,9 +134,9 @@ func TestStateShim(t *testing.T) {
|
||||||
Name: "lots",
|
Name: "lots",
|
||||||
}.Instance(addrs.IntKey(0)),
|
}.Instance(addrs.IntKey(0)),
|
||||||
&states.ResourceInstanceObjectSrc{
|
&states.ResourceInstanceObjectSrc{
|
||||||
Status: states.ObjectReady,
|
Status: states.ObjectReady,
|
||||||
AttrsFlat: map[string]string{"id": "0", "bazzle": "dazzle"},
|
AttrsFlat: map[string]string{"id": "0", "bazzle": "dazzle"},
|
||||||
Dependencies: []addrs.Referenceable{},
|
DependsOn: []addrs.Referenceable{},
|
||||||
},
|
},
|
||||||
addrs.ProviderConfig{
|
addrs.ProviderConfig{
|
||||||
Type: "test",
|
Type: "test",
|
||||||
|
@ -149,9 +149,9 @@ func TestStateShim(t *testing.T) {
|
||||||
Name: "lots",
|
Name: "lots",
|
||||||
}.Instance(addrs.IntKey(1)),
|
}.Instance(addrs.IntKey(1)),
|
||||||
&states.ResourceInstanceObjectSrc{
|
&states.ResourceInstanceObjectSrc{
|
||||||
Status: states.ObjectTainted,
|
Status: states.ObjectTainted,
|
||||||
AttrsFlat: map[string]string{"id": "1", "bazzle": "dazzle"},
|
AttrsFlat: map[string]string{"id": "1", "bazzle": "dazzle"},
|
||||||
Dependencies: []addrs.Referenceable{},
|
DependsOn: []addrs.Referenceable{},
|
||||||
},
|
},
|
||||||
addrs.ProviderConfig{
|
addrs.ProviderConfig{
|
||||||
Type: "test",
|
Type: "test",
|
||||||
|
@ -165,9 +165,9 @@ func TestStateShim(t *testing.T) {
|
||||||
Name: "single_count",
|
Name: "single_count",
|
||||||
}.Instance(addrs.IntKey(0)),
|
}.Instance(addrs.IntKey(0)),
|
||||||
&states.ResourceInstanceObjectSrc{
|
&states.ResourceInstanceObjectSrc{
|
||||||
Status: states.ObjectReady,
|
Status: states.ObjectReady,
|
||||||
AttrsJSON: []byte(`{"id": "single", "bazzle":"dazzle"}`),
|
AttrsJSON: []byte(`{"id": "single", "bazzle":"dazzle"}`),
|
||||||
Dependencies: []addrs.Referenceable{},
|
DependsOn: []addrs.Referenceable{},
|
||||||
},
|
},
|
||||||
addrs.ProviderConfig{
|
addrs.ProviderConfig{
|
||||||
Type: "test",
|
Type: "test",
|
||||||
|
|
Loading…
Reference in New Issue