Skip to content

Commit 6ebea76

Browse files
authored
terraform library upgrades (#375)
Manually update these dependencies because there is some incompatibility between versions which prevented the individual dependabot upgrades from working. The Terraform libraries had a recent update which seems to have broke some inter-dependency causing compiler errors: ``` # github.com/hashicorp/terraform-plugin-mux/internal/tfprotov5tov6 Error: ../../../go/pkg/mod/github.com/hashicorp/[email protected]/internal/tfprotov5tov6/tfprotov5tov6.go:62:3: unknown field Diagnostics in struct literal of type tfprotov6.CallFunctionResponse Error: ../../../go/pkg/mod/github.com/hashicorp/[email protected]/internal/tfprotov5tov6/tfprotov5tov6.go:62:31: in.Diagnostics undefined (type *tfprotov5.CallFunctionResponse has no field or method Diagnostics) # github.com/hashicorp/terraform-plugin-mux/internal/tfprotov6tov5 Error: ../../../go/pkg/mod/github.com/hashicorp/[email protected]/internal/tfprotov6tov5/tfprotov6tov5.go:67:3: unknown field Diagnostics in struct literal of type tfprotov5.CallFunctionResponse Error: ../../../go/pkg/mod/github.com/hashicorp/[email protected]/internal/tfprotov6tov5/tfprotov6tov5.go:67:31: in.Diagnostics undefined (type *tfprotov6.CallFunctionResponse has no field or method Diagnostics) ``` See #374 for example. Upgrading the dependencies together seems to work fine.
1 parent aac26e0 commit 6ebea76

File tree

5 files changed

+63
-58
lines changed

5 files changed

+63
-58
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
- uses: actions/setup-go@v5
1616
with:
17-
go-version: '1.20'
17+
go-version: '1.22'
1818

1919
- uses: hashicorp/setup-terraform@v3
2020
with:
@@ -48,7 +48,7 @@ jobs:
4848

4949
- uses: actions/setup-go@v5
5050
with:
51-
go-version: '1.20'
51+
go-version: '1.22'
5252

5353
- uses: actions/checkout@v4
5454

@@ -71,7 +71,7 @@ jobs:
7171
steps:
7272
- uses: actions/setup-go@v5
7373
with:
74-
go-version: '1.20'
74+
go-version: '1.22'
7575

7676
- uses: actions/checkout@v4
7777

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- uses: actions/setup-go@v5
2626
with:
27-
go-version: '1.20'
27+
go-version: '1.22'
2828

2929
- name: Import GPG key
3030
id: import_gpg

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ The [examples diretory](./examples) contains example configuration for the vario
7272
7373
### Build the provider from source
7474
75-
The build requires [Go](https://golang.org/doc/install) >= 1.20
75+
The build requires [Go](https://golang.org/doc/install) >= 1.22
7676
7777
In order to develop and test this provider, you'll need to configure your local environment
7878
with a custom Terraform [config file](https://developer.hashicorp.com/terraform/cli/config/config-file).

go.mod

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/datastax/terraform-provider-astra/v2
22

3-
go 1.20
3+
go 1.21
4+
5+
toolchain go1.22.0
46

57
require (
68
github.com/datastax/astra-client-go/v2 v2.2.52
@@ -9,12 +11,12 @@ require (
911
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
1012
github.com/hashicorp/go-retryablehttp v0.7.5
1113
github.com/hashicorp/terraform-plugin-docs v0.18.0
12-
github.com/hashicorp/terraform-plugin-framework v1.5.0
14+
github.com/hashicorp/terraform-plugin-framework v1.6.0
1315
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
14-
github.com/hashicorp/terraform-plugin-go v0.21.0
16+
github.com/hashicorp/terraform-plugin-go v0.22.0
1517
github.com/hashicorp/terraform-plugin-log v0.9.0
16-
github.com/hashicorp/terraform-plugin-mux v0.14.0
17-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.32.0
18+
github.com/hashicorp/terraform-plugin-mux v0.15.0
19+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
1820
github.com/stretchr/testify v1.8.4
1921
github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210625132053-af2d5c0ad54f
2022

@@ -25,7 +27,7 @@ require (
2527
github.com/Masterminds/goutils v1.1.1 // indirect
2628
github.com/Masterminds/semver/v3 v3.2.0 // indirect
2729
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
28-
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
30+
github.com/ProtonMail/go-crypto v1.1.0-alpha.0 // indirect
2931
github.com/agext/levenshtein v1.2.2 // indirect
3032
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
3133
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
@@ -50,7 +52,7 @@ require (
5052
github.com/hashicorp/go-plugin v1.6.0 // indirect
5153
github.com/hashicorp/go-uuid v1.0.3 // indirect
5254
github.com/hashicorp/go-version v1.6.0 // indirect
53-
github.com/hashicorp/hc-install v0.6.2 // indirect
55+
github.com/hashicorp/hc-install v0.6.3 // indirect
5456
github.com/hashicorp/hcl/v2 v2.19.1 // indirect
5557
github.com/hashicorp/logutils v1.0.0 // indirect
5658
github.com/hashicorp/terraform-exec v0.20.0 // indirect
@@ -84,15 +86,15 @@ require (
8486
github.com/yuin/goldmark v1.6.0 // indirect
8587
github.com/yuin/goldmark-meta v1.1.0 // indirect
8688
github.com/zclconf/go-cty v1.14.2 // indirect
87-
golang.org/x/crypto v0.18.0 // indirect
89+
golang.org/x/crypto v0.19.0 // indirect
8890
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
89-
golang.org/x/mod v0.14.0 // indirect
90-
golang.org/x/net v0.18.0 // indirect
91-
golang.org/x/sys v0.16.0 // indirect
91+
golang.org/x/mod v0.15.0 // indirect
92+
golang.org/x/net v0.20.0 // indirect
93+
golang.org/x/sys v0.17.0 // indirect
9294
golang.org/x/text v0.14.0 // indirect
9395
google.golang.org/appengine v1.6.8 // indirect
94-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
95-
google.golang.org/grpc v1.61.0 // indirect
96+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
97+
google.golang.org/grpc v1.62.0 // indirect
9698
google.golang.org/protobuf v1.32.0 // indirect
9799
gopkg.in/yaml.v2 v2.4.0 // indirect
98100
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)