Skip to content

Commit 98960ab

Browse files
authored
Merge pull request #116 from planetscale/joem/switch-to-go-1.24-tool
chore(tools): switch to go 1.24's tool
2 parents fb13306 + db80a04 commit 98960ab

File tree

4 files changed

+30
-21
lines changed

4 files changed

+30
-21
lines changed

GNUmakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ testacc:
1515

1616
.PHONY: generate-docs
1717
generate-docs:
18-
go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
18+
go tool github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
1919

2020
.PHONY: generate
2121
generate:

go.mod

+11-9
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/dave/jennifer v1.7.1
99
github.com/go-openapi/loads v0.22.0
1010
github.com/go-openapi/spec v0.21.0
11-
github.com/hashicorp/terraform-plugin-docs v0.20.1
11+
github.com/hashicorp/terraform-plugin-docs v0.21.0
1212
github.com/hashicorp/terraform-plugin-framework v1.13.0
1313
github.com/hashicorp/terraform-plugin-framework-validators v0.16.0
1414
github.com/hashicorp/terraform-plugin-go v0.25.0
@@ -29,13 +29,13 @@ require (
2929
github.com/Masterminds/goutils v1.1.1 // indirect
3030
github.com/Masterminds/semver/v3 v3.2.0 // indirect
3131
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
32-
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
32+
github.com/ProtonMail/go-crypto v1.1.3 // indirect
3333
github.com/agext/levenshtein v1.2.2 // indirect
3434
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
3535
github.com/armon/go-radix v1.0.0 // indirect
3636
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3737
github.com/bgentry/speakeasy v0.1.0 // indirect
38-
github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
38+
github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
3939
github.com/cloudflare/circl v1.3.7 // indirect
4040
github.com/fatih/color v1.17.0 // indirect
4141
github.com/frankban/quicktest v1.14.5 // indirect
@@ -48,7 +48,7 @@ require (
4848
github.com/golang/protobuf v1.5.4 // indirect
4949
github.com/google/go-cmp v0.6.0 // indirect
5050
github.com/google/uuid v1.6.0 // indirect
51-
github.com/hashicorp/cli v1.1.6 // indirect
51+
github.com/hashicorp/cli v1.1.7 // indirect
5252
github.com/hashicorp/errwrap v1.1.0 // indirect
5353
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
5454
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -59,19 +59,19 @@ require (
5959
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
6060
github.com/hashicorp/go-uuid v1.0.3 // indirect
6161
github.com/hashicorp/go-version v1.7.0 // indirect
62-
github.com/hashicorp/hc-install v0.9.0 // indirect
62+
github.com/hashicorp/hc-install v0.9.1 // indirect
6363
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
6464
github.com/hashicorp/logutils v1.0.0 // indirect
65-
github.com/hashicorp/terraform-exec v0.21.0 // indirect
66-
github.com/hashicorp/terraform-json v0.23.0 // indirect
65+
github.com/hashicorp/terraform-exec v0.22.0 // indirect
66+
github.com/hashicorp/terraform-json v0.24.0 // indirect
6767
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
6868
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
6969
github.com/hashicorp/yamux v0.1.1 // indirect
7070
github.com/huandu/xstrings v1.3.3 // indirect
7171
github.com/imdario/mergo v0.3.15 // indirect
7272
github.com/josharian/intern v1.0.0 // indirect
7373
github.com/mailru/easyjson v0.7.7 // indirect
74-
github.com/mattn/go-colorable v0.1.13 // indirect
74+
github.com/mattn/go-colorable v0.1.14 // indirect
7575
github.com/mattn/go-isatty v0.0.20 // indirect
7676
github.com/mattn/go-runewidth v0.0.9 // indirect
7777
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -89,7 +89,7 @@ require (
8989
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
9090
github.com/yuin/goldmark v1.7.7 // indirect
9191
github.com/yuin/goldmark-meta v1.1.0 // indirect
92-
github.com/zclconf/go-cty v1.15.0 // indirect
92+
github.com/zclconf/go-cty v1.16.2 // indirect
9393
go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
9494
go.mongodb.org/mongo-driver v1.14.0 // indirect
9595
golang.org/x/crypto v0.35.0 // indirect
@@ -105,3 +105,5 @@ require (
105105
gopkg.in/yaml.v2 v2.4.0 // indirect
106106
gopkg.in/yaml.v3 v3.0.1 // indirect
107107
)
108+
109+
tool github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs

go.sum

+18
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc
1414
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
1515
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg=
1616
github.com/ProtonMail/go-crypto v1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
17+
github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
18+
github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
1719
github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
1820
github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
1921
github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
@@ -27,6 +29,8 @@ github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQ
2729
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
2830
github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
2931
github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
32+
github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
33+
github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
3034
github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
3135
github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
3236
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
@@ -87,6 +91,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
8791
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
8892
github.com/hashicorp/cli v1.1.6 h1:CMOV+/LJfL1tXCOKrgAX0uRKnzjj/mpmqNXloRSy2K8=
8993
github.com/hashicorp/cli v1.1.6/go.mod h1:MPon5QYlgjjo0BSoAiN0ESeT5fRzDjVRp+uioJ0piz4=
94+
github.com/hashicorp/cli v1.1.7 h1:/fZJ+hNdwfTSfsxMBa9WWMlfjUZbX8/LnUxgAd7lCVU=
95+
github.com/hashicorp/cli v1.1.7/go.mod h1:e6Mfpga9OCT1vqzFuoGZiiF/KaG9CbUfO5s3ghU3YgU=
9096
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
9197
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
9298
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -113,16 +119,24 @@ github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKe
113119
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
114120
github.com/hashicorp/hc-install v0.9.0 h1:2dIk8LcvANwtv3QZLckxcjyF5w8KVtiMxu6G6eLhghE=
115121
github.com/hashicorp/hc-install v0.9.0/go.mod h1:+6vOP+mf3tuGgMApVYtmsnDoKWMDcFXeTxCACYZ8SFg=
122+
github.com/hashicorp/hc-install v0.9.1 h1:gkqTfE3vVbafGQo6VZXcy2v5yoz2bE0+nhZXruCuODQ=
123+
github.com/hashicorp/hc-install v0.9.1/go.mod h1:pWWvN/IrfeBK4XPeXXYkL6EjMufHkCK5DvwxeLKuBf0=
116124
github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos=
117125
github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=
118126
github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
119127
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
120128
github.com/hashicorp/terraform-exec v0.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVWkd/RG0D2XQ=
121129
github.com/hashicorp/terraform-exec v0.21.0/go.mod h1:1PPeMYou+KDUSSeRE9szMZ/oHf4fYUmB923Wzbq1ICg=
130+
github.com/hashicorp/terraform-exec v0.22.0 h1:G5+4Sz6jYZfRYUCg6eQgDsqTzkNXV+fP8l+uRmZHj64=
131+
github.com/hashicorp/terraform-exec v0.22.0/go.mod h1:bjVbsncaeh8jVdhttWYZuBGj21FcYw6Ia/XfHcNO7lQ=
122132
github.com/hashicorp/terraform-json v0.23.0 h1:sniCkExU4iKtTADReHzACkk8fnpQXrdD2xoR+lppBkI=
123133
github.com/hashicorp/terraform-json v0.23.0/go.mod h1:MHdXbBAbSg0GvzuWazEGKAn/cyNfIB7mN6y7KJN6y2c=
134+
github.com/hashicorp/terraform-json v0.24.0 h1:rUiyF+x1kYawXeRth6fKFm/MdfBS6+lW4NbeATsYz8Q=
135+
github.com/hashicorp/terraform-json v0.24.0/go.mod h1:Nfj5ubo9xbu9uiAoZVBsNOjvNKB66Oyrvtit74kC7ow=
124136
github.com/hashicorp/terraform-plugin-docs v0.20.1 h1:Fq7E/HrU8kuZu3hNliZGwloFWSYfWEOWnylFhYQIoys=
125137
github.com/hashicorp/terraform-plugin-docs v0.20.1/go.mod h1:Yz6HoK7/EgzSrHPB9J/lWFzwl9/xep2OPnc5jaJDV90=
138+
github.com/hashicorp/terraform-plugin-docs v0.21.0 h1:yoyA/Y719z9WdFJAhpUkI1jRbKP/nteVNBaI3hW7iQ8=
139+
github.com/hashicorp/terraform-plugin-docs v0.21.0/go.mod h1:J4Wott1J2XBKZPp/NkQv7LMShJYOcrqhQ2myXBcu64s=
126140
github.com/hashicorp/terraform-plugin-framework v1.13.0 h1:8OTG4+oZUfKgnfTdPTJwZ532Bh2BobF4H+yBiYJ/scw=
127141
github.com/hashicorp/terraform-plugin-framework v1.13.0/go.mod h1:j64rwMGpgM3NYXTKuxrCnyubQb/4VKldEKlcG8cvmjU=
128142
github.com/hashicorp/terraform-plugin-framework-validators v0.16.0 h1:O9QqGoYDzQT7lwTXUsZEtgabeWW96zUBh47Smn2lkFA=
@@ -167,6 +181,8 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
167181
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
168182
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
169183
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
184+
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
185+
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
170186
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
171187
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
172188
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@@ -237,6 +253,8 @@ github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUei
237253
github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0=
238254
github.com/zclconf/go-cty v1.15.0 h1:tTCRWxsexYUmtt/wVxgDClUe+uQusuI443uL6e+5sXQ=
239255
github.com/zclconf/go-cty v1.15.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
256+
github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=
257+
github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
240258
github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
241259
github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
242260
go.abhg.dev/goldmark/frontmatter v0.2.0 h1:P8kPG0YkL12+aYk2yU3xHv4tcXzeVnN+gU0tJ5JnxRw=

tools/tools.go

-11
This file was deleted.

0 commit comments

Comments
 (0)