Skip to content

Commit d6d43ad

Browse files
stack72stack72
authored
Upgrade to pulumi-terraform-bridge v2.23.0
1 parent c30eb2f commit d6d43ad

File tree

18 files changed

+1894
-43
lines changed

18 files changed

+1894
-43
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## HEAD (Unreleased)
2-
_(none)_
2+
* Upgrade to pulumi-terraform-bridge v2.23.0
33

44
---
55

‎provider/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.16
55
require (
66
github.com/cyrilgdn/terraform-provider-postgresql v0.0.0
77
github.com/hashicorp/terraform-plugin-sdk v1.7.0
8-
github.com/pulumi/pulumi-terraform-bridge/v2 v2.22.1
9-
github.com/pulumi/pulumi/sdk/v2 v2.22.1-0.20210310211618-1f16423ede4c
8+
github.com/pulumi/pulumi-terraform-bridge/v2 v2.23.0
9+
github.com/pulumi/pulumi/sdk/v2 v2.24.1
1010
)
1111

1212
replace github.com/cyrilgdn/terraform-provider-postgresql => github.com/pulumi/terraform-provider-postgresql v1.12.1-0.20210330162646-5e21079b520e

‎provider/go.sum‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,7 @@ github.com/mxschmitt/golang-combinations v1.0.0/go.mod h1:RbMhWvfCelHR6WROvT2bVf
498498
github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
499499
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
500500
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
501+
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
501502
github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
502503
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
503504
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -534,13 +535,12 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
534535
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
535536
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
536537
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
537-
github.com/pulumi/pulumi-terraform-bridge/v2 v2.22.1 h1:RkSW7kCuJY/afkoniEUlJ+bz+lHG6QamklHVWXs3Hjo=
538-
github.com/pulumi/pulumi-terraform-bridge/v2 v2.22.1/go.mod h1:qaI8I+VbSqHC1LWNfr2mmCBRXanc9UT6l474CLtw/lY=
539-
github.com/pulumi/pulumi/pkg/v2 v2.22.1-0.20210310211618-1f16423ede4c h1:ozWoZFocQfHmPahclxia6CGhP3eZ73XK6xznr4J5/cU=
540-
github.com/pulumi/pulumi/pkg/v2 v2.22.1-0.20210310211618-1f16423ede4c/go.mod h1:cghYgU9E3gorp3W0gIZshlUib4LtCh36XBTAzLQO7qI=
541-
github.com/pulumi/pulumi/sdk/v2 v2.2.1/go.mod h1:QNbWpL4gvf3X0lUFT7TXA2Jo1ff/Ti2l97AyFGYwvW4=
542-
github.com/pulumi/pulumi/sdk/v2 v2.22.1-0.20210310211618-1f16423ede4c h1:fQ8iJ0AwJSUt1j7A1CRpJSsi5Cr48b2XUxG6sl9vX2A=
543-
github.com/pulumi/pulumi/sdk/v2 v2.22.1-0.20210310211618-1f16423ede4c/go.mod h1:fCFhRV6NmidWetmgDPA76efL+s0JqLlS54JJIwfOt+o=
538+
github.com/pulumi/pulumi-terraform-bridge/v2 v2.23.0 h1:9TanftKDCkeauJpKQHgRmCur3LQcGl8h/29uMwsGcNM=
539+
github.com/pulumi/pulumi-terraform-bridge/v2 v2.23.0/go.mod h1:QdO8kh0Yu3O03RAjSntY5d/ELPAn3KkGWaLAcP7/Y44=
540+
github.com/pulumi/pulumi/pkg/v2 v2.24.1-0.20210411193841-b7d403204449 h1:KTj+B7YhRbU7PsOMBr58RFwNJy+OkGILpA+6/RSuhhw=
541+
github.com/pulumi/pulumi/pkg/v2 v2.24.1-0.20210411193841-b7d403204449/go.mod h1:hq6KcDEklytmMrL5aexH19GP2f5GX2IeveICJXaKHc0=
542+
github.com/pulumi/pulumi/sdk/v2 v2.24.1 h1:bmFDjdlYinnjQu5jeR+D4+k8aQuEhxIfJ/N3nOSaYiY=
543+
github.com/pulumi/pulumi/sdk/v2 v2.24.1/go.mod h1:sHQdzD0/cIopR5uLeoikXi1pNBv5SwA4M617VqdIA3E=
544544
github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e h1:Dik4Qe/+xguB8JagPyXNlbOnRiXGmq/PSPQTGunYnTk=
545545
github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e/go.mod h1:sZ9FUzGO+yM41hsQHs/yIcj/Y993qMdBxBU5mpDmAfQ=
546546
github.com/pulumi/terraform-provider-postgresql v1.12.1-0.20210330162646-5e21079b520e h1:RwBCyzNKjVY4r5mi1lwulqMFi0zPqryXpm56Qx4HsP0=
@@ -799,7 +799,6 @@ golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7w
799799
golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
800800
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
801801
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
802-
golang.org/x/sys v0.0.0-20200317113312-5766fd39f98d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
803802
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
804803
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
805804
golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

‎sdk/go/postgresql/init.go‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,26 @@ func (m *module) Version() semver.Version {
2121
func (m *module) Construct(ctx *pulumi.Context, name, typ, urn string) (r pulumi.Resource, err error) {
2222
switch typ {
2323
case "postgresql:index/database:Database":
24-
r, err = NewDatabase(ctx, name, nil, pulumi.URN_(urn))
24+
r = &Database{}
2525
case "postgresql:index/defaultPrivileg:DefaultPrivileg":
26-
r, err = NewDefaultPrivileg(ctx, name, nil, pulumi.URN_(urn))
26+
r = &DefaultPrivileg{}
2727
case "postgresql:index/defaultPrivileges:DefaultPrivileges":
28-
r, err = NewDefaultPrivileges(ctx, name, nil, pulumi.URN_(urn))
28+
r = &DefaultPrivileges{}
2929
case "postgresql:index/extension:Extension":
30-
r, err = NewExtension(ctx, name, nil, pulumi.URN_(urn))
30+
r = &Extension{}
3131
case "postgresql:index/grant:Grant":
32-
r, err = NewGrant(ctx, name, nil, pulumi.URN_(urn))
32+
r = &Grant{}
3333
case "postgresql:index/grantRole:GrantRole":
34-
r, err = NewGrantRole(ctx, name, nil, pulumi.URN_(urn))
34+
r = &GrantRole{}
3535
case "postgresql:index/role:Role":
36-
r, err = NewRole(ctx, name, nil, pulumi.URN_(urn))
36+
r = &Role{}
3737
case "postgresql:index/schema:Schema":
38-
r, err = NewSchema(ctx, name, nil, pulumi.URN_(urn))
38+
r = &Schema{}
3939
default:
4040
return nil, fmt.Errorf("unknown resource type: %s", typ)
4141
}
4242

43+
err = ctx.RegisterResource(typ, name, nil, r, pulumi.URN_(urn))
4344
return
4445
}
4546

@@ -56,7 +57,9 @@ func (p *pkg) ConstructProvider(ctx *pulumi.Context, name, typ, urn string) (pul
5657
return nil, fmt.Errorf("unknown provider type: %s", typ)
5758
}
5859

59-
return NewProvider(ctx, name, nil, pulumi.URN_(urn))
60+
r := &Provider{}
61+
err := ctx.RegisterResource(typ, name, nil, r, pulumi.URN_(urn))
62+
return r, err
6063
}
6164

6265
func init() {

‎sdk/python/pulumi_postgresql/_inputs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import warnings
66
import pulumi
77
import pulumi.runtime
8-
from typing import Any, Mapping, Optional, Sequence, Union
8+
from typing import Any, Mapping, Optional, Sequence, Union, overload
99
from . import _utilities, _tables
1010

1111
__all__ = [

‎sdk/python/pulumi_postgresql/_utilities.py‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,37 @@ def get_semver_version():
8181
# their own semver string.
8282
return SemverVersion(major=major, minor=minor, patch=patch, prerelease=prerelease)
8383

84+
8485
def get_version():
85-
return str(get_semver_version())
86+
return str(get_semver_version())
87+
88+
89+
def get_resource_args_opts(resource_args_type, resource_options_type, *args, **kwargs):
90+
"""
91+
Return the resource args and options given the *args and **kwargs of a resource's
92+
__init__ method.
93+
"""
94+
95+
resource_args, opts = None, None
96+
97+
# If the first item is the resource args type, save it and remove it from the args list.
98+
if args and isinstance(args[0], resource_args_type):
99+
resource_args, args = args[0], args[1:]
100+
101+
# Now look at the first item in the args list again.
102+
# If the first item is the resource options class, save it.
103+
if args and isinstance(args[0], resource_options_type):
104+
opts = args[0]
105+
106+
# If resource_args is None, see if "args" is in kwargs, and, if so, if it's typed as the
107+
# the resource args type.
108+
if resource_args is None:
109+
a = kwargs.get("args")
110+
if isinstance(a, resource_args_type):
111+
resource_args = a
112+
113+
# If opts is None, look it up in kwargs.
114+
if opts is None:
115+
opts = kwargs.get("opts")
116+
117+
return resource_args, opts

‎sdk/python/pulumi_postgresql/config/outputs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import warnings
66
import pulumi
77
import pulumi.runtime
8-
from typing import Any, Mapping, Optional, Sequence, Union
8+
from typing import Any, Mapping, Optional, Sequence, Union, overload
99
from .. import _utilities, _tables
1010

1111
__all__ = [

‎sdk/python/pulumi_postgresql/config/vars.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import warnings
66
import pulumi
77
import pulumi.runtime
8-
from typing import Any, Mapping, Optional, Sequence, Union
8+
from typing import Any, Mapping, Optional, Sequence, Union, overload
99
from .. import _utilities, _tables
1010
from . import outputs
1111

0 commit comments

Comments
 (0)