Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

states/statefile: decode backend hash as uint64 #21484

Merged
merged 1 commit into from
Jun 10, 2019
Merged

states/statefile: decode backend hash as uint64 #21484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 136 additions & 0 deletions states/statefile/testdata/roundtrip/v3-bigint.in.tfstate
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
{
"version": 3,
"terraform_version": "0.11.1",
"serial": 8,
"lineage": "0f5b2ff9-6ff5-8e9e-1f81-aa3ce9a483eb",
"backend": {
"hash": 10669755453527594976
},
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file was copied from v3-grabbag.in.tfstate and the following lines are added.

[terraform@fix-statev2-hash-decode|✔]$ diff -u states/statefile/testdata/roundtrip/{v3-grabbag.in.tfstate,v3-bigint.in.tfstate}
--- states/statefile/testdata/roundtrip/v3-grabbag.in.tfstate   2018-12-13 11:18:13.000000000 +0900
+++ states/statefile/testdata/roundtrip/v3-bigint.in.tfstate    2019-05-28 23:56:58.000000000 +0900
@@ -3,6 +3,9 @@
     "terraform_version": "0.11.1",
     "serial": 8,
     "lineage": "0f5b2ff9-6ff5-8e9e-1f81-aa3ce9a483eb",
+    "backend": {
+        "hash": 10669755453527594976
+    },
     "modules": [
         {
             "path": [

"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": []
}
]
}
97 changes: 97 additions & 0 deletions states/statefile/testdata/roundtrip/v3-bigint.out.tfstate
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
{
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file was only copied from v3-grabbag.out.tfstate

"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": "604776346677326098",
"triggers.%": "1",
"triggers.index": "0"
},
"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
}
]
}
]
}
2 changes: 1 addition & 1 deletion states/statefile/version2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,5 +205,5 @@ type instanceStateV2 struct {
type backendStateV2 struct {
Type string `json:"type"` // Backend type
ConfigRaw json.RawMessage `json:"config"` // Backend raw config
Hash int `json:"hash"` // Hash of portion of configuration from config files
Hash uint64 `json:"hash"` // Hash of portion of configuration from config files
}