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

Add ShowOption for configuring JSON decoding #427

Merged
merged 8 commits into from
Dec 20, 2023
Merged

Add ShowOption for configuring JSON decoding #427

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9e073d4
Adding ShowOption for JSON handling (#426)
bendbennett Dec 8, 2023
d1eee8e
Temporarily pointing at terraform-json PR for dependent changes (#426)
bendbennett Dec 8, 2023
309258f
Ignoring fields that differ between TF versions (#426)
bendbennett Dec 8, 2023
d64e88d
Rename structs and func (#426)
bendbennett Dec 14, 2023
ddc87e4
Removing redundant struct (#426)
bendbennett Dec 14, 2023
ad07ae8
Update tfexec/options.go
bendbennett Dec 18, 2023
85ec015
Updating to use renamed struct (#426)
bendbennett Dec 18, 2023
513872d
Bumping terraform-json to v0.19.0 (#426)
bendbennett Dec 20, 2023
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 @@ -6,7 +6,7 @@ require (
github.com/google/go-cmp v0.6.0
github.com/hashicorp/go-version v1.6.0
github.com/hashicorp/hc-install v0.6.2
github.com/hashicorp/terraform-json v0.18.0
github.com/hashicorp/terraform-json v0.18.1-0.20231207151239-da9b6fa7714c
bendbennett marked this conversation as resolved.
Show resolved Hide resolved
github.com/zclconf/go-cty v1.14.1
github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mO
github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/hashicorp/hc-install v0.6.2 h1:V1k+Vraqz4olgZ9UzKiAcbman9i9scg9GgSt/U3mw/M=
github.com/hashicorp/hc-install v0.6.2/go.mod h1:2JBpd+NCFKiHiu/yYCGaPyPHhZLxXTpz8oreHa/a3Ps=
github.com/hashicorp/terraform-json v0.18.0 h1:pCjgJEqqDESv4y0Tzdqfxr/edOIGkjs8keY42xfNBwU=
github.com/hashicorp/terraform-json v0.18.0/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk=
github.com/hashicorp/terraform-json v0.18.1-0.20231207151239-da9b6fa7714c h1:BjxlDdtxdtm5AdJjYEQGdkJ05534/zFNSwFsCG20KcE=
github.com/hashicorp/terraform-json v0.18.1-0.20231207151239-da9b6fa7714c/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
Expand Down
6 changes: 4 additions & 2 deletions tfexec/internal/e2etest/cmp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ func diffState(expected *tfjson.State, actual *tfjson.State) string {

// diffPlan returns a human-readable report of the differences between two
// plan values. It returns an empty string if the two values are equal.
func diffPlan(expected *tfjson.Plan, actual *tfjson.Plan) string {
return cmp.Diff(expected, actual, cmpopts.IgnoreFields(tfjson.Plan{}, "TerraformVersion"))
func diffPlan(expected *tfjson.Plan, actual *tfjson.Plan, opts ...cmp.Option) string {
opts = append(opts, cmpopts.IgnoreFields(tfjson.Plan{}, "TerraformVersion", "useJSONNumber"))

return cmp.Diff(expected, actual, opts...)
}

// diffSchema returns a human-readable report of the differences between two
Expand Down
Loading
Loading