diff --git a/internal/command/apply_test.go b/internal/command/apply_test.go index b0e598224c..8e0221f4bf 100644 --- a/internal/command/apply_test.go +++ b/internal/command/apply_test.go @@ -1594,7 +1594,7 @@ func TestApply_backup(t *testing.T) { Name: "foo", }.Instance(addrs.NoKey).Absolute(addrs.RootModuleInstance), &states.ResourceInstanceObjectSrc{ - AttrsJSON: []byte("{\n \"id\": \"bar\"\n }"), + AttrsJSON: []byte(`{"id":"bar"}`), Status: states.ObjectReady, }, addrs.AbsProviderConfig{ diff --git a/internal/command/command_test.go b/internal/command/command_test.go index 8933c7a1f2..128ddff7cd 100644 --- a/internal/command/command_test.go +++ b/internal/command/command_test.go @@ -303,7 +303,7 @@ func testState() *states.State { // The weird whitespace here is reflective of how this would // get written out in a real state file, due to the indentation // of all of the containing wrapping objects and arrays. - AttrsJSON: []byte("{\n \"id\": \"bar\"\n }"), + AttrsJSON: []byte(`{"id":"bar"}`), Status: states.ObjectReady, Dependencies: []addrs.ConfigResource{}, }, diff --git a/internal/command/refresh_test.go b/internal/command/refresh_test.go index 16a9258d60..584b04633d 100644 --- a/internal/command/refresh_test.go +++ b/internal/command/refresh_test.go @@ -298,7 +298,7 @@ func TestRefresh_defaultState(t *testing.T) { actual := newState.RootModule().Resources["test_instance.foo"].Instances[addrs.NoKey].Current expected := &states.ResourceInstanceObjectSrc{ Status: states.ObjectReady, - AttrsJSON: []byte("{\n \"ami\": null,\n \"id\": \"yes\"\n }"), + AttrsJSON: []byte(`{"ami":null,"id":"yes"}`), Dependencies: []addrs.ConfigResource{}, } if !reflect.DeepEqual(actual, expected) { @@ -368,7 +368,7 @@ func TestRefresh_outPath(t *testing.T) { actual := newState.RootModule().Resources["test_instance.foo"].Instances[addrs.NoKey].Current expected := &states.ResourceInstanceObjectSrc{ Status: states.ObjectReady, - AttrsJSON: []byte("{\n \"ami\": null,\n \"id\": \"yes\"\n }"), + AttrsJSON: []byte(`{"ami":null,"id":"yes"}`), Dependencies: []addrs.ConfigResource{}, } if !reflect.DeepEqual(actual, expected) { @@ -621,7 +621,7 @@ func TestRefresh_backup(t *testing.T) { actual := newState.RootModule().Resources["test_instance.foo"].Instances[addrs.NoKey].Current expected := &states.ResourceInstanceObjectSrc{ Status: states.ObjectReady, - AttrsJSON: []byte("{\n \"ami\": null,\n \"id\": \"changed\"\n }"), + AttrsJSON: []byte(`{"ami":null,"id":"changed"}`), Dependencies: []addrs.ConfigResource{}, } if !reflect.DeepEqual(actual, expected) { @@ -693,7 +693,7 @@ func TestRefresh_disableBackup(t *testing.T) { actual := newState.RootModule().Resources["test_instance.foo"].Instances[addrs.NoKey].Current expected := &states.ResourceInstanceObjectSrc{ Status: states.ObjectReady, - AttrsJSON: []byte("{\n \"ami\": null,\n \"id\": \"yes\"\n }"), + AttrsJSON: []byte(`{"ami":null,"id":"yes"}`), Dependencies: []addrs.ConfigResource{}, } if !reflect.DeepEqual(actual, expected) { diff --git a/internal/command/testdata/state-push-good/replace.tfstate b/internal/command/testdata/state-push-good/replace.tfstate index 9921bc0762..914425d600 100644 --- a/internal/command/testdata/state-push-good/replace.tfstate +++ b/internal/command/testdata/state-push-good/replace.tfstate @@ -1,23 +1 @@ -{ - "version": 4, - "serial": 0, - "lineage": "hello", - "outputs": {}, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "b", - "provider": "provider.null", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "9051675049789185374", - "triggers": null - } - } - ] - } - ] -} +{"version":4,"serial":0,"lineage":"hello","outputs":{},"resources":[{"mode":"managed","type":"null_resource","name":"b","provider":"provider.null","instances":[{"schema_version":0,"attributes":{"id":"9051675049789185374","triggers":null}}]}]} diff --git a/internal/command/testdata/state-push-replace-match/local-state.tfstate b/internal/command/testdata/state-push-replace-match/local-state.tfstate index b4cf81ff16..0d191d5288 100644 --- a/internal/command/testdata/state-push-replace-match/local-state.tfstate +++ b/internal/command/testdata/state-push-replace-match/local-state.tfstate @@ -1,23 +1 @@ -{ - "version": 4, - "serial": 1, - "lineage": "hello", - "outputs": {}, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "a", - "provider": "provider.null", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "8521602373864259745", - "triggers": null - } - } - ] - } - ] -} +{"version":4,"serial":1,"lineage":"hello","outputs":{},"resources":[{"mode":"managed","type":"null_resource","name":"a","provider":"provider.null","instances":[{"schema_version":0,"attributes":{"id":"8521602373864259745","triggers":null}}]}]} diff --git a/internal/command/testdata/state-push-replace-match/replace.tfstate b/internal/command/testdata/state-push-replace-match/replace.tfstate index a5789c5fe9..206685b25e 100644 --- a/internal/command/testdata/state-push-replace-match/replace.tfstate +++ b/internal/command/testdata/state-push-replace-match/replace.tfstate @@ -1,23 +1 @@ -{ - "version": 4, - "serial": 2, - "lineage": "hello", - "outputs": {}, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "b", - "provider": "provider.null", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "9051675049789185374", - "triggers": null - } - } - ] - } - ] -} +{"version":4,"serial":2,"lineage":"hello","outputs":{},"resources":[{"mode":"managed","type":"null_resource","name":"b","provider":"provider.null","instances":[{"schema_version":0,"attributes":{"id":"9051675049789185374","triggers":null}}]}]} diff --git a/internal/command/testdata/state-push-serial-older/local-state.tfstate b/internal/command/testdata/state-push-serial-older/local-state.tfstate index b4cf81ff16..0d191d5288 100644 --- a/internal/command/testdata/state-push-serial-older/local-state.tfstate +++ b/internal/command/testdata/state-push-serial-older/local-state.tfstate @@ -1,23 +1 @@ -{ - "version": 4, - "serial": 1, - "lineage": "hello", - "outputs": {}, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "a", - "provider": "provider.null", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "8521602373864259745", - "triggers": null - } - } - ] - } - ] -} +{"version":4,"serial":1,"lineage":"hello","outputs":{},"resources":[{"mode":"managed","type":"null_resource","name":"a","provider":"provider.null","instances":[{"schema_version":0,"attributes":{"id":"8521602373864259745","triggers":null}}]}]} diff --git a/internal/command/testdata/state-push-serial-older/replace.tfstate b/internal/command/testdata/state-push-serial-older/replace.tfstate index a5789c5fe9..206685b25e 100644 --- a/internal/command/testdata/state-push-serial-older/replace.tfstate +++ b/internal/command/testdata/state-push-serial-older/replace.tfstate @@ -1,23 +1 @@ -{ - "version": 4, - "serial": 2, - "lineage": "hello", - "outputs": {}, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "b", - "provider": "provider.null", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "9051675049789185374", - "triggers": null - } - } - ] - } - ] -} +{"version":4,"serial":2,"lineage":"hello","outputs":{},"resources":[{"mode":"managed","type":"null_resource","name":"b","provider":"provider.null","instances":[{"schema_version":0,"attributes":{"id":"9051675049789185374","triggers":null}}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v1-simple.in.tfstate b/internal/states/statefile/testdata/roundtrip/v1-simple.in.tfstate index 85524bfa50..c1777cce7e 100644 --- a/internal/states/statefile/testdata/roundtrip/v1-simple.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v1-simple.in.tfstate @@ -1,52 +1 @@ -{ - "version": 1, - "serial": 1, - "modules": [ - { - "path": [ - "root" - ], - "outputs": { - "numbers": "0,1" - }, - "resources": { - "null_resource.bar": { - "type": "null_resource", - "depends_on": [ - "null_resource.foo" - ], - "primary": { - "id": "6456912646020570139", - "attributes": { - "id": "6456912646020570139", - "triggers.#": "1", - "triggers.whaaat": "0,1" - } - } - }, - "null_resource.foo.0": { - "type": "null_resource", - "primary": { - "id": "3597404161631769617", - "attributes": { - "id": "3597404161631769617", - "triggers.#": "1", - "triggers.what": "0" - } - } - }, - "null_resource.foo.1": { - "type": "null_resource", - "primary": { - "id": "3214385801340650197", - "attributes": { - "id": "3214385801340650197", - "triggers.#": "1", - "triggers.what": "1" - } - } - } - } - } - ] -} +{"version":1,"serial":1,"modules":[{"path":["root"],"outputs":{"numbers":"0,1"},"resources":{"null_resource.bar":{"type":"null_resource","depends_on":["null_resource.foo"],"primary":{"id":"6456912646020570139","attributes":{"id":"6456912646020570139","triggers.#":"1","triggers.whaaat":"0,1"}}},"null_resource.foo.0":{"type":"null_resource","primary":{"id":"3597404161631769617","attributes":{"id":"3597404161631769617","triggers.#":"1","triggers.what":"0"}}},"null_resource.foo.1":{"type":"null_resource","primary":{"id":"3214385801340650197","attributes":{"id":"3214385801340650197","triggers.#":"1","triggers.what":"1"}}}}}]} diff --git a/internal/states/statefile/testdata/roundtrip/v1-simple.out.tfstate b/internal/states/statefile/testdata/roundtrip/v1-simple.out.tfstate index 26a8cf335b..a1f7b2afc0 100644 --- a/internal/states/statefile/testdata/roundtrip/v1-simple.out.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v1-simple.out.tfstate @@ -1,60 +1 @@ -{ - "version": 4, - "serial": 1, - "lineage": "", - "terraform_version": "0.0.0", - "outputs": { - "numbers": { - "type": "string", - "value": "0,1" - } - }, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "bar", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "id": "6456912646020570139", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "depends_on": [ - "null_resource.foo" - ] - } - ] - }, - { - "mode": "managed", - "type": "null_resource", - "name": "foo", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "each": "list", - "instances": [ - { - "index_key": 0, - "schema_version": 0, - "attributes_flat": { - "id": "3597404161631769617", - "triggers.%": "1", - "triggers.what": "0" - } - }, - { - "index_key": 1, - "schema_version": 0, - "attributes_flat": { - "id": "3214385801340650197", - "triggers.%": "1", - "triggers.what": "1" - } - } - ] - } - ] -} +{"version":4,"serial":1,"lineage":"","terraform_version":"0.0.0","outputs":{"numbers":{"type":"string","value":"0,1"}},"resources":[{"mode":"managed","type":"null_resource","name":"bar","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"schema_version":0,"attributes_flat":{"id":"6456912646020570139","triggers.%":"1","triggers.whaaat":"0,1"},"depends_on":["null_resource.foo"]}]},{"mode":"managed","type":"null_resource","name":"foo","provider":"provider[\"registry.opentofu.org/-/null\"]","each":"list","instances":[{"index_key":0,"schema_version":0,"attributes_flat":{"id":"3597404161631769617","triggers.%":"1","triggers.what":"0"}},{"index_key":1,"schema_version":0,"attributes_flat":{"id":"3214385801340650197","triggers.%":"1","triggers.what":"1"}}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v3-bigint.in.tfstate b/internal/states/statefile/testdata/roundtrip/v3-bigint.in.tfstate index eadc3e7c2b..ba6d95c44f 100644 --- a/internal/states/statefile/testdata/roundtrip/v3-bigint.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v3-bigint.in.tfstate @@ -1,136 +1 @@ -{ - "version": 3, - "terraform_version": "0.11.1", - "serial": 8, - "lineage": "0f5b2ff9-6ff5-8e9e-1f81-aa3ce9a483eb", - "backend": { - "hash": 10669755453527594976 - }, - "modules": [ - { - "path": [ - "root" - ], - "outputs": { - "results": { - "sensitive": false, - "type": "map", - "value": { - "aws_region": "us-west-2", - "list": "[{\"triggers\":{\"index\":\"0\"}},{\"triggers\":{\"index\":\"1\"}}]", - "list_item_0": "{\"triggers\":{\"index\":\"0\"}}", - "list_item_1": "{\"triggers\":{\"index\":\"1\"}}", - "list_triggers": "[{\"index\":\"0\"},{\"index\":\"1\"}]", - "list_triggers_item": "{\"index\":\"0\"}", - "module_object": "{\"test\":\"hello us-west-2\",\"test2\":\"hello world 2\"}", - "module_output": "hello us-west-2", - "single": "{\"triggers\":{\"baz\":\"BAR\",\"cwd_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"foo\":\"bar\",\"format\":\"Hello 12\",\"json\":\"{\\\"foo\\\":\\\"bar\\\",\\\"wonk\\\":[]}\",\"module_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"root_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"woot\":\"us-west-2\",\"workspace\":\"default\"}}" - } - } - }, - "resources": { - "null_resource.bar.0": { - "type": "null_resource", - "depends_on": [ - "null_resource.baz" - ], - "primary": { - "id": "604776346677326098", - "attributes": { - "id": "604776346677326098", - "triggers.%": "1", - "triggers.index": "0" - }, - "meta": { - "schema_version": "1" - }, - "tainted": false - }, - "deposed": [], - "provider": "provider.null" - }, - "null_resource.bar.1": { - "type": "null_resource", - "depends_on": [ - "null_resource.baz" - ], - "primary": { - "id": "4776432143683449212", - "attributes": { - "id": "4776432143683449212", - "triggers.%": "1", - "triggers.index": "1" - }, - "meta": {}, - "tainted": false - }, - "deposed": [], - "provider": "provider.null" - }, - "null_resource.baz": { - "type": "null_resource", - "depends_on": [], - "primary": { - "id": "1361331090091665738", - "attributes": { - "id": "1361331090091665738", - "triggers.%": "9", - "triggers.baz": "BAR", - "triggers.cwd_path": "/home/mart/Devel/terraform/tmp/hcl2-simple", - "triggers.foo": "bar", - "triggers.format": "Hello 12", - "triggers.json": "{\"foo\":\"bar\",\"wonk\":[]}", - "triggers.module_path": "/home/mart/Devel/terraform/tmp/hcl2-simple", - "triggers.root_path": "/home/mart/Devel/terraform/tmp/hcl2-simple", - "triggers.woot": "us-west-2", - "triggers.workspace": "default" - }, - "meta": { - "foo": "bar" - }, - "tainted": false - }, - "deposed": [], - "provider": "provider.null" - } - }, - "depends_on": [] - }, - { - "path": [ - "root", - "child" - ], - "outputs": { - "test": { - "sensitive": false, - "type": "string", - "value": "hello us-west-2" - }, - "test2": { - "sensitive": false, - "type": "string", - "value": "hello world 2" - } - }, - "resources": { - "null_resource.foo": { - "type": "null_resource", - "depends_on": [], - "primary": { - "id": "1361", - "attributes": { - "id": "1361", - "triggers.%": "0" - }, - "meta": {}, - "tainted": false - }, - "deposed": [], - "provider": "provider.null" - } - }, - "depends_on": [] - } - ] -} +{"version":3,"terraform_version":"0.11.1","serial":8,"lineage":"0f5b2ff9-6ff5-8e9e-1f81-aa3ce9a483eb","backend":{"hash":10669755453527594976},"modules":[{"path":["root"],"outputs":{"results":{"sensitive":false,"type":"map","value":{"aws_region":"us-west-2","list":"[{\"triggers\":{\"index\":\"0\"}},{\"triggers\":{\"index\":\"1\"}}]","list_item_0":"{\"triggers\":{\"index\":\"0\"}}","list_item_1":"{\"triggers\":{\"index\":\"1\"}}","list_triggers":"[{\"index\":\"0\"},{\"index\":\"1\"}]","list_triggers_item":"{\"index\":\"0\"}","module_object":"{\"test\":\"hello us-west-2\",\"test2\":\"hello world 2\"}","module_output":"hello us-west-2","single":"{\"triggers\":{\"baz\":\"BAR\",\"cwd_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"foo\":\"bar\",\"format\":\"Hello 12\",\"json\":\"{\\\"foo\\\":\\\"bar\\\",\\\"wonk\\\":[]}\",\"module_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"root_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"woot\":\"us-west-2\",\"workspace\":\"default\"}}"}}},"resources":{"null_resource.bar.0":{"type":"null_resource","depends_on":["null_resource.baz"],"primary":{"id":"604776346677326098","attributes":{"id":"604776346677326098","triggers.%":"1","triggers.index":"0"},"meta":{"schema_version":"1"},"tainted":false},"deposed":[],"provider":"provider.null"},"null_resource.bar.1":{"type":"null_resource","depends_on":["null_resource.baz"],"primary":{"id":"4776432143683449212","attributes":{"id":"4776432143683449212","triggers.%":"1","triggers.index":"1"},"meta":{},"tainted":false},"deposed":[],"provider":"provider.null"},"null_resource.baz":{"type":"null_resource","depends_on":[],"primary":{"id":"1361331090091665738","attributes":{"id":"1361331090091665738","triggers.%":"9","triggers.baz":"BAR","triggers.cwd_path":"/home/mart/Devel/terraform/tmp/hcl2-simple","triggers.foo":"bar","triggers.format":"Hello 12","triggers.json":"{\"foo\":\"bar\",\"wonk\":[]}","triggers.module_path":"/home/mart/Devel/terraform/tmp/hcl2-simple","triggers.root_path":"/home/mart/Devel/terraform/tmp/hcl2-simple","triggers.woot":"us-west-2","triggers.workspace":"default"},"meta":{"foo":"bar"},"tainted":false},"deposed":[],"provider":"provider.null"}},"depends_on":[]},{"path":["root","child"],"outputs":{"test":{"sensitive":false,"type":"string","value":"hello us-west-2"},"test2":{"sensitive":false,"type":"string","value":"hello world 2"}},"resources":{"null_resource.foo":{"type":"null_resource","depends_on":[],"primary":{"id":"1361","attributes":{"id":"1361","triggers.%":"0"},"meta":{},"tainted":false},"deposed":[],"provider":"provider.null"}},"depends_on":[]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v3-bigint.out.tfstate b/internal/states/statefile/testdata/roundtrip/v3-bigint.out.tfstate index 493fcde80e..f66c102a59 100644 --- a/internal/states/statefile/testdata/roundtrip/v3-bigint.out.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v3-bigint.out.tfstate @@ -1,101 +1 @@ -{ - "version": 4, - "terraform_version": "0.11.1", - "serial": 8, - "lineage": "0f5b2ff9-6ff5-8e9e-1f81-aa3ce9a483eb", - "outputs": { - "results": { - "type": [ - "map", - "string" - ], - "value": { - "aws_region": "us-west-2", - "list": "[{\"triggers\":{\"index\":\"0\"}},{\"triggers\":{\"index\":\"1\"}}]", - "list_item_0": "{\"triggers\":{\"index\":\"0\"}}", - "list_item_1": "{\"triggers\":{\"index\":\"1\"}}", - "list_triggers": "[{\"index\":\"0\"},{\"index\":\"1\"}]", - "list_triggers_item": "{\"index\":\"0\"}", - "module_object": "{\"test\":\"hello us-west-2\",\"test2\":\"hello world 2\"}", - "module_output": "hello us-west-2", - "single": "{\"triggers\":{\"baz\":\"BAR\",\"cwd_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"foo\":\"bar\",\"format\":\"Hello 12\",\"json\":\"{\\\"foo\\\":\\\"bar\\\",\\\"wonk\\\":[]}\",\"module_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"root_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"woot\":\"us-west-2\",\"workspace\":\"default\"}}" - } - } - }, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "bar", - "each": "list", - "provider": "provider.null", - "instances": [ - { - "attributes_flat": { - "id": "604776346677326098", - "triggers.%": "1", - "triggers.index": "0" - }, - "depends_on": [ - "null_resource.baz" - ], - "index_key": 0, - "schema_version": 1 - }, - { - "attributes_flat": { - "id": "4776432143683449212", - "triggers.%": "1", - "triggers.index": "1" - }, - "depends_on": [ - "null_resource.baz" - ], - "index_key": 1, - "schema_version": 0 - } - ] - }, - { - "mode": "managed", - "type": "null_resource", - "name": "baz", - "provider": "provider.null", - "instances": [ - { - "attributes_flat": { - "id": "1361331090091665738", - "triggers.%": "9", - "triggers.baz": "BAR", - "triggers.cwd_path": "/home/mart/Devel/terraform/tmp/hcl2-simple", - "triggers.foo": "bar", - "triggers.format": "Hello 12", - "triggers.json": "{\"foo\":\"bar\",\"wonk\":[]}", - "triggers.module_path": "/home/mart/Devel/terraform/tmp/hcl2-simple", - "triggers.root_path": "/home/mart/Devel/terraform/tmp/hcl2-simple", - "triggers.woot": "us-west-2", - "triggers.workspace": "default" - }, - "schema_version": 0, - "private": "eyJmb28iOiJiYXIifQ==" - } - ] - }, - { - "module": "module.child", - "mode": "managed", - "type": "null_resource", - "name": "foo", - "provider": "provider.null", - "instances": [ - { - "attributes_flat": { - "id": "1361", - "triggers.%": "0" - }, - "schema_version": 0 - } - ] - } - ] -} +{"version":4,"terraform_version":"0.11.1","serial":8,"lineage":"0f5b2ff9-6ff5-8e9e-1f81-aa3ce9a483eb","outputs":{"results":{"type":["map","string"],"value":{"aws_region":"us-west-2","list":"[{\"triggers\":{\"index\":\"0\"}},{\"triggers\":{\"index\":\"1\"}}]","list_item_0":"{\"triggers\":{\"index\":\"0\"}}","list_item_1":"{\"triggers\":{\"index\":\"1\"}}","list_triggers":"[{\"index\":\"0\"},{\"index\":\"1\"}]","list_triggers_item":"{\"index\":\"0\"}","module_object":"{\"test\":\"hello us-west-2\",\"test2\":\"hello world 2\"}","module_output":"hello us-west-2","single":"{\"triggers\":{\"baz\":\"BAR\",\"cwd_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"foo\":\"bar\",\"format\":\"Hello 12\",\"json\":\"{\\\"foo\\\":\\\"bar\\\",\\\"wonk\\\":[]}\",\"module_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"root_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"woot\":\"us-west-2\",\"workspace\":\"default\"}}"}}},"resources":[{"mode":"managed","type":"null_resource","name":"bar","each":"list","provider":"provider.null","instances":[{"attributes_flat":{"id":"604776346677326098","triggers.%":"1","triggers.index":"0"},"depends_on":["null_resource.baz"],"index_key":0,"schema_version":1},{"attributes_flat":{"id":"4776432143683449212","triggers.%":"1","triggers.index":"1"},"depends_on":["null_resource.baz"],"index_key":1,"schema_version":0}]},{"mode":"managed","type":"null_resource","name":"baz","provider":"provider.null","instances":[{"attributes_flat":{"id":"1361331090091665738","triggers.%":"9","triggers.baz":"BAR","triggers.cwd_path":"/home/mart/Devel/terraform/tmp/hcl2-simple","triggers.foo":"bar","triggers.format":"Hello 12","triggers.json":"{\"foo\":\"bar\",\"wonk\":[]}","triggers.module_path":"/home/mart/Devel/terraform/tmp/hcl2-simple","triggers.root_path":"/home/mart/Devel/terraform/tmp/hcl2-simple","triggers.woot":"us-west-2","triggers.workspace":"default"},"schema_version":0,"private":"eyJmb28iOiJiYXIifQ=="}]},{"module":"module.child","mode":"managed","type":"null_resource","name":"foo","provider":"provider.null","instances":[{"attributes_flat":{"id":"1361","triggers.%":"0"},"schema_version":0}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v3-builtin.in.tfstate b/internal/states/statefile/testdata/roundtrip/v3-builtin.in.tfstate index 2e1ea0c666..36d29e3824 100644 --- a/internal/states/statefile/testdata/roundtrip/v3-builtin.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v3-builtin.in.tfstate @@ -1,39 +1 @@ -{ - "version": 3, - "terraform_version": "0.11.14", - "serial": 1, - "lineage": "b707851e-4209-9792-e752-bc0dd6c81fcf", - "modules": [ - { - "path": [ - "root" - ], - "outputs": {}, - "resources": { - "data.terraform_remote_state.test": { - "type": "terraform_remote_state", - "depends_on": [], - "primary": { - "id": "2020-08-14 19:13:36.875081 +0000 UTC", - "attributes": { - "backend": "remote", - "config.#": "1", - "config.345861710.organization": "hashicorp", - "config.345861710.workspaces.#": "1", - "config.345861710.workspaces.0.%": "1", - "config.345861710.workspaces.0.name": "test", - "environment": "default", - "id": "2020-08-14 19:13:36.875081 +0000 UTC", - "workspace": "default" - }, - "meta": {}, - "tainted": false - }, - "deposed": [], - "provider": "provider.terraform" - } - }, - "depends_on": [] - } - ] -} +{"version":3,"terraform_version":"0.11.14","serial":1,"lineage":"b707851e-4209-9792-e752-bc0dd6c81fcf","modules":[{"path":["root"],"outputs":{},"resources":{"data.terraform_remote_state.test":{"type":"terraform_remote_state","depends_on":[],"primary":{"id":"2020-08-14 19:13:36.875081 +0000 UTC","attributes":{"backend":"remote","config.#":"1","config.345861710.organization":"hashicorp","config.345861710.workspaces.#":"1","config.345861710.workspaces.0.%":"1","config.345861710.workspaces.0.name":"test","environment":"default","id":"2020-08-14 19:13:36.875081 +0000 UTC","workspace":"default"},"meta":{},"tainted":false},"deposed":[],"provider":"provider.terraform"}},"depends_on":[]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v3-builtin.out.tfstate b/internal/states/statefile/testdata/roundtrip/v3-builtin.out.tfstate index baef96941b..372e236973 100644 --- a/internal/states/statefile/testdata/roundtrip/v3-builtin.out.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v3-builtin.out.tfstate @@ -1,31 +1 @@ -{ - "version": 4, - "terraform_version": "0.12.28", - "serial": 1, - "lineage": "b707851e-4209-9792-e752-bc0dd6c81fcf", - "outputs": {}, - "resources": [ - { - "mode": "data", - "type": "terraform_remote_state", - "name": "test", - "provider": "provider.terraform", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "backend": "remote", - "config.#": "1", - "config.345861710.organization": "hashicorp", - "config.345861710.workspaces.#": "1", - "config.345861710.workspaces.0.%": "1", - "config.345861710.workspaces.0.name": "test", - "environment": "default", - "id": "2020-08-14 19:13:36.875081 +0000 UTC", - "workspace": "default" - } - } - ] - } - ] -} +{"version":4,"terraform_version":"0.12.28","serial":1,"lineage":"b707851e-4209-9792-e752-bc0dd6c81fcf","outputs":{},"resources":[{"mode":"data","type":"terraform_remote_state","name":"test","provider":"provider.terraform","instances":[{"schema_version":0,"attributes_flat":{"backend":"remote","config.#":"1","config.345861710.organization":"hashicorp","config.345861710.workspaces.#":"1","config.345861710.workspaces.0.%":"1","config.345861710.workspaces.0.name":"test","environment":"default","id":"2020-08-14 19:13:36.875081 +0000 UTC","workspace":"default"}}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v3-grabbag.in.tfstate b/internal/states/statefile/testdata/roundtrip/v3-grabbag.in.tfstate index 79b1e75d9c..c1da48d6bf 100644 --- a/internal/states/statefile/testdata/roundtrip/v3-grabbag.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v3-grabbag.in.tfstate @@ -1,133 +1 @@ -{ - "version": 3, - "terraform_version": "0.11.1", - "serial": 8, - "lineage": "0f5b2ff9-6ff5-8e9e-1f81-aa3ce9a483eb", - "modules": [ - { - "path": [ - "root" - ], - "outputs": { - "results": { - "sensitive": false, - "type": "map", - "value": { - "aws_region": "us-west-2", - "list": "[{\"triggers\":{\"index\":\"0\"}},{\"triggers\":{\"index\":\"1\"}}]", - "list_item_0": "{\"triggers\":{\"index\":\"0\"}}", - "list_item_1": "{\"triggers\":{\"index\":\"1\"}}", - "list_triggers": "[{\"index\":\"0\"},{\"index\":\"1\"}]", - "list_triggers_item": "{\"index\":\"0\"}", - "module_object": "{\"test\":\"hello us-west-2\",\"test2\":\"hello world 2\"}", - "module_output": "hello us-west-2", - "single": "{\"triggers\":{\"baz\":\"BAR\",\"cwd_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"foo\":\"bar\",\"format\":\"Hello 12\",\"json\":\"{\\\"foo\\\":\\\"bar\\\",\\\"wonk\\\":[]}\",\"module_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"root_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"woot\":\"us-west-2\",\"workspace\":\"default\"}}" - } - } - }, - "resources": { - "null_resource.bar.0": { - "type": "null_resource", - "depends_on": [ - "null_resource.baz" - ], - "primary": { - "id": "604776346677326098", - "attributes": { - "id": "604776346677326098", - "triggers.%": "1", - "triggers.index": "0" - }, - "meta": { - "schema_version": "1" - }, - "tainted": false - }, - "deposed": [], - "provider": "provider.null" - }, - "null_resource.bar.1": { - "type": "null_resource", - "depends_on": [ - "null_resource.baz" - ], - "primary": { - "id": "4776432143683449212", - "attributes": { - "id": "4776432143683449212", - "triggers.%": "1", - "triggers.index": "1" - }, - "meta": {}, - "tainted": false - }, - "deposed": [], - "provider": "provider.null" - }, - "null_resource.baz": { - "type": "null_resource", - "depends_on": [], - "primary": { - "id": "1361331090091665738", - "attributes": { - "id": "1361331090091665738", - "triggers.%": "9", - "triggers.baz": "BAR", - "triggers.cwd_path": "/home/mart/Devel/terraform/tmp/hcl2-simple", - "triggers.foo": "bar", - "triggers.format": "Hello 12", - "triggers.json": "{\"foo\":\"bar\",\"wonk\":[]}", - "triggers.module_path": "/home/mart/Devel/terraform/tmp/hcl2-simple", - "triggers.root_path": "/home/mart/Devel/terraform/tmp/hcl2-simple", - "triggers.woot": "us-west-2", - "triggers.workspace": "default" - }, - "meta": { - "foo": "bar" - }, - "tainted": false - }, - "deposed": [], - "provider": "provider.null" - } - }, - "depends_on": [] - }, - { - "path": [ - "root", - "child" - ], - "outputs": { - "test": { - "sensitive": false, - "type": "string", - "value": "hello us-west-2" - }, - "test2": { - "sensitive": false, - "type": "string", - "value": "hello world 2" - } - }, - "resources": { - "null_resource.foo": { - "type": "null_resource", - "depends_on": [], - "primary": { - "id": "1361", - "attributes": { - "id": "1361", - "triggers.%": "0" - }, - "meta": {}, - "tainted": false - }, - "deposed": [], - "provider": "provider.null" - } - }, - "depends_on": [] - } - ] -} +{"version":3,"terraform_version":"0.11.1","serial":8,"lineage":"0f5b2ff9-6ff5-8e9e-1f81-aa3ce9a483eb","modules":[{"path":["root"],"outputs":{"results":{"sensitive":false,"type":"map","value":{"aws_region":"us-west-2","list":"[{\"triggers\":{\"index\":\"0\"}},{\"triggers\":{\"index\":\"1\"}}]","list_item_0":"{\"triggers\":{\"index\":\"0\"}}","list_item_1":"{\"triggers\":{\"index\":\"1\"}}","list_triggers":"[{\"index\":\"0\"},{\"index\":\"1\"}]","list_triggers_item":"{\"index\":\"0\"}","module_object":"{\"test\":\"hello us-west-2\",\"test2\":\"hello world 2\"}","module_output":"hello us-west-2","single":"{\"triggers\":{\"baz\":\"BAR\",\"cwd_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"foo\":\"bar\",\"format\":\"Hello 12\",\"json\":\"{\\\"foo\\\":\\\"bar\\\",\\\"wonk\\\":[]}\",\"module_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"root_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"woot\":\"us-west-2\",\"workspace\":\"default\"}}"}}},"resources":{"null_resource.bar.0":{"type":"null_resource","depends_on":["null_resource.baz"],"primary":{"id":"604776346677326098","attributes":{"id":"604776346677326098","triggers.%":"1","triggers.index":"0"},"meta":{"schema_version":"1"},"tainted":false},"deposed":[],"provider":"provider.null"},"null_resource.bar.1":{"type":"null_resource","depends_on":["null_resource.baz"],"primary":{"id":"4776432143683449212","attributes":{"id":"4776432143683449212","triggers.%":"1","triggers.index":"1"},"meta":{},"tainted":false},"deposed":[],"provider":"provider.null"},"null_resource.baz":{"type":"null_resource","depends_on":[],"primary":{"id":"1361331090091665738","attributes":{"id":"1361331090091665738","triggers.%":"9","triggers.baz":"BAR","triggers.cwd_path":"/home/mart/Devel/terraform/tmp/hcl2-simple","triggers.foo":"bar","triggers.format":"Hello 12","triggers.json":"{\"foo\":\"bar\",\"wonk\":[]}","triggers.module_path":"/home/mart/Devel/terraform/tmp/hcl2-simple","triggers.root_path":"/home/mart/Devel/terraform/tmp/hcl2-simple","triggers.woot":"us-west-2","triggers.workspace":"default"},"meta":{"foo":"bar"},"tainted":false},"deposed":[],"provider":"provider.null"}},"depends_on":[]},{"path":["root","child"],"outputs":{"test":{"sensitive":false,"type":"string","value":"hello us-west-2"},"test2":{"sensitive":false,"type":"string","value":"hello world 2"}},"resources":{"null_resource.foo":{"type":"null_resource","depends_on":[],"primary":{"id":"1361","attributes":{"id":"1361","triggers.%":"0"},"meta":{},"tainted":false},"deposed":[],"provider":"provider.null"}},"depends_on":[]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v3-grabbag.out.tfstate b/internal/states/statefile/testdata/roundtrip/v3-grabbag.out.tfstate index 493fcde80e..f66c102a59 100644 --- a/internal/states/statefile/testdata/roundtrip/v3-grabbag.out.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v3-grabbag.out.tfstate @@ -1,101 +1 @@ -{ - "version": 4, - "terraform_version": "0.11.1", - "serial": 8, - "lineage": "0f5b2ff9-6ff5-8e9e-1f81-aa3ce9a483eb", - "outputs": { - "results": { - "type": [ - "map", - "string" - ], - "value": { - "aws_region": "us-west-2", - "list": "[{\"triggers\":{\"index\":\"0\"}},{\"triggers\":{\"index\":\"1\"}}]", - "list_item_0": "{\"triggers\":{\"index\":\"0\"}}", - "list_item_1": "{\"triggers\":{\"index\":\"1\"}}", - "list_triggers": "[{\"index\":\"0\"},{\"index\":\"1\"}]", - "list_triggers_item": "{\"index\":\"0\"}", - "module_object": "{\"test\":\"hello us-west-2\",\"test2\":\"hello world 2\"}", - "module_output": "hello us-west-2", - "single": "{\"triggers\":{\"baz\":\"BAR\",\"cwd_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"foo\":\"bar\",\"format\":\"Hello 12\",\"json\":\"{\\\"foo\\\":\\\"bar\\\",\\\"wonk\\\":[]}\",\"module_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"root_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"woot\":\"us-west-2\",\"workspace\":\"default\"}}" - } - } - }, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "bar", - "each": "list", - "provider": "provider.null", - "instances": [ - { - "attributes_flat": { - "id": "604776346677326098", - "triggers.%": "1", - "triggers.index": "0" - }, - "depends_on": [ - "null_resource.baz" - ], - "index_key": 0, - "schema_version": 1 - }, - { - "attributes_flat": { - "id": "4776432143683449212", - "triggers.%": "1", - "triggers.index": "1" - }, - "depends_on": [ - "null_resource.baz" - ], - "index_key": 1, - "schema_version": 0 - } - ] - }, - { - "mode": "managed", - "type": "null_resource", - "name": "baz", - "provider": "provider.null", - "instances": [ - { - "attributes_flat": { - "id": "1361331090091665738", - "triggers.%": "9", - "triggers.baz": "BAR", - "triggers.cwd_path": "/home/mart/Devel/terraform/tmp/hcl2-simple", - "triggers.foo": "bar", - "triggers.format": "Hello 12", - "triggers.json": "{\"foo\":\"bar\",\"wonk\":[]}", - "triggers.module_path": "/home/mart/Devel/terraform/tmp/hcl2-simple", - "triggers.root_path": "/home/mart/Devel/terraform/tmp/hcl2-simple", - "triggers.woot": "us-west-2", - "triggers.workspace": "default" - }, - "schema_version": 0, - "private": "eyJmb28iOiJiYXIifQ==" - } - ] - }, - { - "module": "module.child", - "mode": "managed", - "type": "null_resource", - "name": "foo", - "provider": "provider.null", - "instances": [ - { - "attributes_flat": { - "id": "1361", - "triggers.%": "0" - }, - "schema_version": 0 - } - ] - } - ] -} +{"version":4,"terraform_version":"0.11.1","serial":8,"lineage":"0f5b2ff9-6ff5-8e9e-1f81-aa3ce9a483eb","outputs":{"results":{"type":["map","string"],"value":{"aws_region":"us-west-2","list":"[{\"triggers\":{\"index\":\"0\"}},{\"triggers\":{\"index\":\"1\"}}]","list_item_0":"{\"triggers\":{\"index\":\"0\"}}","list_item_1":"{\"triggers\":{\"index\":\"1\"}}","list_triggers":"[{\"index\":\"0\"},{\"index\":\"1\"}]","list_triggers_item":"{\"index\":\"0\"}","module_object":"{\"test\":\"hello us-west-2\",\"test2\":\"hello world 2\"}","module_output":"hello us-west-2","single":"{\"triggers\":{\"baz\":\"BAR\",\"cwd_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"foo\":\"bar\",\"format\":\"Hello 12\",\"json\":\"{\\\"foo\\\":\\\"bar\\\",\\\"wonk\\\":[]}\",\"module_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"root_path\":\"/home/mart/Devel/terraform/tmp/hcl2-simple\",\"woot\":\"us-west-2\",\"workspace\":\"default\"}}"}}},"resources":[{"mode":"managed","type":"null_resource","name":"bar","each":"list","provider":"provider.null","instances":[{"attributes_flat":{"id":"604776346677326098","triggers.%":"1","triggers.index":"0"},"depends_on":["null_resource.baz"],"index_key":0,"schema_version":1},{"attributes_flat":{"id":"4776432143683449212","triggers.%":"1","triggers.index":"1"},"depends_on":["null_resource.baz"],"index_key":1,"schema_version":0}]},{"mode":"managed","type":"null_resource","name":"baz","provider":"provider.null","instances":[{"attributes_flat":{"id":"1361331090091665738","triggers.%":"9","triggers.baz":"BAR","triggers.cwd_path":"/home/mart/Devel/terraform/tmp/hcl2-simple","triggers.foo":"bar","triggers.format":"Hello 12","triggers.json":"{\"foo\":\"bar\",\"wonk\":[]}","triggers.module_path":"/home/mart/Devel/terraform/tmp/hcl2-simple","triggers.root_path":"/home/mart/Devel/terraform/tmp/hcl2-simple","triggers.woot":"us-west-2","triggers.workspace":"default"},"schema_version":0,"private":"eyJmb28iOiJiYXIifQ=="}]},{"module":"module.child","mode":"managed","type":"null_resource","name":"foo","provider":"provider.null","instances":[{"attributes_flat":{"id":"1361","triggers.%":"0"},"schema_version":0}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v3-invalid-depends.in.tfstate b/internal/states/statefile/testdata/roundtrip/v3-invalid-depends.in.tfstate index 6943b6139b..78c4da28f7 100644 --- a/internal/states/statefile/testdata/roundtrip/v3-invalid-depends.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v3-invalid-depends.in.tfstate @@ -1,42 +1 @@ -{ - "version": 3, - "terraform_version": "0.7.13", - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "modules": [ - { - "path": [ - "root" - ], - "outputs": { - "numbers": { - "sensitive": false, - "type": "string", - "value": "0,1" - } - }, - "resources": { - "null_resource.bar": { - "type": "null_resource", - "depends_on": [ - "null_resource.valid", - "null_resource.1invalid" - ], - "primary": { - "id": "5388490630832483079", - "attributes": { - "id": "5388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "meta": {}, - "tainted": false - }, - "deposed": [], - "provider": "" - } - }, - "depends_on": [] - } - ] -} \ No newline at end of file +{"version":3,"terraform_version":"0.7.13","serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","modules":[{"path":["root"],"outputs":{"numbers":{"sensitive":false,"type":"string","value":"0,1"}},"resources":{"null_resource.bar":{"type":"null_resource","depends_on":["null_resource.valid","null_resource.1invalid"],"primary":{"id":"5388490630832483079","attributes":{"id":"5388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"},"meta":{},"tainted":false},"deposed":[],"provider":""}},"depends_on":[]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v3-invalid-depends.out.tfstate b/internal/states/statefile/testdata/roundtrip/v3-invalid-depends.out.tfstate index 9ac170c860..97711d27ab 100644 --- a/internal/states/statefile/testdata/roundtrip/v3-invalid-depends.out.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v3-invalid-depends.out.tfstate @@ -1,33 +1 @@ -{ - "version": 4, - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "terraform_version": "0.7.13", - "outputs": { - "numbers": { - "type": "string", - "value": "0,1" - } - }, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "bar", - "provider": "provider.null", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "id": "5388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "depends_on": [ - "null_resource.valid" - ] - } - ] - } - ] -} +{"version":4,"serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","terraform_version":"0.7.13","outputs":{"numbers":{"type":"string","value":"0,1"}},"resources":[{"mode":"managed","type":"null_resource","name":"bar","provider":"provider.null","instances":[{"schema_version":0,"attributes_flat":{"id":"5388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"},"depends_on":["null_resource.valid"]}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v3-simple.in.tfstate b/internal/states/statefile/testdata/roundtrip/v3-simple.in.tfstate index ec8ceeb3ac..530284629a 100644 --- a/internal/states/statefile/testdata/roundtrip/v3-simple.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v3-simple.in.tfstate @@ -1,91 +1 @@ -{ - "version": 3, - "terraform_version": "0.7.13", - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "modules": [ - { - "path": [ - "root" - ], - "outputs": { - "numbers": { - "sensitive": false, - "type": "string", - "value": "0,1" - } - }, - "resources": { - "null_resource.bar": { - "type": "null_resource", - "depends_on": [ - "null_resource.foo.*", - "null_resource.foobar", - "null_resource.foobar.1" - ], - "primary": { - "id": "5388490630832483079", - "attributes": { - "id": "5388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "meta": {}, - "tainted": false - }, - "deposed": [], - "provider": "" - }, - "null_resource.foo.0": { - "type": "null_resource", - "depends_on": [], - "primary": { - "id": "8212585058302700791", - "attributes": { - "id": "8212585058302700791", - "triggers.%": "1", - "triggers.what": "0" - }, - "meta": {}, - "tainted": false - }, - "deposed": [], - "provider": "" - }, - "null_resource.foo.1": { - "type": "null_resource", - "depends_on": [], - "primary": { - "id": "1523897709610803586", - "attributes": { - "id": "1523897709610803586", - "triggers.%": "1", - "triggers.what": "1" - }, - "meta": {}, - "tainted": false - }, - "deposed": [], - "provider": "" - }, - "null_resource.foobar": { - "type": "null_resource", - "depends_on": [], - "primary": { - "id": "7388490630832483079", - "attributes": { - "id": "7388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "meta": {}, - "tainted": false - }, - "deposed": [], - "provider": "" - } - }, - "depends_on": [] - } - ] -} \ No newline at end of file +{"version":3,"terraform_version":"0.7.13","serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","modules":[{"path":["root"],"outputs":{"numbers":{"sensitive":false,"type":"string","value":"0,1"}},"resources":{"null_resource.bar":{"type":"null_resource","depends_on":["null_resource.foo.*","null_resource.foobar","null_resource.foobar.1"],"primary":{"id":"5388490630832483079","attributes":{"id":"5388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"},"meta":{},"tainted":false},"deposed":[],"provider":""},"null_resource.foo.0":{"type":"null_resource","depends_on":[],"primary":{"id":"8212585058302700791","attributes":{"id":"8212585058302700791","triggers.%":"1","triggers.what":"0"},"meta":{},"tainted":false},"deposed":[],"provider":""},"null_resource.foo.1":{"type":"null_resource","depends_on":[],"primary":{"id":"1523897709610803586","attributes":{"id":"1523897709610803586","triggers.%":"1","triggers.what":"1"},"meta":{},"tainted":false},"deposed":[],"provider":""},"null_resource.foobar":{"type":"null_resource","depends_on":[],"primary":{"id":"7388490630832483079","attributes":{"id":"7388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"},"meta":{},"tainted":false},"deposed":[],"provider":""}},"depends_on":[]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v3-simple.out.tfstate b/internal/states/statefile/testdata/roundtrip/v3-simple.out.tfstate index b61661ab91..2bf1510a10 100644 --- a/internal/states/statefile/testdata/roundtrip/v3-simple.out.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v3-simple.out.tfstate @@ -1,78 +1 @@ -{ - "version": 4, - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "terraform_version": "0.7.13", - "outputs": { - "numbers": { - "type": "string", - "value": "0,1" - } - }, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "bar", - "provider": "provider.null", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "id": "5388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "depends_on": [ - "null_resource.foo", - "null_resource.foobar", - "null_resource.foobar[1]" - ] - } - ] - }, - { - "mode": "managed", - "type": "null_resource", - "name": "foo", - "provider": "provider.null", - "each": "list", - "instances": [ - { - "index_key": 0, - "schema_version": 0, - "attributes_flat": { - "id": "8212585058302700791", - "triggers.%": "1", - "triggers.what": "0" - } - }, - { - "index_key": 1, - "schema_version": 0, - "attributes_flat": { - "id": "1523897709610803586", - "triggers.%": "1", - "triggers.what": "1" - } - } - ] - }, - { - "mode": "managed", - "type": "null_resource", - "name": "foobar", - "provider": "provider.null", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "id": "7388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - } - } - ] - } - ] -} +{"version":4,"serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","terraform_version":"0.7.13","outputs":{"numbers":{"type":"string","value":"0,1"}},"resources":[{"mode":"managed","type":"null_resource","name":"bar","provider":"provider.null","instances":[{"schema_version":0,"attributes_flat":{"id":"5388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"},"depends_on":["null_resource.foo","null_resource.foobar","null_resource.foobar[1]"]}]},{"mode":"managed","type":"null_resource","name":"foo","provider":"provider.null","each":"list","instances":[{"index_key":0,"schema_version":0,"attributes_flat":{"id":"8212585058302700791","triggers.%":"1","triggers.what":"0"}},{"index_key":1,"schema_version":0,"attributes_flat":{"id":"1523897709610803586","triggers.%":"1","triggers.what":"1"}}]},{"mode":"managed","type":"null_resource","name":"foobar","provider":"provider.null","instances":[{"schema_version":0,"attributes_flat":{"id":"7388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"}}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v4-cbd.in.tfstate b/internal/states/statefile/testdata/roundtrip/v4-cbd.in.tfstate index 738dda3c93..61db1f51f7 100644 --- a/internal/states/statefile/testdata/roundtrip/v4-cbd.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v4-cbd.in.tfstate @@ -1,34 +1 @@ -{ - "version": 4, - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "terraform_version": "0.12.0", - "outputs": { - "numbers": { - "type": "string", - "value": "0,1" - } - }, - "resources": [ - { - "module": "module.modA", - "mode": "managed", - "type": "null_resource", - "name": "resource", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "4639265839606265182", - "triggers": { - "input": "test" - } - }, - "create_before_destroy": true, - "private": "bnVsbA==" - } - ] - } - ] -} +{"version":4,"serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","terraform_version":"0.12.0","outputs":{"numbers":{"type":"string","value":"0,1"}},"resources":[{"module":"module.modA","mode":"managed","type":"null_resource","name":"resource","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"schema_version":0,"attributes":{"id":"4639265839606265182","triggers":{"input":"test"}},"create_before_destroy":true,"private":"bnVsbA=="}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v4-foreach.in.tfstate b/internal/states/statefile/testdata/roundtrip/v4-foreach.in.tfstate index f6ff3116bf..47bb9c74d1 100644 --- a/internal/states/statefile/testdata/roundtrip/v4-foreach.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v4-foreach.in.tfstate @@ -1,36 +1 @@ -{ - "version": 4, - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "terraform_version": "0.12.0", - "outputs": { - "numbers": { - "type": "string", - "value": "0,1" - } - }, - "resources": [ - { - "module": "module.modA", - "mode": "managed", - "type": "null_resource", - "name": "resource", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "4639265839606265182", - "triggers": { - "input": "test" - } - }, - "private": "bnVsbA==", - "depends_on": [ - "var.input" - ] - } - ] - } - ] -} +{"version":4,"serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","terraform_version":"0.12.0","outputs":{"numbers":{"type":"string","value":"0,1"}},"resources":[{"module":"module.modA","mode":"managed","type":"null_resource","name":"resource","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"schema_version":0,"attributes":{"id":"4639265839606265182","triggers":{"input":"test"}},"private":"bnVsbA==","depends_on":["var.input"]}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v4-future.in.tfstate b/internal/states/statefile/testdata/roundtrip/v4-future.in.tfstate index 0b23a515f8..6c581b0be6 100644 --- a/internal/states/statefile/testdata/roundtrip/v4-future.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v4-future.in.tfstate @@ -1,60 +1 @@ -{ - "version": 4, - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "terraform_version": "999.0.0", - "outputs": { - "numbers": { - "type": "string", - "value": "0,1" - } - }, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "bar", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "id": "5388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "depends_on": [ - "null_resource.foo" - ] - } - ] - }, - { - "mode": "managed", - "type": "null_resource", - "name": "foo", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "each": "list", - "instances": [ - { - "index_key": 0, - "schema_version": 0, - "attributes_flat": { - "id": "8212585058302700791", - "triggers.%": "1", - "triggers.what": "0" - } - }, - { - "index_key": 1, - "schema_version": 0, - "attributes_flat": { - "id": "1523897709610803586", - "triggers.%": "1", - "triggers.what": "0" - } - } - ] - } - ] -} +{"version":4,"serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","terraform_version":"999.0.0","outputs":{"numbers":{"type":"string","value":"0,1"}},"resources":[{"mode":"managed","type":"null_resource","name":"bar","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"schema_version":0,"attributes_flat":{"id":"5388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"},"depends_on":["null_resource.foo"]}]},{"mode":"managed","type":"null_resource","name":"foo","provider":"provider[\"registry.opentofu.org/-/null\"]","each":"list","instances":[{"index_key":0,"schema_version":0,"attributes_flat":{"id":"8212585058302700791","triggers.%":"1","triggers.what":"0"}},{"index_key":1,"schema_version":0,"attributes_flat":{"id":"1523897709610803586","triggers.%":"1","triggers.what":"0"}}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v4-legacy-foreach.in.tfstate b/internal/states/statefile/testdata/roundtrip/v4-legacy-foreach.in.tfstate index 0b5085f9a0..1b77f5e3b3 100644 --- a/internal/states/statefile/testdata/roundtrip/v4-legacy-foreach.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v4-legacy-foreach.in.tfstate @@ -1,36 +1 @@ -{ - "version": 4, - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "terraform_version": "0.12.0", - "outputs": { - "numbers": { - "type": "string", - "value": "0,1" - } - }, - "resources": [ - { - "module": "module.modA", - "mode": "managed", - "type": "null_resource", - "name": "resource", - "provider": "provider.null", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "4639265839606265182", - "triggers": { - "input": "test" - } - }, - "private": "bnVsbA==", - "depends_on": [ - "var.input" - ] - } - ] - } - ] -} +{"version":4,"serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","terraform_version":"0.12.0","outputs":{"numbers":{"type":"string","value":"0,1"}},"resources":[{"module":"module.modA","mode":"managed","type":"null_resource","name":"resource","provider":"provider.null","instances":[{"schema_version":0,"attributes":{"id":"4639265839606265182","triggers":{"input":"test"}},"private":"bnVsbA==","depends_on":["var.input"]}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v4-legacy-foreach.out.tfstate b/internal/states/statefile/testdata/roundtrip/v4-legacy-foreach.out.tfstate index f6ff3116bf..47bb9c74d1 100644 --- a/internal/states/statefile/testdata/roundtrip/v4-legacy-foreach.out.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v4-legacy-foreach.out.tfstate @@ -1,36 +1 @@ -{ - "version": 4, - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "terraform_version": "0.12.0", - "outputs": { - "numbers": { - "type": "string", - "value": "0,1" - } - }, - "resources": [ - { - "module": "module.modA", - "mode": "managed", - "type": "null_resource", - "name": "resource", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "4639265839606265182", - "triggers": { - "input": "test" - } - }, - "private": "bnVsbA==", - "depends_on": [ - "var.input" - ] - } - ] - } - ] -} +{"version":4,"serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","terraform_version":"0.12.0","outputs":{"numbers":{"type":"string","value":"0,1"}},"resources":[{"module":"module.modA","mode":"managed","type":"null_resource","name":"resource","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"schema_version":0,"attributes":{"id":"4639265839606265182","triggers":{"input":"test"}},"private":"bnVsbA==","depends_on":["var.input"]}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v4-legacy-modules.in.tfstate b/internal/states/statefile/testdata/roundtrip/v4-legacy-modules.in.tfstate index 0e892ef55a..22dcc3e8d6 100644 --- a/internal/states/statefile/testdata/roundtrip/v4-legacy-modules.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v4-legacy-modules.in.tfstate @@ -1,88 +1 @@ -{ - "version": 4, - "terraform_version": "0.12.0", - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "outputs": { - "numbers": { - "value": "0,1", - "type": "string" - } - }, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "bar", - "provider": "provider.null", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "id": "5388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "depends_on": [ - "null_resource.foo" - ] - } - ] - }, - { - "module": "module.modB", - "mode": "managed", - "type": "null_resource", - "name": "bar", - "each": "map", - "provider": "provider. null", - "instances": [ - { - "index_key": "a", - "schema_version": 0, - "attributes_flat": { - "id": "8212585058302700791" - }, - "dependencies": [ - "module.modA.null_resource.resource" - ] - }, - { - "index_key": "b", - "schema_version": 0, - "attributes_flat": { - "id": "1523897709610803586" - }, - "dependencies": [ - "module.modA.null_resource.resource" - ] - } - ] - }, - { - "module": "module.modA", - "mode": "managed", - "type": "null_resource", - "name": "resource", - "provider": "provider.null", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "4639265839606265182", - "triggers": { - "input": "test" - } - }, - "private": "bnVsbA==", - "dependencies": [ - "null_resource.bar" - ], - "depends_on": [ - "var.input" - ] - } - ] - } - ] -} +{"version":4,"terraform_version":"0.12.0","serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","outputs":{"numbers":{"value":"0,1","type":"string"}},"resources":[{"mode":"managed","type":"null_resource","name":"bar","provider":"provider.null","instances":[{"schema_version":0,"attributes_flat":{"id":"5388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"},"depends_on":["null_resource.foo"]}]},{"module":"module.modB","mode":"managed","type":"null_resource","name":"bar","each":"map","provider":"provider. null","instances":[{"index_key":"a","schema_version":0,"attributes_flat":{"id":"8212585058302700791"},"dependencies":["module.modA.null_resource.resource"]},{"index_key":"b","schema_version":0,"attributes_flat":{"id":"1523897709610803586"},"dependencies":["module.modA.null_resource.resource"]}]},{"module":"module.modA","mode":"managed","type":"null_resource","name":"resource","provider":"provider.null","instances":[{"schema_version":0,"attributes":{"id":"4639265839606265182","triggers":{"input":"test"}},"private":"bnVsbA==","dependencies":["null_resource.bar"],"depends_on":["var.input"]}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v4-legacy-modules.out.tfstate b/internal/states/statefile/testdata/roundtrip/v4-legacy-modules.out.tfstate index 6676d6c0d2..2f8cdd1e1b 100644 --- a/internal/states/statefile/testdata/roundtrip/v4-legacy-modules.out.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v4-legacy-modules.out.tfstate @@ -1,88 +1 @@ -{ - "version": 4, - "terraform_version": "0.12.0", - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "outputs": { - "numbers": { - "value": "0,1", - "type": "string" - } - }, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "bar", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "id": "5388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "depends_on": [ - "null_resource.foo" - ] - } - ] - }, - { - "module": "module.modB", - "mode": "managed", - "type": "null_resource", - "name": "bar", - "each": "map", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "index_key": "a", - "schema_version": 0, - "attributes_flat": { - "id": "8212585058302700791" - }, - "dependencies": [ - "module.modA.null_resource.resource" - ] - }, - { - "index_key": "b", - "schema_version": 0, - "attributes_flat": { - "id": "1523897709610803586" - }, - "dependencies": [ - "module.modA.null_resource.resource" - ] - } - ] - }, - { - "module": "module.modA", - "mode": "managed", - "type": "null_resource", - "name": "resource", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "4639265839606265182", - "triggers": { - "input": "test" - } - }, - "private": "bnVsbA==", - "dependencies": [ - "null_resource.bar" - ], - "depends_on": [ - "var.input" - ] - } - ] - } - ] -} +{"version":4,"terraform_version":"0.12.0","serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","outputs":{"numbers":{"value":"0,1","type":"string"}},"resources":[{"mode":"managed","type":"null_resource","name":"bar","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"schema_version":0,"attributes_flat":{"id":"5388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"},"depends_on":["null_resource.foo"]}]},{"module":"module.modB","mode":"managed","type":"null_resource","name":"bar","each":"map","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"index_key":"a","schema_version":0,"attributes_flat":{"id":"8212585058302700791"},"dependencies":["module.modA.null_resource.resource"]},{"index_key":"b","schema_version":0,"attributes_flat":{"id":"1523897709610803586"},"dependencies":["module.modA.null_resource.resource"]}]},{"module":"module.modA","mode":"managed","type":"null_resource","name":"resource","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"schema_version":0,"attributes":{"id":"4639265839606265182","triggers":{"input":"test"}},"private":"bnVsbA==","dependencies":["null_resource.bar"],"depends_on":["var.input"]}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v4-legacy-simple.in.tfstate b/internal/states/statefile/testdata/roundtrip/v4-legacy-simple.in.tfstate index 946c4f82a5..7847d2f610 100644 --- a/internal/states/statefile/testdata/roundtrip/v4-legacy-simple.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v4-legacy-simple.in.tfstate @@ -1,74 +1 @@ -{ - "version": 4, - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "terraform_version": "0.12.0", - "outputs": { - "numbers": { - "type": "string", - "value": "0,1" - } - }, - "resources": [ - { - "mode": "data", - "type": "terraform_remote_state", - "name": "random", - "provider": "provider.terraform", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "backend": "remote" - } - } - ] - }, - { - "mode": "managed", - "type": "null_resource", - "name": "bar", - "provider": "provider.null", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "id": "5388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "depends_on": [ - "null_resource.foo" - ] - } - ] - }, - { - "mode": "managed", - "type": "null_resource", - "name": "foo", - "provider": "provider.null", - "each": "list", - "instances": [ - { - "index_key": 0, - "schema_version": 0, - "attributes_flat": { - "id": "8212585058302700791", - "triggers.%": "1", - "triggers.what": "0" - } - }, - { - "index_key": 1, - "schema_version": 0, - "attributes_flat": { - "id": "1523897709610803586", - "triggers.%": "1", - "triggers.what": "0" - } - } - ] - } - ] -} +{"version":4,"serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","terraform_version":"0.12.0","outputs":{"numbers":{"type":"string","value":"0,1"}},"resources":[{"mode":"data","type":"terraform_remote_state","name":"random","provider":"provider.terraform","instances":[{"schema_version":0,"attributes_flat":{"backend":"remote"}}]},{"mode":"managed","type":"null_resource","name":"bar","provider":"provider.null","instances":[{"schema_version":0,"attributes_flat":{"id":"5388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"},"depends_on":["null_resource.foo"]}]},{"mode":"managed","type":"null_resource","name":"foo","provider":"provider.null","each":"list","instances":[{"index_key":0,"schema_version":0,"attributes_flat":{"id":"8212585058302700791","triggers.%":"1","triggers.what":"0"}},{"index_key":1,"schema_version":0,"attributes_flat":{"id":"1523897709610803586","triggers.%":"1","triggers.what":"0"}}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v4-legacy-simple.out.tfstate b/internal/states/statefile/testdata/roundtrip/v4-legacy-simple.out.tfstate index eeb7a7c002..4164987150 100644 --- a/internal/states/statefile/testdata/roundtrip/v4-legacy-simple.out.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v4-legacy-simple.out.tfstate @@ -1,74 +1 @@ -{ - "version": 4, - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "terraform_version": "0.12.0", - "outputs": { - "numbers": { - "type": "string", - "value": "0,1" - } - }, - "resources": [ - { - "mode": "data", - "type": "terraform_remote_state", - "name": "random", - "provider": "provider[\"terraform.io/builtin/terraform\"]", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "backend": "remote" - } - } - ] - }, - { - "mode": "managed", - "type": "null_resource", - "name": "bar", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "id": "5388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "depends_on": [ - "null_resource.foo" - ] - } - ] - }, - { - "mode": "managed", - "type": "null_resource", - "name": "foo", - "provider": "provider.null", - "each": "list", - "instances": [ - { - "index_key": 0, - "schema_version": 0, - "attributes_flat": { - "id": "8212585058302700791", - "triggers.%": "1", - "triggers.what": "0" - } - }, - { - "index_key": 1, - "schema_version": 0, - "attributes_flat": { - "id": "1523897709610803586", - "triggers.%": "1", - "triggers.what": "0" - } - } - ] - } - ] -} +{"version":4,"serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","terraform_version":"0.12.0","outputs":{"numbers":{"type":"string","value":"0,1"}},"resources":[{"mode":"data","type":"terraform_remote_state","name":"random","provider":"provider[\"terraform.io/builtin/terraform\"]","instances":[{"schema_version":0,"attributes_flat":{"backend":"remote"}}]},{"mode":"managed","type":"null_resource","name":"bar","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"schema_version":0,"attributes_flat":{"id":"5388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"},"depends_on":["null_resource.foo"]}]},{"mode":"managed","type":"null_resource","name":"foo","provider":"provider.null","each":"list","instances":[{"index_key":0,"schema_version":0,"attributes_flat":{"id":"8212585058302700791","triggers.%":"1","triggers.what":"0"}},{"index_key":1,"schema_version":0,"attributes_flat":{"id":"1523897709610803586","triggers.%":"1","triggers.what":"0"}}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v4-modules.in.tfstate b/internal/states/statefile/testdata/roundtrip/v4-modules.in.tfstate index 6676d6c0d2..2f8cdd1e1b 100644 --- a/internal/states/statefile/testdata/roundtrip/v4-modules.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v4-modules.in.tfstate @@ -1,88 +1 @@ -{ - "version": 4, - "terraform_version": "0.12.0", - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "outputs": { - "numbers": { - "value": "0,1", - "type": "string" - } - }, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "bar", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "id": "5388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "depends_on": [ - "null_resource.foo" - ] - } - ] - }, - { - "module": "module.modB", - "mode": "managed", - "type": "null_resource", - "name": "bar", - "each": "map", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "index_key": "a", - "schema_version": 0, - "attributes_flat": { - "id": "8212585058302700791" - }, - "dependencies": [ - "module.modA.null_resource.resource" - ] - }, - { - "index_key": "b", - "schema_version": 0, - "attributes_flat": { - "id": "1523897709610803586" - }, - "dependencies": [ - "module.modA.null_resource.resource" - ] - } - ] - }, - { - "module": "module.modA", - "mode": "managed", - "type": "null_resource", - "name": "resource", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "4639265839606265182", - "triggers": { - "input": "test" - } - }, - "private": "bnVsbA==", - "dependencies": [ - "null_resource.bar" - ], - "depends_on": [ - "var.input" - ] - } - ] - } - ] -} +{"version":4,"terraform_version":"0.12.0","serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","outputs":{"numbers":{"value":"0,1","type":"string"}},"resources":[{"mode":"managed","type":"null_resource","name":"bar","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"schema_version":0,"attributes_flat":{"id":"5388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"},"depends_on":["null_resource.foo"]}]},{"module":"module.modB","mode":"managed","type":"null_resource","name":"bar","each":"map","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"index_key":"a","schema_version":0,"attributes_flat":{"id":"8212585058302700791"},"dependencies":["module.modA.null_resource.resource"]},{"index_key":"b","schema_version":0,"attributes_flat":{"id":"1523897709610803586"},"dependencies":["module.modA.null_resource.resource"]}]},{"module":"module.modA","mode":"managed","type":"null_resource","name":"resource","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"schema_version":0,"attributes":{"id":"4639265839606265182","triggers":{"input":"test"}},"private":"bnVsbA==","dependencies":["null_resource.bar"],"depends_on":["var.input"]}]}]} diff --git a/internal/states/statefile/testdata/roundtrip/v4-simple.in.tfstate b/internal/states/statefile/testdata/roundtrip/v4-simple.in.tfstate index 9038a22ada..c06f44a554 100644 --- a/internal/states/statefile/testdata/roundtrip/v4-simple.in.tfstate +++ b/internal/states/statefile/testdata/roundtrip/v4-simple.in.tfstate @@ -1,60 +1 @@ -{ - "version": 4, - "serial": 0, - "lineage": "f2968801-fa14-41ab-a044-224f3a4adf04", - "terraform_version": "0.12.0", - "outputs": { - "numbers": { - "type": "string", - "value": "0,1" - } - }, - "resources": [ - { - "mode": "managed", - "type": "null_resource", - "name": "bar", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "instances": [ - { - "schema_version": 0, - "attributes_flat": { - "id": "5388490630832483079", - "triggers.%": "1", - "triggers.whaaat": "0,1" - }, - "depends_on": [ - "null_resource.foo" - ] - } - ] - }, - { - "mode": "managed", - "type": "null_resource", - "name": "foo", - "provider": "provider[\"registry.opentofu.org/-/null\"]", - "each": "list", - "instances": [ - { - "index_key": 0, - "schema_version": 0, - "attributes_flat": { - "id": "8212585058302700791", - "triggers.%": "1", - "triggers.what": "0" - } - }, - { - "index_key": 1, - "schema_version": 0, - "attributes_flat": { - "id": "1523897709610803586", - "triggers.%": "1", - "triggers.what": "0" - } - } - ] - } - ] -} +{"version":4,"serial":0,"lineage":"f2968801-fa14-41ab-a044-224f3a4adf04","terraform_version":"0.12.0","outputs":{"numbers":{"type":"string","value":"0,1"}},"resources":[{"mode":"managed","type":"null_resource","name":"bar","provider":"provider[\"registry.opentofu.org/-/null\"]","instances":[{"schema_version":0,"attributes_flat":{"id":"5388490630832483079","triggers.%":"1","triggers.whaaat":"0,1"},"depends_on":["null_resource.foo"]}]},{"mode":"managed","type":"null_resource","name":"foo","provider":"provider[\"registry.opentofu.org/-/null\"]","each":"list","instances":[{"index_key":0,"schema_version":0,"attributes_flat":{"id":"8212585058302700791","triggers.%":"1","triggers.what":"0"}},{"index_key":1,"schema_version":0,"attributes_flat":{"id":"1523897709610803586","triggers.%":"1","triggers.what":"0"}}]}]} diff --git a/internal/states/statefile/version4.go b/internal/states/statefile/version4.go index 41c5471097..d7907a381e 100644 --- a/internal/states/statefile/version4.go +++ b/internal/states/statefile/version4.go @@ -424,7 +424,7 @@ func writeStateV4(file *File, w io.Writer, enc encryption.StateEncryption) tfdia sV4.normalize() - src, err := json.MarshalIndent(sV4, "", " ") + src, err := json.Marshal(sV4) if err != nil { // Shouldn't happen if we do our conversion to *stateV4 correctly above. diags = diags.Append(tfdiags.Sourceless(