rewrite all of the test state string for providers

Now that the resolved provider is always stored in state, we need to
udpate all the test data to match. There will probably be some more
breakage once the provider field is properly diffed.
This commit is contained in:
James Bardin 2017-11-07 13:49:10 -05:00
parent b79adeae02
commit 8dfaae1f23
4 changed files with 139 additions and 4 deletions

View File

@ -129,6 +129,7 @@ func TestContext2Apply_escape(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = "bar" foo = "bar"
type = aws_instance type = aws_instance
`) `)
@ -160,6 +161,7 @@ func TestContext2Apply_resourceCountOneList(t *testing.T) {
actual := strings.TrimSpace(state.String()) actual := strings.TrimSpace(state.String())
expected := strings.TrimSpace(`null_resource.foo: expected := strings.TrimSpace(`null_resource.foo:
ID = foo ID = foo
provider = provider.null
Outputs: Outputs:
@ -578,6 +580,7 @@ amis_from_module = {eu-west-1:ami-789012 eu-west-2:ami-989484 us-west-1:ami-1234
module.test: module.test:
null_resource.noop: null_resource.noop:
ID = foo ID = foo
provider = provider.null
Outputs: Outputs:
@ -745,6 +748,7 @@ func TestContext2Apply_providerWarning(t *testing.T) {
expected := strings.TrimSpace(` expected := strings.TrimSpace(`
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
`) `)
if actual != expected { if actual != expected {
t.Fatalf("got: \n%s\n\nexpected:\n%s", actual, expected) t.Fatalf("got: \n%s\n\nexpected:\n%s", actual, expected)
@ -1032,11 +1036,13 @@ func TestContext2Apply_createBeforeDestroy_dependsNonCBD(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
require_new = yes require_new = yes
type = aws_instance type = aws_instance
value = foo value = foo
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
require_new = yes require_new = yes
type = aws_instance type = aws_instance
`) `)
@ -1170,10 +1176,12 @@ func TestContext2Apply_createBeforeDestroy_deposedCount(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.bar.0: aws_instance.bar.0:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.bar.1: aws_instance.bar.1:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
`) `)
@ -1233,6 +1241,7 @@ func TestContext2Apply_createBeforeDestroy_deposedOnly(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.bar: aws_instance.bar:
ID = bar ID = bar
provider = provider.aws
`) `)
} }
@ -2007,6 +2016,7 @@ func TestContext2Apply_cancelBlock(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
`) `)
} }
@ -2066,6 +2076,7 @@ func TestContext2Apply_cancelProvisioner(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.foo: (tainted) aws_instance.foo: (tainted)
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
`) `)
@ -2448,10 +2459,12 @@ func TestContext2Apply_mapVariableOverride(t *testing.T) {
expected := strings.TrimSpace(` expected := strings.TrimSpace(`
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
ami = overridden ami = overridden
type = aws_instance type = aws_instance
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
ami = image-1234 ami = image-1234
type = aws_instance type = aws_instance
`) `)
@ -2619,7 +2632,7 @@ func TestContext2Apply_moduleInheritAlias(t *testing.T) {
module.child: module.child:
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = aws.eu provider = provider.aws.eu
`) `)
} }
@ -3140,6 +3153,7 @@ func TestContext2Apply_moduleTarget(t *testing.T) {
module.A: module.A:
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
@ -3149,6 +3163,7 @@ module.A:
module.B: module.B:
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = foo foo = foo
type = aws_instance type = aws_instance
`) `)
@ -3929,6 +3944,7 @@ func TestContext2Apply_outputDependsOn(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
Outputs: Outputs:
@ -4560,6 +4576,7 @@ func TestContext2Apply_multiDepose_createBeforeDestroy(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.web: (1 deposed) aws_instance.web: (1 deposed)
ID = bar ID = bar
provider = provider.aws
Deposed ID 1 = foo Deposed ID 1 = foo
`) `)
@ -4584,6 +4601,7 @@ aws_instance.web: (1 deposed)
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.web: (2 deposed) aws_instance.web: (2 deposed)
ID = baz ID = baz
provider = provider.aws
Deposed ID 1 = foo Deposed ID 1 = foo
Deposed ID 2 = bar Deposed ID 2 = bar
`) `)
@ -4611,6 +4629,7 @@ aws_instance.web: (2 deposed)
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.web: (1 deposed) aws_instance.web: (1 deposed)
ID = qux ID = qux
provider = provider.aws
Deposed ID 1 = bar Deposed ID 1 = bar
`) `)
@ -4632,6 +4651,7 @@ aws_instance.web: (1 deposed)
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.web: aws_instance.web:
ID = quux ID = quux
provider = provider.aws
`) `)
} }
@ -4672,6 +4692,7 @@ func TestContext2Apply_provisionerFailContinue(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
`) `)
@ -5067,6 +5088,7 @@ func TestContext2Apply_provisionerDestroyTainted(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
`) `)
@ -7370,6 +7392,7 @@ func TestContext2Apply_targeted(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
`) `)
@ -7402,10 +7425,13 @@ func TestContext2Apply_targetedCount(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.foo.0: aws_instance.foo.0:
ID = foo ID = foo
provider = provider.aws
aws_instance.foo.1: aws_instance.foo.1:
ID = foo ID = foo
provider = provider.aws
aws_instance.foo.2: aws_instance.foo.2:
ID = foo ID = foo
provider = provider.aws
`) `)
} }
@ -7436,6 +7462,7 @@ func TestContext2Apply_targetedCountIndex(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.foo.1: aws_instance.foo.1:
ID = foo ID = foo
provider = provider.aws
`) `)
} }
@ -7673,10 +7700,12 @@ func TestContext2Apply_targetedModule(t *testing.T) {
module.child: module.child:
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
`) `)
@ -7712,6 +7741,7 @@ func TestContext2Apply_targetedModuleDep(t *testing.T) {
checkStateString(t, state, ` checkStateString(t, state, `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
foo = foo foo = foo
type = aws_instance type = aws_instance
@ -7721,6 +7751,7 @@ aws_instance.foo:
module.child: module.child:
aws_instance.mod: aws_instance.mod:
ID = foo ID = foo
provider = provider.aws
Outputs: Outputs:
@ -7795,6 +7826,7 @@ module.child1:
module.child2: module.child2:
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
Outputs: Outputs:
@ -7836,6 +7868,7 @@ func TestContext2Apply_targetedModuleResource(t *testing.T) {
module.child: module.child:
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
`) `)
@ -8289,6 +8322,7 @@ func TestContext2Apply_issue5254(t *testing.T) {
expected := strings.TrimSpace(` expected := strings.TrimSpace(`
template_file.child: template_file.child:
ID = foo ID = foo
provider = provider.template
template = Hi template = Hi
type = template_file type = template_file
@ -8296,6 +8330,7 @@ template_file.child:
template_file.parent.* template_file.parent.*
template_file.parent: template_file.parent:
ID = foo ID = foo
provider = provider.template
template = Hi template = Hi
type = template_file type = template_file
`) `)
@ -8371,6 +8406,7 @@ func TestContext2Apply_targetedWithTaintedInState(t *testing.T) {
expected := strings.TrimSpace(` expected := strings.TrimSpace(`
aws_instance.iambeingadded: aws_instance.iambeingadded:
ID = foo ID = foo
provider = provider.aws
aws_instance.ifailedprovisioners: (tainted) aws_instance.ifailedprovisioners: (tainted)
ID = ifailedprovisioners ID = ifailedprovisioners
`) `)
@ -8416,6 +8452,7 @@ func TestContext2Apply_ignoreChangesCreate(t *testing.T) {
expected := strings.TrimSpace(` expected := strings.TrimSpace(`
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
required_field = set required_field = set
type = aws_instance type = aws_instance
`) `)
@ -8560,6 +8597,7 @@ func TestContext2Apply_ignoreChangesWildcard(t *testing.T) {
expected := strings.TrimSpace(` expected := strings.TrimSpace(`
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
required_field = set required_field = set
type = aws_instance type = aws_instance
`) `)
@ -8820,6 +8858,7 @@ func TestContext2Apply_targetedModuleRecursive(t *testing.T) {
module.child.subchild: module.child.subchild:
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
`) `)

View File

@ -564,6 +564,7 @@ func TestContext2Input_varWithDefault(t *testing.T) {
expectedStr := strings.TrimSpace(` expectedStr := strings.TrimSpace(`
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
foo = 123 foo = 123
type = aws_instance type = aws_instance
`) `)

View File

@ -361,6 +361,7 @@ func testProvisioner() *MockResourceProvisioner {
} }
func checkStateString(t *testing.T, state *State, expected string) { func checkStateString(t *testing.T, state *State, expected string) {
t.Helper()
actual := strings.TrimSpace(state.String()) actual := strings.TrimSpace(state.String())
expected = strings.TrimSpace(expected) expected = strings.TrimSpace(expected)
@ -381,6 +382,7 @@ func resourceState(resourceType, resourceID string) *ResourceState {
// Test helper that gives a function 3 seconds to finish, assumes deadlock and // Test helper that gives a function 3 seconds to finish, assumes deadlock and
// fails test if it does not. // fails test if it does not.
func testCheckDeadlock(t *testing.T, f func()) { func testCheckDeadlock(t *testing.T, f func()) {
t.Helper()
timeout := make(chan bool, 1) timeout := make(chan bool, 1)
done := make(chan bool, 1) done := make(chan bool, 1)
go func() { go func() {

View File

@ -220,11 +220,13 @@ func (h *HookRecordApplyOrder) PreApply(
const testTerraformInputProviderStr = ` const testTerraformInputProviderStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
bar = override bar = override
foo = us-east-1 foo = us-east-1
type = aws_instance type = aws_instance
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
bar = baz bar = baz
num = 2 num = 2
type = aws_instance type = aws_instance
@ -233,6 +235,7 @@ aws_instance.foo:
const testTerraformInputProviderOnlyStr = ` const testTerraformInputProviderOnlyStr = `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
foo = us-west-2 foo = us-west-2
type = aws_instance type = aws_instance
` `
@ -240,6 +243,7 @@ aws_instance.foo:
const testTerraformInputVarOnlyStr = ` const testTerraformInputVarOnlyStr = `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
foo = us-east-1 foo = us-east-1
type = aws_instance type = aws_instance
` `
@ -247,6 +251,7 @@ aws_instance.foo:
const testTerraformInputVarOnlyUnsetStr = ` const testTerraformInputVarOnlyUnsetStr = `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
bar = baz bar = baz
foo = foovalue foo = foovalue
type = aws_instance type = aws_instance
@ -255,11 +260,13 @@ aws_instance.foo:
const testTerraformInputVarsStr = ` const testTerraformInputVarsStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
bar = override bar = override
foo = us-east-1 foo = us-east-1
type = aws_instance type = aws_instance
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
bar = baz bar = baz
num = 2 num = 2
type = aws_instance type = aws_instance
@ -268,10 +275,12 @@ aws_instance.foo:
const testTerraformApplyStr = ` const testTerraformApplyStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
` `
@ -279,11 +288,13 @@ aws_instance.foo:
const testTerraformApplyDataBasicStr = ` const testTerraformApplyDataBasicStr = `
data.null_data_source.testing: data.null_data_source.testing:
ID = yo ID = yo
provider = provider.null
` `
const testTerraformApplyRefCountStr = ` const testTerraformApplyRefCountStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = 3 foo = 3
type = aws_instance type = aws_instance
@ -291,20 +302,24 @@ aws_instance.bar:
aws_instance.foo aws_instance.foo
aws_instance.foo.0: aws_instance.foo.0:
ID = foo ID = foo
provider = provider.aws
aws_instance.foo.1: aws_instance.foo.1:
ID = foo ID = foo
provider = provider.aws
aws_instance.foo.2: aws_instance.foo.2:
ID = foo ID = foo
provider = provider.aws
` `
const testTerraformApplyProviderAliasStr = ` const testTerraformApplyProviderAliasStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = aws.bar provider = provider.aws.bar
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
` `
@ -312,9 +327,10 @@ aws_instance.foo:
const testTerraformApplyProviderAliasConfigStr = ` const testTerraformApplyProviderAliasConfigStr = `
another_instance.bar: another_instance.bar:
ID = foo ID = foo
provider = another.two provider = provider.another.two
another_instance.foo: another_instance.foo:
ID = foo ID = foo
provider = provider.another
` `
const testTerraformApplyEmptyModuleStr = ` const testTerraformApplyEmptyModuleStr = `
@ -335,6 +351,7 @@ aws_secret_key = ZZZZ
const testTerraformApplyDependsCreateBeforeStr = ` const testTerraformApplyDependsCreateBeforeStr = `
aws_instance.lb: aws_instance.lb:
ID = foo ID = foo
provider = provider.aws
instance = foo instance = foo
type = aws_instance type = aws_instance
@ -342,6 +359,7 @@ aws_instance.lb:
aws_instance.web aws_instance.web
aws_instance.web: aws_instance.web:
ID = foo ID = foo
provider = provider.aws
require_new = ami-new require_new = ami-new
type = aws_instance type = aws_instance
` `
@ -349,6 +367,7 @@ aws_instance.web:
const testTerraformApplyCreateBeforeStr = ` const testTerraformApplyCreateBeforeStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
require_new = xyz require_new = xyz
type = aws_instance type = aws_instance
` `
@ -356,6 +375,7 @@ aws_instance.bar:
const testTerraformApplyCreateBeforeUpdateStr = ` const testTerraformApplyCreateBeforeUpdateStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = baz foo = baz
type = aws_instance type = aws_instance
` `
@ -363,12 +383,14 @@ aws_instance.bar:
const testTerraformApplyCancelStr = ` const testTerraformApplyCancelStr = `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
` `
const testTerraformApplyComputeStr = ` const testTerraformApplyComputeStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = computed_dynamical foo = computed_dynamical
type = aws_instance type = aws_instance
@ -376,6 +398,7 @@ aws_instance.bar:
aws_instance.foo aws_instance.foo
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
dynamical = computed_dynamical dynamical = computed_dynamical
num = 2 num = 2
type = aws_instance type = aws_instance
@ -429,10 +452,12 @@ const testTerraformApplyCountTaintedStr = `
const testTerraformApplyCountVariableStr = ` const testTerraformApplyCountVariableStr = `
aws_instance.foo.0: aws_instance.foo.0:
ID = foo ID = foo
provider = provider.aws
foo = foo foo = foo
type = aws_instance type = aws_instance
aws_instance.foo.1: aws_instance.foo.1:
ID = foo ID = foo
provider = provider.aws
foo = foo foo = foo
type = aws_instance type = aws_instance
` `
@ -440,6 +465,7 @@ aws_instance.foo.1:
const testTerraformApplyCountVariableRefStr = ` const testTerraformApplyCountVariableRefStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = 2 foo = 2
type = aws_instance type = aws_instance
@ -447,30 +473,37 @@ aws_instance.bar:
aws_instance.foo aws_instance.foo
aws_instance.foo.0: aws_instance.foo.0:
ID = foo ID = foo
provider = provider.aws
aws_instance.foo.1: aws_instance.foo.1:
ID = foo ID = foo
provider = provider.aws
` `
const testTerraformApplyMinimalStr = ` const testTerraformApplyMinimalStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
` `
const testTerraformApplyModuleStr = ` const testTerraformApplyModuleStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
module.child: module.child:
aws_instance.baz: aws_instance.baz:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
` `
@ -478,6 +511,7 @@ module.child:
const testTerraformApplyModuleBoolStr = ` const testTerraformApplyModuleBoolStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = 1 foo = 1
type = aws_instance type = aws_instance
@ -500,10 +534,12 @@ module.child:
const testTerraformApplyMultiProviderStr = ` const testTerraformApplyMultiProviderStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
do_instance.foo: do_instance.foo:
ID = foo ID = foo
provider = provider.do
num = 2 num = 2
type = do_instance type = do_instance
` `
@ -513,8 +549,10 @@ const testTerraformApplyModuleOnlyProviderStr = `
module.child: module.child:
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
test_instance.foo: test_instance.foo:
ID = foo ID = foo
provider = provider.test
` `
const testTerraformApplyModuleProviderAliasStr = ` const testTerraformApplyModuleProviderAliasStr = `
@ -522,7 +560,7 @@ const testTerraformApplyModuleProviderAliasStr = `
module.child: module.child:
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = aws.eu provider = module.child.provider.aws.eu
` `
const testTerraformApplyModuleVarRefExistingStr = ` const testTerraformApplyModuleVarRefExistingStr = `
@ -533,6 +571,7 @@ aws_instance.foo:
module.child: module.child:
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
type = aws_instance type = aws_instance
value = bar value = bar
` `
@ -555,11 +594,13 @@ module.child:
const testTerraformApplyProvisionerStr = ` const testTerraformApplyProvisionerStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
Dependencies: Dependencies:
aws_instance.foo aws_instance.foo
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
dynamical = computed_dynamical dynamical = computed_dynamical
num = 2 num = 2
type = aws_instance type = aws_instance
@ -570,13 +611,16 @@ const testTerraformApplyProvisionerModuleStr = `
module.child: module.child:
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
` `
const testTerraformApplyProvisionerFailStr = ` const testTerraformApplyProvisionerFailStr = `
aws_instance.bar: (tainted) aws_instance.bar: (tainted)
ID = foo ID = foo
provider = provider.aws
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
` `
@ -584,6 +628,7 @@ aws_instance.foo:
const testTerraformApplyProvisionerFailCreateStr = ` const testTerraformApplyProvisionerFailCreateStr = `
aws_instance.bar: (tainted) aws_instance.bar: (tainted)
ID = foo ID = foo
provider = provider.aws
` `
const testTerraformApplyProvisionerFailCreateNoIdStr = ` const testTerraformApplyProvisionerFailCreateNoIdStr = `
@ -593,6 +638,7 @@ const testTerraformApplyProvisionerFailCreateNoIdStr = `
const testTerraformApplyProvisionerFailCreateBeforeDestroyStr = ` const testTerraformApplyProvisionerFailCreateBeforeDestroyStr = `
aws_instance.bar: (1 deposed) aws_instance.bar: (1 deposed)
ID = bar ID = bar
provider = provider.aws
require_new = abc require_new = abc
Deposed ID 1 = foo (tainted) Deposed ID 1 = foo (tainted)
` `
@ -600,6 +646,7 @@ aws_instance.bar: (1 deposed)
const testTerraformApplyProvisionerResourceRefStr = ` const testTerraformApplyProvisionerResourceRefStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
` `
@ -607,6 +654,7 @@ aws_instance.bar:
const testTerraformApplyProvisionerSelfRefStr = ` const testTerraformApplyProvisionerSelfRefStr = `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
` `
@ -614,14 +662,17 @@ aws_instance.foo:
const testTerraformApplyProvisionerMultiSelfRefStr = ` const testTerraformApplyProvisionerMultiSelfRefStr = `
aws_instance.foo.0: aws_instance.foo.0:
ID = foo ID = foo
provider = provider.aws
foo = number 0 foo = number 0
type = aws_instance type = aws_instance
aws_instance.foo.1: aws_instance.foo.1:
ID = foo ID = foo
provider = provider.aws
foo = number 1 foo = number 1
type = aws_instance type = aws_instance
aws_instance.foo.2: aws_instance.foo.2:
ID = foo ID = foo
provider = provider.aws
foo = number 2 foo = number 2
type = aws_instance type = aws_instance
` `
@ -629,10 +680,12 @@ aws_instance.foo.2:
const testTerraformApplyProvisionerMultiSelfRefSingleStr = ` const testTerraformApplyProvisionerMultiSelfRefSingleStr = `
aws_instance.foo.0: aws_instance.foo.0:
ID = foo ID = foo
provider = provider.aws
foo = number 0 foo = number 0
type = aws_instance type = aws_instance
aws_instance.foo.1: aws_instance.foo.1:
ID = foo ID = foo
provider = provider.aws
foo = number 1 foo = number 1
type = aws_instance type = aws_instance
@ -640,6 +693,7 @@ aws_instance.foo.1:
aws_instance.foo.0 aws_instance.foo.0
aws_instance.foo.2: aws_instance.foo.2:
ID = foo ID = foo
provider = provider.aws
foo = number 2 foo = number 2
type = aws_instance type = aws_instance
@ -650,6 +704,7 @@ aws_instance.foo.2:
const testTerraformApplyProvisionerDiffStr = ` const testTerraformApplyProvisionerDiffStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
` `
@ -666,40 +721,47 @@ module.child.subchild:
const testTerraformApplyErrorStr = ` const testTerraformApplyErrorStr = `
aws_instance.bar: aws_instance.bar:
ID = bar ID = bar
provider = provider.aws
Dependencies: Dependencies:
aws_instance.foo aws_instance.foo
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
` `
const testTerraformApplyErrorCreateBeforeDestroyStr = ` const testTerraformApplyErrorCreateBeforeDestroyStr = `
aws_instance.bar: aws_instance.bar:
ID = bar ID = bar
provider = provider.aws
require_new = abc require_new = abc
` `
const testTerraformApplyErrorDestroyCreateBeforeDestroyStr = ` const testTerraformApplyErrorDestroyCreateBeforeDestroyStr = `
aws_instance.bar: (1 deposed) aws_instance.bar: (1 deposed)
ID = foo ID = foo
provider = provider.aws
Deposed ID 1 = bar Deposed ID 1 = bar
` `
const testTerraformApplyErrorPartialStr = ` const testTerraformApplyErrorPartialStr = `
aws_instance.bar: aws_instance.bar:
ID = bar ID = bar
provider = provider.aws
Dependencies: Dependencies:
aws_instance.foo aws_instance.foo
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
` `
const testTerraformApplyResourceDependsOnModuleStr = ` const testTerraformApplyResourceDependsOnModuleStr = `
aws_instance.a: aws_instance.a:
ID = foo ID = foo
provider = provider.aws
Dependencies: Dependencies:
module.child module.child
@ -707,11 +769,13 @@ aws_instance.a:
module.child: module.child:
aws_instance.child: aws_instance.child:
ID = foo ID = foo
provider = provider.aws
` `
const testTerraformApplyResourceDependsOnModuleDeepStr = ` const testTerraformApplyResourceDependsOnModuleDeepStr = `
aws_instance.a: aws_instance.a:
ID = foo ID = foo
provider = provider.aws
Dependencies: Dependencies:
module.child module.child
@ -719,6 +783,7 @@ aws_instance.a:
module.child.grandchild: module.child.grandchild:
aws_instance.c: aws_instance.c:
ID = foo ID = foo
provider = provider.aws
` `
const testTerraformApplyResourceDependsOnModuleInModuleStr = ` const testTerraformApplyResourceDependsOnModuleInModuleStr = `
@ -726,17 +791,20 @@ const testTerraformApplyResourceDependsOnModuleInModuleStr = `
module.child: module.child:
aws_instance.b: aws_instance.b:
ID = foo ID = foo
provider = provider.aws
Dependencies: Dependencies:
module.grandchild module.grandchild
module.child.grandchild: module.child.grandchild:
aws_instance.c: aws_instance.c:
ID = foo ID = foo
provider = provider.aws
` `
const testTerraformApplyTaintStr = ` const testTerraformApplyTaintStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
` `
@ -744,6 +812,7 @@ aws_instance.bar:
const testTerraformApplyTaintDepStr = ` const testTerraformApplyTaintDepStr = `
aws_instance.bar: aws_instance.bar:
ID = bar ID = bar
provider = provider.aws
foo = foo foo = foo
num = 2 num = 2
type = aws_instance type = aws_instance
@ -752,6 +821,7 @@ aws_instance.bar:
aws_instance.foo aws_instance.foo
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
` `
@ -759,6 +829,7 @@ aws_instance.foo:
const testTerraformApplyTaintDepRequireNewStr = ` const testTerraformApplyTaintDepRequireNewStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = foo foo = foo
require_new = yes require_new = yes
type = aws_instance type = aws_instance
@ -767,6 +838,7 @@ aws_instance.bar:
aws_instance.foo aws_instance.foo
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
` `
@ -774,10 +846,12 @@ aws_instance.foo:
const testTerraformApplyOutputStr = ` const testTerraformApplyOutputStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
@ -789,10 +863,12 @@ foo_num = 2
const testTerraformApplyOutputAddStr = ` const testTerraformApplyOutputAddStr = `
aws_instance.test.0: aws_instance.test.0:
ID = foo ID = foo
provider = provider.aws
foo = foo0 foo = foo0
type = aws_instance type = aws_instance
aws_instance.test.1: aws_instance.test.1:
ID = foo ID = foo
provider = provider.aws
foo = foo1 foo = foo1
type = aws_instance type = aws_instance
@ -805,18 +881,22 @@ secondOutput = foo1
const testTerraformApplyOutputListStr = ` const testTerraformApplyOutputListStr = `
aws_instance.bar.0: aws_instance.bar.0:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.bar.1: aws_instance.bar.1:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.bar.2: aws_instance.bar.2:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
@ -828,18 +908,22 @@ foo_num = [bar,bar,bar]
const testTerraformApplyOutputMultiStr = ` const testTerraformApplyOutputMultiStr = `
aws_instance.bar.0: aws_instance.bar.0:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.bar.1: aws_instance.bar.1:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.bar.2: aws_instance.bar.2:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
@ -851,18 +935,22 @@ foo_num = bar,bar,bar
const testTerraformApplyOutputMultiIndexStr = ` const testTerraformApplyOutputMultiIndexStr = `
aws_instance.bar.0: aws_instance.bar.0:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.bar.1: aws_instance.bar.1:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.bar.2: aws_instance.bar.2:
ID = foo ID = foo
provider = provider.aws
foo = bar foo = bar
type = aws_instance type = aws_instance
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
@ -874,6 +962,7 @@ foo_num = bar
const testTerraformApplyUnknownAttrStr = ` const testTerraformApplyUnknownAttrStr = `
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
num = 2 num = 2
type = aws_instance type = aws_instance
` `
@ -881,12 +970,14 @@ aws_instance.foo:
const testTerraformApplyVarsStr = ` const testTerraformApplyVarsStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
bar = foo bar = foo
baz = override baz = override
foo = us-west-2 foo = us-west-2
type = aws_instance type = aws_instance
aws_instance.foo: aws_instance.foo:
ID = foo ID = foo
provider = provider.aws
bar = baz bar = baz
list = Hello,World list = Hello,World
map = Baz,Foo,Hello map = Baz,Foo,Hello
@ -897,6 +988,7 @@ aws_instance.foo:
const testTerraformApplyVarsEnvStr = ` const testTerraformApplyVarsEnvStr = `
aws_instance.bar: aws_instance.bar:
ID = foo ID = foo
provider = provider.aws
bar = Hello,World bar = Hello,World
baz = Baz,Foo,Hello baz = Baz,Foo,Hello
foo = baz foo = baz
@ -1650,6 +1742,7 @@ STATE:
const testTerraformInputHCL = ` const testTerraformInputHCL = `
hcl_instance.hcltest: hcl_instance.hcltest:
ID = foo ID = foo
provider = provider.hcl
bar.w = z bar.w = z
bar.x = y bar.x = y
foo.# = 2 foo.# = 2