Skip to content

Commit eac7bb1

Browse files
stack72stack72
authored
Merge pull request #75 from pulumi/bridge-v2.7.3
Upgrade to pulumi-terraform-bridge v2.7.3
2 parents 0a081b8 + c24bda4 commit eac7bb1

File tree

11 files changed

+73
-67
lines changed

11 files changed

+73
-67
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-
* Upgrade to pulumi-terraform-bridge v2.7.0
2+
* Upgrade to pulumi-terraform-bridge v2.7.3
33
* Upgrade to Pulumi v2.9.0, which adds type annotations and input/output classes to Python
44

55
---

‎provider/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.14
44

55
require (
66
github.com/hashicorp/terraform-plugin-sdk v1.7.0
7-
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.2
8-
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200821035132-629254334213
7+
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.3
8+
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200825190708-910aa96016cd
99
github.com/terraform-providers/terraform-provider-postgresql v1.7.1
1010
)
1111

‎provider/go.sum‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,8 @@ github.com/pulumi/pulumi-terraform-bridge/v2 v2.5.4 h1:liVlfQUX+eKvHJ7AgO4ZFlgQK
496496
github.com/pulumi/pulumi-terraform-bridge/v2 v2.5.4/go.mod h1:acLBYTICHSiHpSe6RxhiSwCjNyGT7LQAVdg5PwRVcgw=
497497
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.2 h1:ZgBUEz1zPN1p8el+YDXoRlOPSPcBz8ytfZH6Ncj/PN4=
498498
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.2/go.mod h1:UvbLRW8+YFluKwRZjzP3coPYWQPPYh/q9e2NN2GPbxg=
499+
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.3 h1:XZxl0fsf9vO45FM+tKPYE9f30fM+q2s6lHsEzkdnBNs=
500+
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.3/go.mod h1:TW+CNCZHzlH42y0vmRA9gOzeTFh3Cp7MN9DoGcRDLvo=
499501
github.com/pulumi/pulumi/pkg/v2 v2.0.0/go.mod h1:kNG9MBTdKP9AzMgkETumR3fmX9gUYB+HpQL767K6jXc=
500502
github.com/pulumi/pulumi/pkg/v2 v2.2.2-0.20200519081838-f66100ce28b0/go.mod h1:GV88eCIrqfFcBWd5QUdN3qMsR0h+x+iRIBnBhhvB78A=
501503
github.com/pulumi/pulumi/pkg/v2 v2.3.1-0.20200607162109-9754465b04db h1:5HrO1GNA53QEp+yN1UCX7BUsJD2I5/k1u2KLO4hOxOA=
@@ -507,6 +509,8 @@ github.com/pulumi/pulumi/pkg/v2 v2.5.1-0.20200701223250-45d2fa95d60b h1:77hcUu0l
507509
github.com/pulumi/pulumi/pkg/v2 v2.5.1-0.20200701223250-45d2fa95d60b/go.mod h1:zfUm4/GH2dVRlHZ3Yeb9bRweCQM7icVBdplu6MUDRrQ=
508510
github.com/pulumi/pulumi/pkg/v2 v2.9.1-0.20200821035132-629254334213 h1:c8UQ842Zg6XzX4sPeGhBo8hiGFzoU23vaMmxk64V8eU=
509511
github.com/pulumi/pulumi/pkg/v2 v2.9.1-0.20200821035132-629254334213/go.mod h1:Yq1q3nwy/KeU08DyyX0QsMyc6SqPs0jGJb8ev5f45AU=
512+
github.com/pulumi/pulumi/pkg/v2 v2.9.1-0.20200825190708-910aa96016cd h1:e4nK2jqLm6g7qMW0BInHR3ZM55y1NblvgOlkfNGT2F4=
513+
github.com/pulumi/pulumi/pkg/v2 v2.9.1-0.20200825190708-910aa96016cd/go.mod h1:Yq1q3nwy/KeU08DyyX0QsMyc6SqPs0jGJb8ev5f45AU=
510514
github.com/pulumi/pulumi/sdk/v2 v2.0.0 h1:3VMXbEo3bqeaU+YDt8ufVBLD0WhLYE3tG3t/nIZ3Iac=
511515
github.com/pulumi/pulumi/sdk/v2 v2.0.0/go.mod h1:W7k1UDYerc5o97mHnlHHp5iQZKEby+oQrQefWt+2RF4=
512516
github.com/pulumi/pulumi/sdk/v2 v2.2.2-0.20200519081838-f66100ce28b0/go.mod h1:QNbWpL4gvf3X0lUFT7TXA2Jo1ff/Ti2l97AyFGYwvW4=
@@ -520,6 +524,8 @@ github.com/pulumi/pulumi/sdk/v2 v2.5.1-0.20200701223250-45d2fa95d60b h1:nrpWqLjS
520524
github.com/pulumi/pulumi/sdk/v2 v2.5.1-0.20200701223250-45d2fa95d60b/go.mod h1:llk6tmXss8kJrt3vEXAkwiwgZOuINEFmKIfMveVIwO8=
521525
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200821035132-629254334213 h1:h4hBtS6/S0a1deLtJuUuYAIZGOCIJY9OVSdmC4VRk+M=
522526
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200821035132-629254334213/go.mod h1:x84WPiFiuE+G4kJ5jUYkOxmnQJlWoJaHNeEYdqnCKA4=
527+
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200825190708-910aa96016cd h1:m5jEWpbr/Q94vCqA/7fw5US7cHZLeQiMQXrnSblZzdU=
528+
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200825190708-910aa96016cd/go.mod h1:x84WPiFiuE+G4kJ5jUYkOxmnQJlWoJaHNeEYdqnCKA4=
523529
github.com/pulumi/tf2pulumi v0.8.1-0.20200519092335-cb56a4dfa88d h1:1JtzB9Gx0YX2UgKKkqJwTgBXxfg2cbLUEqTJKwKBK7s=
524530
github.com/pulumi/tf2pulumi v0.8.1-0.20200519092335-cb56a4dfa88d/go.mod h1:yv9XozKsue9ZELHQbrBGgIaFtE3OX3Q4m7koTzTqgpE=
525531
github.com/pulumi/tf2pulumi v0.8.1-0.20200528170746-c1234defe2b5 h1:h+pUwgEser1Ole6TMCc66njRPcw7SEVXpeoClG+ihEM=

‎sdk/python/pulumi_postgresql/database.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
class Database(pulumi.CustomResource):
1515
def __init__(__self__,
16-
resource_name,
16+
resource_name: str,
1717
opts: Optional[pulumi.ResourceOptions] = None,
1818
allow_connections: Optional[pulumi.Input[bool]] = None,
1919
connection_limit: Optional[pulumi.Input[float]] = None,
@@ -152,7 +152,7 @@ def get(resource_name: str,
152152

153153
@property
154154
@pulumi.getter(name="allowConnections")
155-
def allow_connections(self) -> Optional[bool]:
155+
def allow_connections(self) -> pulumi.Output[Optional[bool]]:
156156
"""
157157
If `false` then no one can connect to this
158158
database. The default is `true`, allowing connections (except as restricted by
@@ -162,7 +162,7 @@ def allow_connections(self) -> Optional[bool]:
162162

163163
@property
164164
@pulumi.getter(name="connectionLimit")
165-
def connection_limit(self) -> Optional[float]:
165+
def connection_limit(self) -> pulumi.Output[Optional[float]]:
166166
"""
167167
How many concurrent connections can be
168168
established to this database. `-1` (the default) means no limit.
@@ -171,15 +171,15 @@ def connection_limit(self) -> Optional[float]:
171171

172172
@property
173173
@pulumi.getter
174-
def encoding(self) -> str:
174+
def encoding(self) -> pulumi.Output[str]:
175175
"""
176176
Character set encoding to use in the new database
177177
"""
178178
return pulumi.get(self, "encoding")
179179

180180
@property
181181
@pulumi.getter(name="isTemplate")
182-
def is_template(self) -> bool:
182+
def is_template(self) -> pulumi.Output[bool]:
183183
"""
184184
If `true`, then this database can be cloned by any
185185
user with `CREATEDB` privileges; if `false` (the default), then only
@@ -189,23 +189,23 @@ def is_template(self) -> bool:
189189

190190
@property
191191
@pulumi.getter(name="lcCollate")
192-
def lc_collate(self) -> str:
192+
def lc_collate(self) -> pulumi.Output[str]:
193193
"""
194194
Collation order (LC_COLLATE) to use in the new database
195195
"""
196196
return pulumi.get(self, "lc_collate")
197197

198198
@property
199199
@pulumi.getter(name="lcCtype")
200-
def lc_ctype(self) -> str:
200+
def lc_ctype(self) -> pulumi.Output[str]:
201201
"""
202202
Character classification (LC_CTYPE) to use in the new database
203203
"""
204204
return pulumi.get(self, "lc_ctype")
205205

206206
@property
207207
@pulumi.getter
208-
def name(self) -> str:
208+
def name(self) -> pulumi.Output[str]:
209209
"""
210210
The name of the database. Must be unique on the PostgreSQL
211211
server instance where it is configured.
@@ -214,7 +214,7 @@ def name(self) -> str:
214214

215215
@property
216216
@pulumi.getter
217-
def owner(self) -> str:
217+
def owner(self) -> pulumi.Output[str]:
218218
"""
219219
The role name of the user who will own the database, or
220220
`DEFAULT` to use the default (namely, the user executing the command). To
@@ -226,7 +226,7 @@ def owner(self) -> str:
226226

227227
@property
228228
@pulumi.getter(name="tablespaceName")
229-
def tablespace_name(self) -> str:
229+
def tablespace_name(self) -> pulumi.Output[str]:
230230
"""
231231
The name of the tablespace that will be
232232
associated with the database, or `DEFAULT` to use the template database's
@@ -237,7 +237,7 @@ def tablespace_name(self) -> str:
237237

238238
@property
239239
@pulumi.getter
240-
def template(self) -> str:
240+
def template(self) -> pulumi.Output[str]:
241241
"""
242242
The name of the template from which to create the new database
243243
"""

‎sdk/python/pulumi_postgresql/default_privileg.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class DefaultPrivileg(pulumi.CustomResource):
1717
warnings.warn("postgresql.DefaultPrivileg has been deprecated in favor of postgresql.DefaultPrivileges", DeprecationWarning)
1818

1919
def __init__(__self__,
20-
resource_name,
20+
resource_name: str,
2121
opts: Optional[pulumi.ResourceOptions] = None,
2222
database: Optional[pulumi.Input[str]] = None,
2323
object_type: Optional[pulumi.Input[str]] = None,
@@ -119,47 +119,47 @@ def get(resource_name: str,
119119

120120
@property
121121
@pulumi.getter
122-
def database(self) -> str:
122+
def database(self) -> pulumi.Output[str]:
123123
"""
124124
The database to grant default privileges for this role
125125
"""
126126
return pulumi.get(self, "database")
127127

128128
@property
129129
@pulumi.getter(name="objectType")
130-
def object_type(self) -> str:
130+
def object_type(self) -> pulumi.Output[str]:
131131
"""
132132
The PostgreSQL object type to set the default privileges on (one of: table, sequence, function, type)
133133
"""
134134
return pulumi.get(self, "object_type")
135135

136136
@property
137137
@pulumi.getter
138-
def owner(self) -> str:
138+
def owner(self) -> pulumi.Output[str]:
139139
"""
140140
Target role for which to alter default privileges.
141141
"""
142142
return pulumi.get(self, "owner")
143143

144144
@property
145145
@pulumi.getter
146-
def privileges(self) -> List[str]:
146+
def privileges(self) -> pulumi.Output[List[str]]:
147147
"""
148148
The list of privileges to apply as default privileges
149149
"""
150150
return pulumi.get(self, "privileges")
151151

152152
@property
153153
@pulumi.getter
154-
def role(self) -> str:
154+
def role(self) -> pulumi.Output[str]:
155155
"""
156156
The name of the role to which grant default privileges on
157157
"""
158158
return pulumi.get(self, "role")
159159

160160
@property
161161
@pulumi.getter
162-
def schema(self) -> str:
162+
def schema(self) -> pulumi.Output[str]:
163163
"""
164164
The database schema to set default privileges for this role
165165
"""

‎sdk/python/pulumi_postgresql/default_privileges.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
class DefaultPrivileges(pulumi.CustomResource):
1515
def __init__(__self__,
16-
resource_name,
16+
resource_name: str,
1717
opts: Optional[pulumi.ResourceOptions] = None,
1818
database: Optional[pulumi.Input[str]] = None,
1919
object_type: Optional[pulumi.Input[str]] = None,
@@ -134,47 +134,47 @@ def get(resource_name: str,
134134

135135
@property
136136
@pulumi.getter
137-
def database(self) -> str:
137+
def database(self) -> pulumi.Output[str]:
138138
"""
139139
The database to grant default privileges for this role.
140140
"""
141141
return pulumi.get(self, "database")
142142

143143
@property
144144
@pulumi.getter(name="objectType")
145-
def object_type(self) -> str:
145+
def object_type(self) -> pulumi.Output[str]:
146146
"""
147147
The PostgreSQL object type to set the default privileges on (one of: table, sequence, function, type).
148148
"""
149149
return pulumi.get(self, "object_type")
150150

151151
@property
152152
@pulumi.getter
153-
def owner(self) -> str:
153+
def owner(self) -> pulumi.Output[str]:
154154
"""
155155
Role for which apply default privileges (You can change default privileges only for objects that will be created by yourself or by roles that you are a member of).
156156
"""
157157
return pulumi.get(self, "owner")
158158

159159
@property
160160
@pulumi.getter
161-
def privileges(self) -> List[str]:
161+
def privileges(self) -> pulumi.Output[List[str]]:
162162
"""
163163
The list of privileges to apply as default privileges.
164164
"""
165165
return pulumi.get(self, "privileges")
166166

167167
@property
168168
@pulumi.getter
169-
def role(self) -> str:
169+
def role(self) -> pulumi.Output[str]:
170170
"""
171171
The name of the role to which grant default privileges on.
172172
"""
173173
return pulumi.get(self, "role")
174174

175175
@property
176176
@pulumi.getter
177-
def schema(self) -> str:
177+
def schema(self) -> pulumi.Output[str]:
178178
"""
179179
The database schema to set default privileges for this role.
180180
"""

‎sdk/python/pulumi_postgresql/extension.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
class Extension(pulumi.CustomResource):
1515
def __init__(__self__,
16-
resource_name,
16+
resource_name: str,
1717
opts: Optional[pulumi.ResourceOptions] = None,
1818
database: Optional[pulumi.Input[str]] = None,
1919
name: Optional[pulumi.Input[str]] = None,
@@ -101,31 +101,31 @@ def get(resource_name: str,
101101

102102
@property
103103
@pulumi.getter
104-
def database(self) -> str:
104+
def database(self) -> pulumi.Output[str]:
105105
"""
106106
Which database to create the extension on. Defaults to provider database.
107107
"""
108108
return pulumi.get(self, "database")
109109

110110
@property
111111
@pulumi.getter
112-
def name(self) -> str:
112+
def name(self) -> pulumi.Output[str]:
113113
"""
114114
The name of the extension.
115115
"""
116116
return pulumi.get(self, "name")
117117

118118
@property
119119
@pulumi.getter
120-
def schema(self) -> str:
120+
def schema(self) -> pulumi.Output[str]:
121121
"""
122122
Sets the schema of an extension.
123123
"""
124124
return pulumi.get(self, "schema")
125125

126126
@property
127127
@pulumi.getter
128-
def version(self) -> str:
128+
def version(self) -> pulumi.Output[str]:
129129
"""
130130
Sets the version number of the extension.
131131
"""

‎sdk/python/pulumi_postgresql/grant.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
class Grant(pulumi.CustomResource):
1515
def __init__(__self__,
16-
resource_name,
16+
resource_name: str,
1717
opts: Optional[pulumi.ResourceOptions] = None,
1818
database: Optional[pulumi.Input[str]] = None,
1919
object_type: Optional[pulumi.Input[str]] = None,
@@ -129,47 +129,47 @@ def get(resource_name: str,
129129

130130
@property
131131
@pulumi.getter
132-
def database(self) -> str:
132+
def database(self) -> pulumi.Output[str]:
133133
"""
134134
The database to grant privileges on for this role.
135135
"""
136136
return pulumi.get(self, "database")
137137

138138
@property
139139
@pulumi.getter(name="objectType")
140-
def object_type(self) -> str:
140+
def object_type(self) -> pulumi.Output[str]:
141141
"""
142142
The PostgreSQL object type to grant the privileges on (one of: database, table, sequence,function).
143143
"""
144144
return pulumi.get(self, "object_type")
145145

146146
@property
147147
@pulumi.getter
148-
def privileges(self) -> List[str]:
148+
def privileges(self) -> pulumi.Output[List[str]]:
149149
"""
150150
The list of privileges to grant. There are different kinds of privileges: SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER, CREATE, CONNECT, TEMPORARY, EXECUTE, and USAGE.
151151
"""
152152
return pulumi.get(self, "privileges")
153153

154154
@property
155155
@pulumi.getter
156-
def role(self) -> str:
156+
def role(self) -> pulumi.Output[str]:
157157
"""
158158
The name of the role to grant privileges on.
159159
"""
160160
return pulumi.get(self, "role")
161161

162162
@property
163163
@pulumi.getter
164-
def schema(self) -> Optional[str]:
164+
def schema(self) -> pulumi.Output[Optional[str]]:
165165
"""
166166
The database schema to grant privileges on for this role.
167167
"""
168168
return pulumi.get(self, "schema")
169169

170170
@property
171171
@pulumi.getter(name="withGrantOption")
172-
def with_grant_option(self) -> Optional[bool]:
172+
def with_grant_option(self) -> pulumi.Output[Optional[bool]]:
173173
"""
174174
Permit the grant recipient to grant it to others
175175
"""

‎sdk/python/pulumi_postgresql/provider.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
class Provider(pulumi.ProviderResource):
1717
def __init__(__self__,
18-
resource_name,
18+
resource_name: str,
1919
opts: Optional[pulumi.ResourceOptions] = None,
2020
clientcert: Optional[pulumi.Input[pulumi.InputType['ProviderClientcertArgs']]] = None,
2121
connect_timeout: Optional[pulumi.Input[float]] = None,

0 commit comments

Comments
 (0)