Skip to content

Commit 6b43b98

Browse files
authored
[QT-621] cty: use a fork of go-cty that fixes a panic when decoding (#112)
Use a fork of `go-cty` that fixes a panic when decoding a Terraform settings that have attributes set to `null`. After it has been fixed upstream[0] we should go back to relying on on the upstream stable release. [0] zclconf/go-cty#171 Signed-off-by: Ryan Cragun <[email protected]>
1 parent 686757b commit 6b43b98

File tree

4 files changed

+53
-91
lines changed

4 files changed

+53
-91
lines changed

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ linters:
9494
- goheader
9595
- golint
9696
- gomnd
97+
- gomoddirectives # until we remove our go-cty fork
9798
- ifshort
9899
- importas
99100
- interfacer

go.mod

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ module github.com/hashicorp/enos
22

33
go 1.21.0
44

5+
// https://github.com/ryancragun/go-cty/commit/b70d2866762dd2a09605c9755d4e8d997518f0c4
6+
replace github.com/zclconf/go-cty => github.com/ryancragun/go-cty v1.10.1-0.20230928174205-b70d2866762d
7+
58
require (
69
github.com/Masterminds/semver/v3 v3.2.1
710
github.com/aws/aws-sdk-go-v2/config v1.18.39
@@ -20,17 +23,16 @@ require (
2023
github.com/stretchr/testify v1.8.4
2124
github.com/zclconf/go-cty v1.14.0
2225
golang.org/x/net v0.15.0
23-
golang.org/x/term v0.12.0
26+
golang.org/x/term v0.13.0
2427
golang.org/x/text v0.13.0
25-
google.golang.org/grpc v1.58.0
28+
google.golang.org/grpc v1.58.2
2629
google.golang.org/protobuf v1.31.0
2730
)
2831

2932
require (
3033
github.com/Masterminds/goutils v1.1.1 // indirect
3134
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
3235
github.com/agext/levenshtein v1.2.3 // indirect
33-
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
3436
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
3537
github.com/armon/go-radix v1.0.0 // indirect
3638
github.com/aws/aws-sdk-go-v2 v1.21.0 // indirect
@@ -65,8 +67,8 @@ require (
6567
github.com/shopspring/decimal v1.3.1 // indirect
6668
github.com/spf13/cast v1.5.1 // indirect
6769
github.com/spf13/pflag v1.0.5 // indirect
68-
golang.org/x/crypto v0.13.0 // indirect
69-
golang.org/x/sys v0.12.0 // indirect
70-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect
70+
golang.org/x/crypto v0.14.0 // indirect
71+
golang.org/x/sys v0.13.0 // indirect
72+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
7173
gopkg.in/yaml.v3 v3.0.1 // indirect
7274
)

0 commit comments

Comments
 (0)