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

Use json.Number instead of float64 when parsing state. #113

Merged
merged 5 commits into from
Dec 17, 2020
Merged

Use json.Number instead of float64 when parsing state. #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
106c67f
Use json.Number instead of float64 when parsing state.
paddycarver Dec 16, 2020
834cb4c
Update terraform-json.
paddycarver Dec 16, 2020
d95cbb1
Update to use tfjson's new optional json.Number behavior.
paddycarver Dec 16, 2020
3644a78
Use tagged terraform-json release.
paddycarver Dec 16, 2020
6e1a977
Ignore useJSONNumber in cmp.
paddycarver Dec 16, 2020
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/hashicorp/go-getter v1.4.0
github.com/hashicorp/go-version v1.2.1
github.com/hashicorp/logutils v1.0.0
github.com/hashicorp/terraform-json v0.7.0
github.com/hashicorp/terraform-json v0.8.0
github.com/mitchellh/cli v1.1.1
github.com/sergi/go-diff v1.1.0
github.com/stretchr/testify v1.6.1
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,8 @@ github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
github.com/hashicorp/terraform-json v0.5.0 h1:7TV3/F3y7QVSuN4r9BEXqnWqrAyeOtON8f0wvREtyzs=
github.com/hashicorp/terraform-json v0.5.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU=
github.com/hashicorp/terraform-json v0.7.0 h1:DgkfLARKMQ/xmzVtSRX9Vz/fzPCL3vskHIgj6s+SQwQ=
github.com/hashicorp/terraform-json v0.7.0/go.mod h1:3defM4kkMfttwiE7VakJDwCd4R+umhSQnvJwORXbprE=
github.com/hashicorp/terraform-json v0.8.0 h1:XObQ3PgqU52YLQKEaJ08QtUshAfN3yu4u8ebSW0vztc=
github.com/hashicorp/terraform-json v0.8.0/go.mod h1:3defM4kkMfttwiE7VakJDwCd4R+umhSQnvJwORXbprE=
github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
Expand Down
4 changes: 3 additions & 1 deletion tfexec/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,9 @@ func (tf *Terraform) runTerraformCmdJSON(cmd *exec.Cmd, v interface{}) error {
return err
}

return json.Unmarshal(outbuf.Bytes(), v)
dec := json.NewDecoder(&outbuf)
dec.UseNumber()
return dec.Decode(v)
}

func (tf *Terraform) runTerraformCmd(cmd *exec.Cmd) error {
Expand Down
2 changes: 1 addition & 1 deletion tfexec/internal/e2etest/cmp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
// diffState returns a human-readable report of the differences between two
// state values. It returns an empty string if the two values are equal.
func diffState(expected *tfjson.State, actual *tfjson.State) string {
return cmp.Diff(expected, actual, cmpopts.IgnoreFields(tfjson.State{}, "TerraformVersion"))
return cmp.Diff(expected, actual, cmpopts.IgnoreFields(tfjson.State{}, "TerraformVersion"), cmpopts.IgnoreFields(tfjson.State{}, "useJSONNumber"))
}

// diffPlan returns a human-readable report of the differences between two
Expand Down
2 changes: 2 additions & 0 deletions tfexec/show.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ func (tf *Terraform) Show(ctx context.Context, opts ...ShowOption) (*tfjson.Stat
showCmd := tf.showCmd(ctx, true, mergeEnv)

var ret tfjson.State
ret.UseJSONNumber(true)
err = tf.runTerraformCmdJSON(showCmd, &ret)
if err != nil {
return nil, err
Expand Down Expand Up @@ -91,6 +92,7 @@ func (tf *Terraform) ShowStateFile(ctx context.Context, statePath string, opts .
showCmd := tf.showCmd(ctx, true, mergeEnv, statePath)

var ret tfjson.State
ret.UseJSONNumber(true)
err = tf.runTerraformCmdJSON(showCmd, &ret)
if err != nil {
return nil, err
Expand Down