Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upgrade golang to 1.20
Browse files Browse the repository at this point in the history
pgier committed Dec 14, 2023
1 parent 2648ac8 commit 92ae535
Showing 6 changed files with 11 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: '1.19'
go-version: '1.20'

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

- uses: actions/setup-go@v4
with:
go-version: '1.19'
go-version: '1.20'

- uses: actions/checkout@v4

@@ -71,7 +71,7 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.20'

- uses: actions/checkout@v4

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

- uses: actions/setup-go@v4
with:
go-version: 1.19
go-version: 1.20

- name: Import GPG key
id: import_gpg
1 change: 0 additions & 1 deletion .go-version

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.18
The build requires [Go](https://golang.org/doc/install) >= 1.20
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).
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/datastax/terraform-provider-astra/v2

go 1.18
go 1.20

require (
github.com/datastax/astra-client-go/v2 v2.2.51
7 changes: 5 additions & 2 deletions internal/provider/provider_framework.go
Original file line number Diff line number Diff line change
@@ -148,8 +148,11 @@ func (p *astraProvider) Configure(ctx context.Context, req provider.ConfigureReq
if strings.HasSuffix(streamingAPIServerURL, "/") {
pulsarAdminPath = strings.TrimPrefix(pulsarAdminPath, "/")
}
// TODO: when we switch to go 1.19, this should use url.JoinPath
streamingAPIServerURLPulsarAdmin := streamingAPIServerURL + pulsarAdminPath
streamingAPIServerURLPulsarAdmin, err := url.JoinPath(streamingAPIServerURL, pulsarAdminPath)
if err != nil {
resp.Diagnostics.AddError("failed to create Pulsar admin server API URL", err.Error())
return
}
if _, err := url.Parse(streamingAPIServerURLPulsarAdmin); err != nil {
resp.Diagnostics.AddError("invalid Pulsar admin server API URL", err.Error())
return

0 comments on commit 92ae535

Please sign in to comment.