Skip to content

Commit 30503e2

Browse files
apparentlymartgenx7up
authored andcommitted
go.mod: Revert cty minor version v1.13 upgrade
We inadvertently incorporated the new minor release of cty into the 1.4 branch, and that's introduced some more refined handling of unknown values that is too much of a change to introduce in a patch release. Therefore this reverts back to the previous minor release for the v1.4 series, and then we'll separately get the main branch ready to work correctly with the new cty before Terraform v1.5. This reverts just the upgrade and the corresponding test changes from hashicorp#32775, while retaining the HCL upgrade and the new test case it introduced for that bug it was trying to fix. That new test is still passing so it seems that the cty upgrade is not crucial to that fix.
1 parent e3beb35 commit 30503e2

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ require (
7676
github.com/tombuildsstuff/giovanni v0.15.1
7777
github.com/xanzy/ssh-agent v0.3.1
7878
github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557
79-
github.com/zclconf/go-cty v1.13.0
79+
github.com/zclconf/go-cty v1.12.1
8080
github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b
8181
github.com/zclconf/go-cty-yaml v1.0.3
8282
golang.org/x/crypto v0.1.0
@@ -172,8 +172,8 @@ require (
172172
github.com/spf13/pflag v1.0.5 // indirect
173173
github.com/stretchr/objx v0.5.0 // indirect
174174
github.com/ulikunitz/xz v0.5.10 // indirect
175-
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
176-
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
175+
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
176+
github.com/vmihailenco/tagparser v0.1.1 // indirect
177177
go.opencensus.io v0.23.0 // indirect
178178
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
179179
golang.org/x/time v0.3.0 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -778,10 +778,10 @@ github.com/tombuildsstuff/giovanni v0.15.1/go.mod h1:0TZugJPEtqzPlMpuJHYfXY6Dq2u
778778
github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=
779779
github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
780780
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
781-
github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
782-
github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
783-
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
784-
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
781+
github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U=
782+
github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
783+
github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY=
784+
github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
785785
github.com/xanzy/ssh-agent v0.3.1 h1:AmzO1SSWxw73zxFZPRwaMN1MohDw8UyHnmuxyceTEGo=
786786
github.com/xanzy/ssh-agent v0.3.1/go.mod h1:QIE4lCeL7nkC25x+yA3LBIYfwCc1TFziCtG7cBAac6w=
787787
github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557 h1:Jpn2j6wHkC9wJv5iMfJhKqrZJx3TahFx+7sbZ7zQdxs=
@@ -795,8 +795,8 @@ github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
795795
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
796796
github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
797797
github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8=
798-
github.com/zclconf/go-cty v1.13.0 h1:It5dfKTTZHe9aeppbNOda3mN7Ag7sg6QkBNm6TkyFa0=
799-
github.com/zclconf/go-cty v1.13.0/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0=
798+
github.com/zclconf/go-cty v1.12.1 h1:PcupnljUm9EIvbgSHQnHhUr3fO6oFmkOrvs2BAFNXXY=
799+
github.com/zclconf/go-cty v1.12.1/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA=
800800
github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b h1:FosyBZYxY34Wul7O/MSKey3txpPYyCqVO5ZyceuQJEI=
801801
github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8=
802802
github.com/zclconf/go-cty-yaml v1.0.3 h1:og/eOQ7lvA/WWhHGFETVWNduJM7Rjsv2RRpx1sdFMLc=

internal/lang/funcs/collection_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestLength(t *testing.T) {
6868
},
6969
{
7070
cty.UnknownVal(cty.List(cty.Bool)),
71-
cty.UnknownVal(cty.Number).Refine().NotNull().NumberRangeInclusive(cty.NumberIntVal(0), cty.NumberIntVal(math.MaxInt64)).NewValue(),
71+
cty.UnknownVal(cty.Number),
7272
},
7373
{
7474
cty.DynamicVal,
@@ -117,7 +117,7 @@ func TestLength(t *testing.T) {
117117
},
118118
{
119119
cty.UnknownVal(cty.String),
120-
cty.UnknownVal(cty.Number).Refine().NotNull().NumberRangeLowerBound(cty.NumberIntVal(0), true).NewValue(),
120+
cty.UnknownVal(cty.Number),
121121
},
122122
{
123123
cty.DynamicVal,

0 commit comments

Comments
 (0)