Merge upstream v1.20 (#7)

Co-authored-by: Cyril Gaudin <[email protected]>
Co-authored-by: Akira Suenami <[email protected]>
Co-authored-by: timothegenzmer <[email protected]>
Co-authored-by: Timothe Genzmer <[email protected]>
Co-authored-by: sareno <[email protected]>
Co-authored-by: felipe-minka <[email protected]>
Co-authored-by: Jérémy Levilain <[email protected]>
Co-authored-by: Felipe Reyes <[email protected]>
Co-authored-by: chris-minka <[email protected]>
Co-authored-by: Fábio Paiva <[email protected]>
Co-authored-by: Nico Carl <[email protected]>
Co-authored-by: Enzo Cappa <[email protected]>
Co-authored-by: Kayssar Daher <[email protected]>
Co-authored-by: Kayssar Daher <[email protected]>
Co-authored-by: Majid Burney <[email protected]>
Co-authored-by: Khaled Khalifa <[email protected]>
Co-authored-by: Marvin Willms <[email protected]>
Co-authored-by: nguyenhoaibao <[email protected]>
Co-authored-by: SpencerBinXia <[email protected]>
Co-authored-by: Warnar Boekkooi <[email protected]>
Co-authored-by: Jean-Louis Giordano <[email protected]>
Co-authored-by: Alec Rabold <[email protected]>
Co-authored-by: Adrien Letournel <[email protected]>
Co-authored-by: Thomas Boussekey <[email protected]>
Co-authored-by: Jernej Porenta <[email protected]>
Co-authored-by: Kyle Johnson <[email protected]>

.github/workflows/golangci.yml

@@ -13,13 +13,13 @@ jobs:
         uses: actions/[email protected]
 
       - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.17.x
+          go-version: 1.20.x
 
       - run: go mod vendor
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v3.1.0
+        uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.40
+          version: v1.53

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: '1.20'
       -
         name: Import GPG key
         id: import_gpg

.github/workflows/test.yml

@@ -12,19 +12,19 @@ jobs:
 
     strategy:
       matrix:
-        pgversion: [9, 10, 11, 12, 13, 14]
+        pgversion: [14, 13, 12, 11]
 
     env:
       PGVERSION: ${{ matrix.pgversion }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.16
+          go-version: '1.20'
 
       - name: test
         run: make test

CHANGELOG.md

@@ -1,4 +1,49 @@
-## Unreleased
+## 1.19.0 (March 18, 2023)
+
+* **New data sources**: `postgresql_schemas`, `postgresql_sequences` and `postgresql_tables` - @SpencerBinXia
+  [#214](https://github.com/cyrilgdn/terraform-provider-postgresql/pull/214)
+
+* `postgresql_grant`: Add column level access - @kda-jt @wilsonjackson 
+  [#135](https://github.com/cyrilgdn/terraform-provider-postgresql/pull/135)
+
+* `postgresql_function`: Support terraform import - @khkhalifa
+  [#275](https://github.com/cyrilgdn/terraform-provider-postgresql/pull/275)
+
+* `postgresql_grant`: Support arguments in function name - @marvin-kolja
+  [#228](https://github.com/cyrilgdn/terraform-provider-postgresql/pull/228)
+
+FIX:
+
+* `postgresql_user_mapping`: Fix for RDS Aurora - @fabiopaiva
+  [#274](https://github.com/cyrilgdn/terraform-provider-postgresql/pull/274)
+
+
+## 1.18.0 (November 26, 2022)
+
+* **New resource**: `postgresql_server` and `postgresql_user_mapping` - @fabiopaiva
+  [#220](https://github.com/cyrilgdn/terraform-provider-postgresql/pull/220)
+
+* **New resource**: `postgresql_subscription` - @nicarl
+  [#244](https://github.com/cyrilgdn/terraform-provider-postgresql/pull/244)
+
+* Allow to configure AWS Region with AWS IAM Auth - @bpaquet
+  [#260](https://github.com/cyrilgdn/terraform-provider-postgresql/pull/260)
+
+* Create temporary file for `GOOGLE_APPLICATION_CREDENTIALS` in Terraform cloud - @minkainc-opensource
+  [#249](https://github.com/cyrilgdn/terraform-provider-postgresql/pull/249)
+
+FIX:
+
+* `postgresql_grant`: Concurrency issue on database privileges - @timothegenzmer
+  [#224](https://github.com/cyrilgdn/terraform-provider-postgresql/pull/224)
+
+* `postgresql_grant`: Remove `TEMP` privileges for database - @cyrilgdn
+  [#243](https://github.com/cyrilgdn/terraform-provider-postgresql/pull/243)
+
+DEV IMPROVEMENTS:
+
+* Update Postgres versions in tests - @cyrilgdn
+
 
 ## 1.17.1 (August 19, 2022)
 

Makefile

@@ -8,7 +8,7 @@ build: fmtcheck
 	go install
 
 test: fmtcheck
-	go test -i $(TEST) || exit 1
+	go test $(TEST) || exit 1
 	echo $(TEST) | \
 		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
 

README.md

@@ -20,7 +20,7 @@ Building The Provider
 Clone repository to: `$GOPATH/src/github.com/cyrilgdn/terraform-provider-postgresql`
 
 ```sh
-$ mkdir -p $GOPATH/src/github.com/terraform-providers; cd $GOPATH/src/github.com/terraform-providers
+$ mkdir -p $GOPATH/src/github.com/cyrilgdn; cd $GOPATH/src/github.com/cyrilgdn
 $ git clone [email protected]:cyrilgdn/terraform-provider-postgresql
 ```
 

go.mod

@@ -1,84 +1,93 @@
 module github.com/terraform-providers/terraform-provider-postgresql
 
-go 1.17
+go 1.20
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.16.2
-	github.com/aws/aws-sdk-go-v2/config v1.15.3
-	github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.1.6
+	github.com/aws/aws-sdk-go-v2 v1.18.1
+	github.com/aws/aws-sdk-go-v2/config v1.18.27
+	github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.2.12
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.15.0
-	github.com/lib/pq v1.10.4
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.26.1
+	github.com/lib/pq v1.10.9
 	github.com/sean-/postgresql-acl v0.0.0-20161225120419-d10489e5d217
-	gocloud.dev v0.25.0
-	golang.org/x/net v0.0.0-20220401154927-543a649e0bdd
+	github.com/stretchr/testify v1.8.4
+	gocloud.dev v0.29.0
+	golang.org/x/net v0.11.0
+	golang.org/x/oauth2 v0.9.0
 )
 
 require (
-	cloud.google.com/go/compute v1.5.0 // indirect
+	cloud.google.com/go/compute v1.20.0 // indirect
+	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	contrib.go.opencensus.io/integrations/ocsql v0.1.7 // indirect
-	github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0 // indirect
-	github.com/agext/levenshtein v1.2.2 // indirect
+	github.com/GoogleCloudPlatform/cloudsql-proxy v1.33.7 // indirect
+	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.11.2 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.9 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.11.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.16.3 // indirect
-	github.com/aws/smithy-go v1.11.2 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.13.26 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.4 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.35 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.28 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.19.2 // indirect
+	github.com/aws/smithy-go v1.13.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fatih/color v1.7.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/s2a-go v0.1.4 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/google/wire v0.5.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.2.0 // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
+	github.com/googleapis/gax-go/v2 v2.11.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
-	github.com/hashicorp/go-hclog v1.2.0 // indirect
+	github.com/hashicorp/go-hclog v1.5.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.4.3 // indirect
+	github.com/hashicorp/go-plugin v1.4.10 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/go-version v1.4.0 // indirect
-	github.com/hashicorp/hc-install v0.3.1 // indirect
-	github.com/hashicorp/hcl/v2 v2.12.0 // indirect
+	github.com/hashicorp/go-version v1.6.0 // indirect
+	github.com/hashicorp/hc-install v0.5.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.17.0 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform-exec v0.16.1 // indirect
-	github.com/hashicorp/terraform-json v0.13.0 // indirect
-	github.com/hashicorp/terraform-plugin-go v0.9.0 // indirect
-	github.com/hashicorp/terraform-plugin-log v0.4.0 // indirect
-	github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 // indirect
-	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
-	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
-	github.com/mattn/go-colorable v0.1.6 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/hashicorp/terraform-exec v0.18.1 // indirect
+	github.com/hashicorp/terraform-json v0.16.0 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.15.0 // indirect
+	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
+	github.com/hashicorp/terraform-registry-address v0.2.1 // indirect
+	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
+	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
-	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/oklog/run v1.0.0 // indirect
+	github.com/oklog/run v1.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
-	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
-	github.com/vmihailenco/tagparser v0.1.1 // indirect
-	github.com/zclconf/go-cty v1.10.0 // indirect
-	go.opencensus.io v0.23.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
-	golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
-	golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
-	google.golang.org/api v0.74.0 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	github.com/zclconf/go-cty v1.13.2 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/crypto v0.10.0 // indirect
+	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/sys v0.9.0 // indirect
+	golang.org/x/text v0.10.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	google.golang.org/api v0.128.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220401170504-314d38edb7de // indirect
-	google.golang.org/grpc v1.45.0 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
+	google.golang.org/grpc v1.56.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )