From 479655ad47253be633bf3e6b0888d158806c9348 Mon Sep 17 00:00:00 2001 From: Kristin Laemmert Date: Wed, 30 Sep 2020 16:07:54 -0400 Subject: [PATCH] refactor tests to use modern states.State in favor of terraform.State where possible --- backend/remote/backend_state_test.go | 12 +- .../terraform/data_source_state_test.go | 4 +- .../terraform/testdata/basic.tfstate | 15 +- .../testdata/complex_outputs.tfstate | 146 ++++++++---------- .../terraform/testdata/empty.tfstate | 15 +- .../terraform/testdata/null_outputs.tfstate | 40 +++-- command/state_mv_test.go | 54 +++---- .../local-state.tfstate | 20 +-- .../local-state.tfstate | 20 +-- .../env2/terraform.tfstate | 20 +-- .../local-state.tfstate | 20 +-- .../env2/terraform.tfstate | 20 +-- .../env2/terraform.tfstate | 20 +-- .../env1/terraform.tfstate | 20 +-- .../env2/terraform.tfstate | 20 +-- .../local-state.tfstate | 20 +-- .../backend-change/local-state.tfstate | 20 +-- .../local-state-old.tfstate | 4 +- .../local-state.tfstate | 4 +- .../local-state-old.tfstate | 4 +- .../local-state.tfstate | 16 +- .../terraform.tfstate | 21 +-- .../backend-new-migrate/terraform.tfstate | 23 +-- .../local-state.tfstate | 2 +- .../local-state.tfstate | 2 +- .../local-state.tfstate | 2 +- .../local-state.tfstate | 2 +- .../backend-plan-legacy-data/state.tfstate | 14 +- .../terraform.tfstate | 4 +- .../terraform.tfstate | 4 +- .../terraform.tfstate | 4 +- .../local-state-old.tfstate | 4 +- .../local-state.tfstate | 4 +- .../backend-unchanged/local-state.tfstate | 4 +- .../local-state-old.tfstate | 4 +- .../local-state.tfstate | 4 +- .../backend-unset/local-state.tfstate | 20 +-- .../local-state.tfstate | 18 +-- .../state-push-bad-lineage/replace.tfstate | 18 +-- 39 files changed, 261 insertions(+), 407 deletions(-) diff --git a/backend/remote/backend_state_test.go b/backend/remote/backend_state_test.go index e7b1a4318..b1ca1789a 100644 --- a/backend/remote/backend_state_test.go +++ b/backend/remote/backend_state_test.go @@ -6,8 +6,9 @@ import ( "testing" "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/states/statefile" ) func TestRemoteClient_impl(t *testing.T) { @@ -46,14 +47,13 @@ func TestRemoteClient_withRunID(t *testing.T) { client := testRemoteClient(t) // Create a new empty state. - state := bytes.NewBuffer(nil) - if err := terraform.WriteState(terraform.NewState(), state); err != nil { - t.Fatalf("expected no error, got: %v", err) - } + sf := statefile.New(states.NewState(), "", 0) + var buf bytes.Buffer + statefile.Write(sf, &buf) // Store the new state to verify (this will be done // by the mock that is used) that the run ID is set. - if err := client.Put(state.Bytes()); err != nil { + if err := client.Put(buf.Bytes()); err != nil { t.Fatalf("expected no error, got %v", err) } } diff --git a/builtin/providers/terraform/data_source_state_test.go b/builtin/providers/terraform/data_source_state_test.go index 6dbc15328..3aa1b16ea 100644 --- a/builtin/providers/terraform/data_source_state_test.go +++ b/builtin/providers/terraform/data_source_state_test.go @@ -133,8 +133,8 @@ func TestState_basic(t *testing.T) { "path": cty.StringVal("./testdata/null_outputs.tfstate"), }), "outputs": cty.ObjectVal(map[string]cty.Value{ - "map": cty.NullVal(cty.DynamicPseudoType), - "list": cty.NullVal(cty.DynamicPseudoType), + "map": cty.NullVal(cty.Map(cty.String)), + "list": cty.NullVal(cty.List(cty.String)), }), "defaults": cty.NullVal(cty.DynamicPseudoType), "workspace": cty.NullVal(cty.String), diff --git a/builtin/providers/terraform/testdata/basic.tfstate b/builtin/providers/terraform/testdata/basic.tfstate index a10b2b6b1..d41a2d1f6 100644 --- a/builtin/providers/terraform/testdata/basic.tfstate +++ b/builtin/providers/terraform/testdata/basic.tfstate @@ -1,7 +1,12 @@ { - "version": 1, - "modules": [{ - "path": ["root"], - "outputs": { "foo": "bar" } - }] + "version": 4, + "terraform_version": "0.13.0", + "serial": 0, + "lineage": "", + "outputs": { + "foo": { + "value": "bar", + "type": "string" + } + } } diff --git a/builtin/providers/terraform/testdata/complex_outputs.tfstate b/builtin/providers/terraform/testdata/complex_outputs.tfstate index ab50e427f..4f5725343 100644 --- a/builtin/providers/terraform/testdata/complex_outputs.tfstate +++ b/builtin/providers/terraform/testdata/complex_outputs.tfstate @@ -1,88 +1,70 @@ { - "version": 3, - "terraform_version": "0.7.0", - "serial": 3, - "modules": [ - { - "path": [ - "root" + "version": 4, + "terraform_version": "0.13.0", + "serial": 0, + "lineage": "", + "outputs": { + "computed_map": { + "sensitive": false, + "type": [ + "map", + "string" ], - "outputs": { - "computed_map": { - "sensitive": false, - "type": "map", - "value": { - "key1": "value1" - } - }, - "computed_set": { - "sensitive": false, - "type": "list", - "value": [ - "setval1", - "setval2" - ] - }, - "map": { - "sensitive": false, - "type": "map", - "value": { - "key": "test", - "test": "test" - } - }, - "set": { - "sensitive": false, - "type": "list", - "value": [ - "test1", - "test2" - ] - } - }, - "resources": { - "test_resource.main": { - "type": "test_resource", - "primary": { - "id": "testId", - "attributes": { - "computed_list.#": "2", - "computed_list.0": "listval1", - "computed_list.1": "listval2", - "computed_map.%": "1", - "computed_map.key1": "value1", - "computed_read_only": "value_from_api", - "computed_read_only_force_new": "value_from_api", - "computed_set.#": "2", - "computed_set.2337322984": "setval1", - "computed_set.307881554": "setval2", - "id": "testId", - "list_of_map.#": "2", - "list_of_map.0.%": "2", - "list_of_map.0.key1": "value1", - "list_of_map.0.key2": "value2", - "list_of_map.1.%": "2", - "list_of_map.1.key3": "value3", - "list_of_map.1.key4": "value4", - "map.%": "2", - "map.key": "test", - "map.test": "test", - "map_that_look_like_set.%": "2", - "map_that_look_like_set.12352223": "hello", - "map_that_look_like_set.36234341": "world", - "optional_computed_map.%": "0", - "required": "Hello World", - "required_map.%": "3", - "required_map.key1": "value1", - "required_map.key2": "value2", - "required_map.key3": "value3", - "set.#": "2", - "set.2326977762": "test1", - "set.331058520": "test2" - } - } - } + "value": { + "key1": "value1" } + }, + "computed_set": { + "sensitive": false, + "type": [ + "list", + "string" + ], + "value": [ + "setval1", + "setval2" + ] + }, + "map": { + "sensitive": false, + "type": [ + "map", + "string" + ], + "value": { + "key": "test", + "test": "test" + } + }, + "set": { + "sensitive": false, + "type": [ + "list", + "string" + ], + "value": [ + "test1", + "test2" + ] + } + }, + "resources": [ + { + "mode": "managed", + "type": "test_resource", + "name": "main", + "each": "list", + "provider": "provider[\"registry.terraform.io/hashicorp/test\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 0, + "attributes": { + "id": "testId" + }, + "private": "bnVsbA==" + } + ] } ] } diff --git a/builtin/providers/terraform/testdata/empty.tfstate b/builtin/providers/terraform/testdata/empty.tfstate index 686ccbc8e..14610e818 100644 --- a/builtin/providers/terraform/testdata/empty.tfstate +++ b/builtin/providers/terraform/testdata/empty.tfstate @@ -1,13 +1,6 @@ { - "version": 3, - "terraform_version": "0.7.0", - "serial": 3, - "modules": [ - { - "path": [ - "root" - ], - "outputs": {} - } - ] + "version": 4, + "terraform_version": "0.13.0", + "serial": 0, + "lineage": "" } diff --git a/builtin/providers/terraform/testdata/null_outputs.tfstate b/builtin/providers/terraform/testdata/null_outputs.tfstate index fa27a1563..8b0cfdf2f 100644 --- a/builtin/providers/terraform/testdata/null_outputs.tfstate +++ b/builtin/providers/terraform/testdata/null_outputs.tfstate @@ -1,24 +1,22 @@ { - "version": 3, - "terraform_version": "0.7.0", - "serial": 3, - "modules": [ - { - "path": [ - "root" - ], - "outputs": { - "map": { - "sensitive": false, - "type": "map", - "value": null - }, - "list": { - "sensitive": false, - "type": "list", - "value": null - } - } + "version": 4, + "terraform_version": "0.13.0", + "serial": 0, + "lineage": "", + "outputs": { + "map": { + "value": null, + "type": [ + "map", + "string" + ] + }, + "list": { + "value": null, + "type": [ + "list", + "string" + ] } - ] + } } diff --git a/command/state_mv_test.go b/command/state_mv_test.go index 38cfe34a8..4bebf1bf3 100644 --- a/command/state_mv_test.go +++ b/command/state_mv_test.go @@ -12,7 +12,6 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/helper/copy" "github.com/hashicorp/terraform/states" - "github.com/hashicorp/terraform/terraform" ) func TestStateMv(t *testing.T) { @@ -1123,36 +1122,29 @@ func TestStateMv_fromBackendToLocal(t *testing.T) { defer os.RemoveAll(td) defer testChdir(t, td)() - state := &terraform.State{ - Modules: []*terraform.ModuleState{ - &terraform.ModuleState{ - Path: []string{"root"}, - Resources: map[string]*terraform.ResourceState{ - "test_instance.foo": &terraform.ResourceState{ - Type: "test_instance", - Primary: &terraform.InstanceState{ - ID: "bar", - Attributes: map[string]string{ - "foo": "value", - "bar": "value", - }, - }, - }, - - "test_instance.baz": &terraform.ResourceState{ - Type: "test_instance", - Primary: &terraform.InstanceState{ - ID: "foo", - Attributes: map[string]string{ - "foo": "value", - "bar": "value", - }, - }, - }, - }, - }, + state := states.NewState() + state.Module(addrs.RootModuleInstance).SetResourceInstanceCurrent( + mustResourceAddr("test_instance.foo").Resource.Instance(addrs.NoKey), + &states.ResourceInstanceObjectSrc{ + AttrsJSON: []byte(`{"id":"bar","foo":"value","bar":"value"}`), + Status: states.ObjectReady, }, - } + addrs.AbsProviderConfig{ + Provider: addrs.NewLegacyProvider("test"), + Module: addrs.RootModule, + }, + ) + state.Module(addrs.RootModuleInstance).SetResourceInstanceCurrent( + mustResourceAddr("test_instance.baz").Resource.Instance(addrs.NoKey), + &states.ResourceInstanceObjectSrc{ + AttrsJSON: []byte(`{"id":"foo","foo":"value","bar":"value"}`), + Status: states.ObjectReady, + }, + addrs.AbsProviderConfig{ + Provider: addrs.NewLegacyProvider("test"), + Module: addrs.RootModule, + }, + ) // the local backend state file is "foo" statePath := "local-state.tfstate" @@ -1166,7 +1158,7 @@ func TestStateMv_fromBackendToLocal(t *testing.T) { } defer f.Close() - if err := terraform.WriteState(state, f); err != nil { + if err := writeStateForTesting(state, f); err != nil { t.Fatal(err) } diff --git a/command/testdata/backend-change-multi-default-to-single/local-state.tfstate b/command/testdata/backend-change-multi-default-to-single/local-state.tfstate index c30143790..60c275e90 100644 --- a/command/testdata/backend-change-multi-default-to-single/local-state.tfstate +++ b/command/testdata/backend-change-multi-default-to-single/local-state.tfstate @@ -1,18 +1,12 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend-change", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/backend-change-multi-to-multi/local-state.tfstate b/command/testdata/backend-change-multi-to-multi/local-state.tfstate index c30143790..60c275e90 100644 --- a/command/testdata/backend-change-multi-to-multi/local-state.tfstate +++ b/command/testdata/backend-change-multi-to-multi/local-state.tfstate @@ -1,18 +1,12 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend-change", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate b/command/testdata/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate index 83854e0f6..2847289f9 100644 --- a/command/testdata/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate +++ b/command/testdata/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate @@ -1,18 +1,12 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend-change-env2", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/backend-change-multi-to-no-default-with-default/local-state.tfstate b/command/testdata/backend-change-multi-to-no-default-with-default/local-state.tfstate index 18ae42c9a..d42eb03aa 100644 --- a/command/testdata/backend-change-multi-to-no-default-with-default/local-state.tfstate +++ b/command/testdata/backend-change-multi-to-no-default-with-default/local-state.tfstate @@ -1,18 +1,12 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend-change-env1", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate b/command/testdata/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate index 83854e0f6..2847289f9 100644 --- a/command/testdata/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate +++ b/command/testdata/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate @@ -1,18 +1,12 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend-change-env2", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate b/command/testdata/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate index 83854e0f6..2847289f9 100644 --- a/command/testdata/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate +++ b/command/testdata/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate @@ -1,18 +1,12 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend-change-env2", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate b/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate index c30143790..60c275e90 100644 --- a/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate +++ b/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate @@ -1,18 +1,12 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend-change", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate b/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate index 83854e0f6..2847289f9 100644 --- a/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate +++ b/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate @@ -1,18 +1,12 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend-change-env2", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/backend-change-single-to-single/local-state.tfstate b/command/testdata/backend-change-single-to-single/local-state.tfstate index c30143790..60c275e90 100644 --- a/command/testdata/backend-change-single-to-single/local-state.tfstate +++ b/command/testdata/backend-change-single-to-single/local-state.tfstate @@ -1,18 +1,12 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend-change", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/backend-change/local-state.tfstate b/command/testdata/backend-change/local-state.tfstate index c30143790..60c275e90 100644 --- a/command/testdata/backend-change/local-state.tfstate +++ b/command/testdata/backend-change/local-state.tfstate @@ -1,18 +1,12 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend-change", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/backend-changed-with-legacy/local-state-old.tfstate b/command/testdata/backend-changed-with-legacy/local-state-old.tfstate index e9f980b59..e8cb7d816 100644 --- a/command/testdata/backend-changed-with-legacy/local-state-old.tfstate +++ b/command/testdata/backend-changed-with-legacy/local-state-old.tfstate @@ -1,6 +1,6 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "legacy" } diff --git a/command/testdata/backend-changed-with-legacy/local-state.tfstate b/command/testdata/backend-changed-with-legacy/local-state.tfstate index 5e9330595..a3b08caca 100644 --- a/command/testdata/backend-changed-with-legacy/local-state.tfstate +++ b/command/testdata/backend-changed-with-legacy/local-state.tfstate @@ -1,6 +1,6 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "configured" } diff --git a/command/testdata/backend-new-legacy/local-state-old.tfstate b/command/testdata/backend-new-legacy/local-state-old.tfstate index 8f312596d..5f491bcde 100644 --- a/command/testdata/backend-new-legacy/local-state-old.tfstate +++ b/command/testdata/backend-new-legacy/local-state-old.tfstate @@ -1,6 +1,6 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend-new-legacy", "remote": { diff --git a/command/testdata/backend-new-migrate-existing/local-state.tfstate b/command/testdata/backend-new-migrate-existing/local-state.tfstate index 81f6ffebb..d9c0d27e2 100644 --- a/command/testdata/backend-new-migrate-existing/local-state.tfstate +++ b/command/testdata/backend-new-migrate-existing/local-state.tfstate @@ -1,16 +1,6 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 8, - "lineage": "remote", - "modules": [ - { - "path": [ - "root" - ], - "outputs": {}, - "resources": {}, - "depends_on": [] - } - ] + "lineage": "remote" } diff --git a/command/testdata/backend-new-migrate-existing/terraform.tfstate b/command/testdata/backend-new-migrate-existing/terraform.tfstate index ce8d954f4..f90be0a39 100644 --- a/command/testdata/backend-new-migrate-existing/terraform.tfstate +++ b/command/testdata/backend-new-migrate-existing/terraform.tfstate @@ -1,21 +1,12 @@ { - "version": 3, + "version": 4, "terraform_version": "0.8.2", "serial": 8, "lineage": "local", - "modules": [ - { - "path": [ - "root" - ], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {}, - "depends_on": [] + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/backend-new-migrate/terraform.tfstate b/command/testdata/backend-new-migrate/terraform.tfstate index f1d8b968b..fe645dedb 100644 --- a/command/testdata/backend-new-migrate/terraform.tfstate +++ b/command/testdata/backend-new-migrate/terraform.tfstate @@ -1,21 +1,12 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 8, "lineage": "backend-new-migrate", - "modules": [ - { - "path": [ - "root" - ], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {}, - "depends_on": [] + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/backend-plan-backend-empty-config/local-state.tfstate b/command/testdata/backend-plan-backend-empty-config/local-state.tfstate index 48be87380..8f4112c93 100644 --- a/command/testdata/backend-plan-backend-empty-config/local-state.tfstate +++ b/command/testdata/backend-plan-backend-empty-config/local-state.tfstate @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "serial": 0, "lineage": "hello" } diff --git a/command/testdata/backend-plan-backend-match/local-state.tfstate b/command/testdata/backend-plan-backend-match/local-state.tfstate index 48be87380..8f4112c93 100644 --- a/command/testdata/backend-plan-backend-match/local-state.tfstate +++ b/command/testdata/backend-plan-backend-match/local-state.tfstate @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "serial": 0, "lineage": "hello" } diff --git a/command/testdata/backend-plan-backend-mismatch/local-state.tfstate b/command/testdata/backend-plan-backend-mismatch/local-state.tfstate index 50101996a..3ea735804 100644 --- a/command/testdata/backend-plan-backend-mismatch/local-state.tfstate +++ b/command/testdata/backend-plan-backend-mismatch/local-state.tfstate @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "serial": 0, "lineage": "different" } diff --git a/command/testdata/backend-plan-legacy-data/local-state.tfstate b/command/testdata/backend-plan-legacy-data/local-state.tfstate index 48be87380..8f4112c93 100644 --- a/command/testdata/backend-plan-legacy-data/local-state.tfstate +++ b/command/testdata/backend-plan-legacy-data/local-state.tfstate @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "serial": 0, "lineage": "hello" } diff --git a/command/testdata/backend-plan-legacy-data/state.tfstate b/command/testdata/backend-plan-legacy-data/state.tfstate index 195441f37..b5e519352 100644 --- a/command/testdata/backend-plan-legacy-data/state.tfstate +++ b/command/testdata/backend-plan-legacy-data/state.tfstate @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "serial": 0, "lineage": "666f9301-7e65-4b19-ae23-71184bb19b03", "remote": { @@ -7,15 +7,5 @@ "config": { "path": "local-state.tfstate" } - }, - "modules": [ - { - "path": [ - "root" - ], - "outputs": {}, - "resources": {}, - "depends_on": [] - } - ] + } } diff --git a/command/testdata/backend-plan-local-match/terraform.tfstate b/command/testdata/backend-plan-local-match/terraform.tfstate index 9070c5841..55a5b747f 100644 --- a/command/testdata/backend-plan-local-match/terraform.tfstate +++ b/command/testdata/backend-plan-local-match/terraform.tfstate @@ -1,6 +1,6 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "hello" } diff --git a/command/testdata/backend-plan-local-mismatch-lineage/terraform.tfstate b/command/testdata/backend-plan-local-mismatch-lineage/terraform.tfstate index 9070c5841..55a5b747f 100644 --- a/command/testdata/backend-plan-local-mismatch-lineage/terraform.tfstate +++ b/command/testdata/backend-plan-local-mismatch-lineage/terraform.tfstate @@ -1,6 +1,6 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "hello" } diff --git a/command/testdata/backend-plan-local-newer/terraform.tfstate b/command/testdata/backend-plan-local-newer/terraform.tfstate index 776fab46f..e7ff8f661 100644 --- a/command/testdata/backend-plan-local-newer/terraform.tfstate +++ b/command/testdata/backend-plan-local-newer/terraform.tfstate @@ -1,6 +1,6 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 10, "lineage": "hello" } diff --git a/command/testdata/backend-unchanged-with-legacy/local-state-old.tfstate b/command/testdata/backend-unchanged-with-legacy/local-state-old.tfstate index 7ebed86ad..59c7336a3 100644 --- a/command/testdata/backend-unchanged-with-legacy/local-state-old.tfstate +++ b/command/testdata/backend-unchanged-with-legacy/local-state-old.tfstate @@ -1,6 +1,6 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend-unchanged-with-legacy" } diff --git a/command/testdata/backend-unchanged-with-legacy/local-state.tfstate b/command/testdata/backend-unchanged-with-legacy/local-state.tfstate index 5e9330595..a3b08caca 100644 --- a/command/testdata/backend-unchanged-with-legacy/local-state.tfstate +++ b/command/testdata/backend-unchanged-with-legacy/local-state.tfstate @@ -1,6 +1,6 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "configured" } diff --git a/command/testdata/backend-unchanged/local-state.tfstate b/command/testdata/backend-unchanged/local-state.tfstate index 5ed2459a9..3e61bf44f 100644 --- a/command/testdata/backend-unchanged/local-state.tfstate +++ b/command/testdata/backend-unchanged/local-state.tfstate @@ -1,6 +1,6 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "configuredUnchanged" } diff --git a/command/testdata/backend-unset-with-legacy/local-state-old.tfstate b/command/testdata/backend-unset-with-legacy/local-state-old.tfstate index e9f980b59..e8cb7d816 100644 --- a/command/testdata/backend-unset-with-legacy/local-state-old.tfstate +++ b/command/testdata/backend-unset-with-legacy/local-state-old.tfstate @@ -1,6 +1,6 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "legacy" } diff --git a/command/testdata/backend-unset-with-legacy/local-state.tfstate b/command/testdata/backend-unset-with-legacy/local-state.tfstate index 18a4c8009..1ea457cc1 100644 --- a/command/testdata/backend-unset-with-legacy/local-state.tfstate +++ b/command/testdata/backend-unset-with-legacy/local-state.tfstate @@ -1,6 +1,6 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "backend" } diff --git a/command/testdata/backend-unset/local-state.tfstate b/command/testdata/backend-unset/local-state.tfstate index 35caa2dc6..45964a386 100644 --- a/command/testdata/backend-unset/local-state.tfstate +++ b/command/testdata/backend-unset/local-state.tfstate @@ -1,18 +1,12 @@ { - "version": 3, - "terraform_version": "0.8.2", + "version": 4, + "terraform_version": "0.14.0", "serial": 7, "lineage": "configuredUnset", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/state-push-bad-lineage/local-state.tfstate b/command/testdata/state-push-bad-lineage/local-state.tfstate index fe06c362c..d4317e76b 100644 --- a/command/testdata/state-push-bad-lineage/local-state.tfstate +++ b/command/testdata/state-push-bad-lineage/local-state.tfstate @@ -1,17 +1,11 @@ { - "version": 3, + "version": 4, "serial": 1, "lineage": "mismatch", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "bar" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "bar" } - ] + } } diff --git a/command/testdata/state-push-bad-lineage/replace.tfstate b/command/testdata/state-push-bad-lineage/replace.tfstate index dad6859ea..670f0cc05 100644 --- a/command/testdata/state-push-bad-lineage/replace.tfstate +++ b/command/testdata/state-push-bad-lineage/replace.tfstate @@ -1,17 +1,11 @@ { - "version": 3, + "version": 4, "serial": 2, "lineage": "hello", - "modules": [ - { - "path": ["root"], - "outputs": { - "foo": { - "type": "string", - "value": "baz" - } - }, - "resources": {} + "outputs": { + "foo": { + "type": "string", + "value": "baz" } - ] + } }