Skip to content

Commit 72dd06e

Browse files
authored
Merge branch 'main' into connection_host
2 parents 40eb932 + 450ce85 commit 72dd06e

File tree

49 files changed

+945
-557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+945
-557
lines changed

.github/workflows/golangci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414

1515
- name: Setup Go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.23.x
18+
go-version: 1.24.x
1919

2020
- run: go mod vendor
2121

2222
- name: Run golangci-lint
23-
uses: golangci/golangci-lint-action@v6
23+
uses: golangci/golangci-lint-action@v8
2424
with:
25-
version: v1.61
25+
version: v2.4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
name: Set up Go
2929
uses: actions/setup-go@v5
3030
with:
31-
go-version: '1.23'
31+
go-version: '1.24'
3232
-
3333
name: Import GPG key
3434
id: import_gpg

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set up Go
2525
uses: actions/setup-go@v5
2626
with:
27-
go-version: '1.23'
27+
go-version: '1.24'
2828

2929
- name: test
3030
run: make test

.golangci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
version: "2"
2+
13
run:
24
timeout: 5m
35

4-
issues:
5-
exclude-rules:
6-
- linters:
7-
- errcheck
8-
text: "Error return value of `d.Set` is not checked"
6+
linters:
7+
settings:
8+
errcheck:
9+
exclude-functions:
10+
- (*github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceData).Set

go.mod

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/terraform-providers/terraform-provider-postgresql
22

3-
go 1.23
3+
go 1.24.0
44

5-
toolchain go1.23.2
5+
toolchain go1.24.2
66

77
require (
88
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
@@ -13,25 +13,26 @@ require (
1313
github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.2.12
1414
github.com/aws/aws-sdk-go-v2/service/sts v1.21.1
1515
github.com/blang/semver v3.5.1+incompatible
16-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.26.1
16+
github.com/hashicorp/go-cty v1.5.0
17+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
1718
github.com/lib/pq v1.10.9
1819
github.com/sean-/postgresql-acl v0.0.0-20161225120419-d10489e5d217
1920
github.com/stretchr/testify v1.9.0
2021
gocloud.dev v0.34.0
21-
golang.org/x/net v0.26.0
22-
golang.org/x/oauth2 v0.10.0
22+
golang.org/x/net v0.39.0
23+
golang.org/x/oauth2 v0.27.0
2324
google.golang.org/api v0.134.0
2425
)
2526

2627
require (
27-
cloud.google.com/go/compute v1.23.0 // indirect
28-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
28+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
2929
contrib.go.opencensus.io/integrations/ocsql v0.1.7 // indirect
3030
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
3131
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
3232
github.com/GoogleCloudPlatform/cloudsql-proxy v1.33.9 // indirect
33+
github.com/ProtonMail/go-crypto v1.1.6 // indirect
3334
github.com/agext/levenshtein v1.2.3 // indirect
34-
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
35+
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
3536
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.7 // indirect
3637
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.37 // indirect
3738
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.31 // indirect
@@ -40,12 +41,13 @@ require (
4041
github.com/aws/aws-sdk-go-v2/service/sso v1.13.1 // indirect
4142
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.1 // indirect
4243
github.com/aws/smithy-go v1.14.0 // indirect
44+
github.com/cloudflare/circl v1.6.1 // indirect
4345
github.com/davecgh/go-spew v1.1.1 // indirect
44-
github.com/fatih/color v1.15.0 // indirect
45-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
46-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
47-
github.com/golang/protobuf v1.5.3 // indirect
48-
github.com/google/go-cmp v0.5.9 // indirect
46+
github.com/fatih/color v1.16.0 // indirect
47+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
48+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
49+
github.com/golang/protobuf v1.5.4 // indirect
50+
github.com/google/go-cmp v0.7.0 // indirect
4951
github.com/google/s2a-go v0.1.4 // indirect
5052
github.com/google/uuid v1.6.0 // indirect
5153
github.com/google/wire v0.5.0 // indirect
@@ -54,25 +56,25 @@ require (
5456
github.com/hashicorp/errwrap v1.1.0 // indirect
5557
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
5658
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
57-
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
58-
github.com/hashicorp/go-hclog v1.5.0 // indirect
59+
github.com/hashicorp/go-hclog v1.6.3 // indirect
5960
github.com/hashicorp/go-multierror v1.1.1 // indirect
60-
github.com/hashicorp/go-plugin v1.4.10 // indirect
61+
github.com/hashicorp/go-plugin v1.6.3 // indirect
62+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
6163
github.com/hashicorp/go-uuid v1.0.3 // indirect
62-
github.com/hashicorp/go-version v1.6.0 // indirect
63-
github.com/hashicorp/hc-install v0.5.0 // indirect
64-
github.com/hashicorp/hcl/v2 v2.17.0 // indirect
64+
github.com/hashicorp/go-version v1.7.0 // indirect
65+
github.com/hashicorp/hc-install v0.9.2 // indirect
66+
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
6567
github.com/hashicorp/logutils v1.0.0 // indirect
66-
github.com/hashicorp/terraform-exec v0.18.1 // indirect
67-
github.com/hashicorp/terraform-json v0.16.0 // indirect
68-
github.com/hashicorp/terraform-plugin-go v0.15.0 // indirect
68+
github.com/hashicorp/terraform-exec v0.23.0 // indirect
69+
github.com/hashicorp/terraform-json v0.25.0 // indirect
70+
github.com/hashicorp/terraform-plugin-go v0.27.0 // indirect
6971
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
70-
github.com/hashicorp/terraform-registry-address v0.2.1 // indirect
72+
github.com/hashicorp/terraform-registry-address v0.2.5 // indirect
7173
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
7274
github.com/hashicorp/yamux v0.1.1 // indirect
7375
github.com/kylelemons/godebug v1.1.0 // indirect
7476
github.com/mattn/go-colorable v0.1.13 // indirect
75-
github.com/mattn/go-isatty v0.0.19 // indirect
77+
github.com/mattn/go-isatty v0.0.20 // indirect
7678
github.com/mitchellh/copystructure v1.2.0 // indirect
7779
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
7880
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -82,21 +84,23 @@ require (
8284
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
8385
github.com/pmezard/go-difflib v1.0.0 // indirect
8486
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
85-
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
87+
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
8688
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
87-
github.com/zclconf/go-cty v1.13.2 // indirect
89+
github.com/zclconf/go-cty v1.16.2 // indirect
8890
go.opencensus.io v0.24.0 // indirect
8991
go.uber.org/atomic v1.11.0 // indirect
9092
go.uber.org/multierr v1.11.0 // indirect
9193
go.uber.org/zap v1.24.0 // indirect
92-
golang.org/x/crypto v0.31.0 // indirect
93-
golang.org/x/mod v0.17.0 // indirect
94-
golang.org/x/sys v0.28.0 // indirect
95-
golang.org/x/text v0.21.0 // indirect
94+
golang.org/x/crypto v0.38.0 // indirect
95+
golang.org/x/mod v0.24.0 // indirect
96+
golang.org/x/sync v0.14.0 // indirect
97+
golang.org/x/sys v0.33.0 // indirect
98+
golang.org/x/text v0.25.0 // indirect
9699
golang.org/x/time v0.3.0 // indirect
97-
google.golang.org/appengine v1.6.7 // indirect
98-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731193218-e0aa005b6bdf // indirect
99-
google.golang.org/grpc v1.57.0 // indirect
100-
google.golang.org/protobuf v1.33.0 // indirect
100+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
101+
google.golang.org/appengine v1.6.8 // indirect
102+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
103+
google.golang.org/grpc v1.72.1 // indirect
104+
google.golang.org/protobuf v1.36.6 // indirect
101105
gopkg.in/yaml.v3 v3.0.1 // indirect
102106
)

0 commit comments

Comments
 (0)