Skip to content

Commit

Permalink
terraform library upgrades (#375)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
pgier authored Feb 29, 2024
1 parent aac26e0 commit 6ebea76
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 58 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.22'

- uses: hashicorp/setup-terraform@v3
with:
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.22'

- uses: actions/checkout@v4

Expand All @@ -71,7 +71,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.22'

- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.22'

- name: Import GPG key
id: import_gpg
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ The [examples diretory](./examples) contains example configuration for the vario

### Build the provider from source

The build requires [Go](https://golang.org/doc/install) >= 1.20
The build requires [Go](https://golang.org/doc/install) >= 1.22

In order to develop and test this provider, you'll need to configure your local environment
with a custom Terraform [config file](https://developer.hashicorp.com/terraform/cli/config/config-file).
Expand Down
28 changes: 15 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/datastax/terraform-provider-astra/v2

go 1.20
go 1.21

toolchain go1.22.0

require (
github.com/datastax/astra-client-go/v2 v2.2.52
Expand All @@ -9,12 +11,12 @@ require (
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
github.com/hashicorp/go-retryablehttp v0.7.5
github.com/hashicorp/terraform-plugin-docs v0.18.0
github.com/hashicorp/terraform-plugin-framework v1.5.0
github.com/hashicorp/terraform-plugin-framework v1.6.0
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
github.com/hashicorp/terraform-plugin-go v0.21.0
github.com/hashicorp/terraform-plugin-go v0.22.0
github.com/hashicorp/terraform-plugin-log v0.9.0
github.com/hashicorp/terraform-plugin-mux v0.14.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.32.0
github.com/hashicorp/terraform-plugin-mux v0.15.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
github.com/stretchr/testify v1.8.4
github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210625132053-af2d5c0ad54f

Expand All @@ -25,7 +27,7 @@ require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.0 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/ProtonMail/go-crypto v1.1.0-alpha.0 // indirect
github.com/agext/levenshtein v1.2.2 // indirect
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
Expand All @@ -50,7 +52,7 @@ require (
github.com/hashicorp/go-plugin v1.6.0 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hc-install v0.6.2 // indirect
github.com/hashicorp/hc-install v0.6.3 // indirect
github.com/hashicorp/hcl/v2 v2.19.1 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-exec v0.20.0 // indirect
Expand Down Expand Up @@ -84,15 +86,15 @@ require (
github.com/yuin/goldmark v1.6.0 // indirect
github.com/yuin/goldmark-meta v1.1.0 // indirect
github.com/zclconf/go-cty v1.14.2 // indirect
golang.org/x/crypto v0.18.0 // indirect
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/grpc v1.61.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/grpc v1.62.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 6ebea76

Please sign in to comment.