Skip to content

Commit 34bc732

Browse files
cyrilgdncyrilgdn
authored
Upgrade Terraform SDK to v2 (#140)
* Upgrade Terraform SDK to v2 * Rename Makefile
1 parent b7a974b commit 34bc732

25 files changed

+397
-271
lines changed

GNUmakefile renamed to Makefile

File renamed without changes.

‎go.mod‎

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

3-
go 1.14
3+
go 1.17
44

55
require (
66
github.com/blang/semver v3.5.1+incompatible
7-
github.com/hashicorp/terraform-plugin-sdk v1.0.0
7+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.8.0
88
github.com/lib/pq v1.9.0
99
github.com/sean-/postgresql-acl v0.0.0-20161225120419-d10489e5d217
1010
gocloud.dev v0.21.0
1111
)
12+
13+
require (
14+
cloud.google.com/go v0.72.0 // indirect
15+
cloud.google.com/go/storage v1.12.0 // indirect
16+
contrib.go.opencensus.io/integrations/ocsql v0.1.7 // indirect
17+
github.com/GoogleCloudPlatform/cloudsql-proxy v1.19.1 // indirect
18+
github.com/agext/levenshtein v1.2.2 // indirect
19+
github.com/apparentlymart/go-textseg v1.0.0 // indirect
20+
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
21+
github.com/aws/aws-sdk-go v1.36.1 // indirect
22+
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
23+
github.com/davecgh/go-spew v1.1.1 // indirect
24+
github.com/fatih/color v1.7.0 // indirect
25+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
26+
github.com/golang/protobuf v1.4.3 // indirect
27+
github.com/google/wire v0.4.0 // indirect
28+
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
29+
github.com/hashicorp/errwrap v1.0.0 // indirect
30+
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
31+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
32+
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
33+
github.com/hashicorp/go-getter v1.5.3 // indirect
34+
github.com/hashicorp/go-hclog v0.15.0 // indirect
35+
github.com/hashicorp/go-multierror v1.0.0 // indirect
36+
github.com/hashicorp/go-plugin v1.4.1 // indirect
37+
github.com/hashicorp/go-safetemp v1.0.0 // indirect
38+
github.com/hashicorp/go-uuid v1.0.1 // indirect
39+
github.com/hashicorp/go-version v1.3.0 // indirect
40+
github.com/hashicorp/hcl/v2 v2.3.0 // indirect
41+
github.com/hashicorp/logutils v1.0.0 // indirect
42+
github.com/hashicorp/terraform-exec v0.14.0 // indirect
43+
github.com/hashicorp/terraform-json v0.12.0 // indirect
44+
github.com/hashicorp/terraform-plugin-go v0.4.0 // indirect
45+
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
46+
github.com/jmespath/go-jmespath v0.4.0 // indirect
47+
github.com/jstemmer/go-junit-report v0.9.1 // indirect
48+
github.com/klauspost/compress v1.11.3 // indirect
49+
github.com/mattn/go-colorable v0.1.4 // indirect
50+
github.com/mattn/go-isatty v0.0.12 // indirect
51+
github.com/mitchellh/copystructure v1.2.0 // indirect
52+
github.com/mitchellh/go-homedir v1.1.0 // indirect
53+
github.com/mitchellh/go-testing-interface v1.0.4 // indirect
54+
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
55+
github.com/mitchellh/mapstructure v1.4.0 // indirect
56+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
57+
github.com/oklog/run v1.0.0 // indirect
58+
github.com/ulikunitz/xz v0.5.8 // indirect
59+
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
60+
github.com/zclconf/go-cty v1.8.4 // indirect
61+
go.opencensus.io v0.22.5 // indirect
62+
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
63+
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
64+
golang.org/x/mod v0.4.0 // indirect
65+
golang.org/x/net v0.0.0-20210326060303-6b1517762897 // indirect
66+
golang.org/x/oauth2 v0.0.0-20201203001011-0b49973bad19 // indirect
67+
golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79 // indirect
68+
golang.org/x/text v0.3.5 // indirect
69+
golang.org/x/tools v0.0.0-20201203202102-a1a1cbeaa516 // indirect
70+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
71+
google.golang.org/api v0.36.0 // indirect
72+
google.golang.org/appengine v1.6.7 // indirect
73+
google.golang.org/genproto v0.0.0-20201203001206-6486ece9c497 // indirect
74+
google.golang.org/grpc v1.34.0 // indirect
75+
google.golang.org/protobuf v1.25.0 // indirect
76+
)

‎go.sum‎

Lines changed: 149 additions & 94 deletions
Large diffs are not rendered by default.

‎main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
"github.com/hashicorp/terraform-plugin-sdk/plugin"
4+
"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
55
"github.com/terraform-providers/terraform-provider-postgresql/postgresql"
66
)
77

‎postgresql/helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"log"
77
"strings"
88

9-
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
9+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
"github.com/lib/pq"
1111
)
1212

‎postgresql/provider.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import (
44
"fmt"
55

66
"github.com/blang/semver"
7-
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
8-
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
9-
"github.com/hashicorp/terraform-plugin-sdk/terraform"
7+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
8+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
109
)
1110

1211
const (
@@ -15,7 +14,7 @@ const (
1514
)
1615

1716
// Provider returns a terraform.ResourceProvider.
18-
func Provider() terraform.ResourceProvider {
17+
func Provider() *schema.Provider {
1918
return &schema.Provider{
2019
Schema: map[string]*schema.Schema{
2120
"scheme": {

‎postgresql/provider_test.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
package postgresql
22

33
import (
4+
"context"
45
"os"
56
"testing"
67

7-
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
8-
"github.com/hashicorp/terraform-plugin-sdk/terraform"
8+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
9+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
910
)
1011

11-
var testAccProviders map[string]terraform.ResourceProvider
12+
var testAccProviders map[string]*schema.Provider
1213
var testAccProvider *schema.Provider
1314

1415
func init() {
15-
testAccProvider = Provider().(*schema.Provider)
16-
testAccProviders = map[string]terraform.ResourceProvider{
16+
testAccProvider = Provider()
17+
testAccProviders = map[string]*schema.Provider{
1718
"postgresql": testAccProvider,
1819
}
1920
}
2021

2122
func TestProvider(t *testing.T) {
22-
if err := Provider().(*schema.Provider).InternalValidate(); err != nil {
23+
if err := Provider().InternalValidate(); err != nil {
2324
t.Fatalf("err: %s", err)
2425
}
2526
}
2627

2728
func TestProvider_impl(t *testing.T) {
28-
var _ terraform.ResourceProvider = Provider()
29+
var _ *schema.Provider = Provider()
2930
}
3031

3132
func testAccPreCheck(t *testing.T) {
@@ -37,7 +38,7 @@ func testAccPreCheck(t *testing.T) {
3738
t.Fatal("PGUSER must be set for acceptance tests")
3839
}
3940

40-
err := testAccProvider.Configure(terraform.NewResourceConfigRaw(nil))
41+
err := testAccProvider.Configure(context.Background(), terraform.NewResourceConfigRaw(nil))
4142
if err != nil {
4243
t.Fatal(err)
4344
}

‎postgresql/resource_postgresql_database.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"log"
99
"strings"
1010

11-
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
12-
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
11+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
12+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1313
"github.com/lib/pq"
1414
)
1515

@@ -34,7 +34,7 @@ func resourcePostgreSQLDatabase() *schema.Resource {
3434
Delete: PGResourceFunc(resourcePostgreSQLDatabaseDelete),
3535
Exists: PGResourceExistsFunc(resourcePostgreSQLDatabaseExists),
3636
Importer: &schema.ResourceImporter{
37-
State: schema.ImportStatePassthrough,
37+
StateContext: schema.ImportStatePassthroughContext,
3838
},
3939

4040
Schema: map[string]*schema.Schema{

‎postgresql/resource_postgresql_database_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strconv"
88
"testing"
99

10-
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
11-
"github.com/hashicorp/terraform-plugin-sdk/terraform"
10+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
11+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1212
)
1313

1414
func TestAccPostgresqlDatabase_Basic(t *testing.T) {

‎postgresql/resource_postgresql_default_privileges.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"log"
77
"strings"
88

9-
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
10-
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
9+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
10+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1111

1212
// Use Postgres as SQL driver
1313
"github.com/lib/pq"

0 commit comments

Comments
 (0)