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

write provider to state for import nodes 

and update the test state strings
This commit is contained in:
James Bardin 2017-11-07 20:58:04 -05:00
parent 3977fe8b2d
commit d613959cda
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
terraform/context_import_test.go
View File

@ -801,13 +801,13 @@ func TestContextImport_customProvider(t *testing.T) {
const testImportStr = ` const testImportStr = `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = aws provider = provider.aws
` `
const testImportCountIndexStr = ` const testImportCountIndexStr = `
aws_instance.foo.0: aws_instance.foo.0:
ID = foo ID = foo
provider = aws provider = provider.aws
` `
const testImportCollisionStr = ` const testImportCollisionStr = `
@ -820,7 +820,7 @@ const testImportModuleStr = `
module.foo: module.foo:
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = aws provider = provider.aws
` `
const testImportModuleDepth2Str = ` const testImportModuleDepth2Str = `
@ -828,7 +828,7 @@ const testImportModuleDepth2Str = `
module.a.b: module.a.b:
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = aws provider = provider.aws
` `
const testImportModuleDiffStr = ` const testImportModuleDiffStr = `
@ -838,7 +838,7 @@ module.bar:
module.foo: module.foo:
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = aws provider = provider.aws
` `
const testImportModuleExistingStr = ` const testImportModuleExistingStr = `
@ -847,39 +847,39 @@ module.foo:
ID = bar ID = bar
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = aws provider = provider.aws
` `
const testImportMultiStr = ` const testImportMultiStr = `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = aws provider = provider.aws
aws_instance_thing.foo: aws_instance_thing.foo:
ID = bar ID = bar
provider = aws provider = provider.aws
` `
const testImportMultiSameStr = ` const testImportMultiSameStr = `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = aws provider = provider.aws
aws_instance_thing.foo: aws_instance_thing.foo:
ID = bar ID = bar
provider = aws provider = provider.aws
aws_instance_thing.foo-1: aws_instance_thing.foo-1:
ID = qux ID = qux
provider = aws provider = provider.aws
` `
const testImportRefreshStr = ` const testImportRefreshStr = `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = aws provider = provider.aws
foo = bar foo = bar
` `
const testImportCustomProviderStr = ` const testImportCustomProviderStr = `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = aws.alias provider = provider.aws.alias
` `

2
terraform/transform_import_state.go
View File

@ -240,7 +240,7 @@ func (n *graphNodeImportStateSub) EvalTree() EvalNode {
&EvalWriteState{ &EvalWriteState{
Name: key.String(), Name: key.String(),
ResourceType: info.Type, ResourceType: info.Type,
Provider: resourceProvider(info.Type, n.ProviderName), Provider: n.ResolvedProvider,
State: &state, State: &state,
}, },
}, },