Skip to content

Commit bd9ae66

Browse files
stack72stack72
authored
Merge pull request #70 from pulumi/stack72/pulumi-v2.9.0
Upgrade to Pulumi v2.9.0
2 parents ce3190d + 302fd21 commit bd9ae66

File tree

27 files changed

+1281
-420
lines changed

27 files changed

+1281
-420
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## HEAD (Unreleased)
2-
_(none)_
2+
* Upgrade to pulumi-terraform-bridge v2.7.0
3+
* Upgrade to Pulumi v2.9.0, which adds type annotations and input/output classes to Python
34

45
---
56

‎README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
[![Build Status](https://travis-ci.com/pulumi/pulumi-postgresql.svg?token=eHg7Zp5zdDDJfTjY8ejq&branch=master)](https://travis-ci.com/pulumi/pulumi-postgresql)
1+
[![Actions Status](https://github.com/pulumi/pulumi-postgresql/workflows/master/badge.svg)](https://github.com/pulumi/pulumi-postgresql/actions)
2+
[![Slack](http://www.pulumi.com/images/docs/badges/slack.svg)](https://slack.pulumi.com)
3+
[![NPM version](https://badge.fury.io/js/%40pulumi%2Fpostgresql.svg)](https://www.npmjs.com/package/@pulumi/postgresql)
4+
[![Python version](https://badge.fury.io/py/pulumi-postgresql.svg)](https://pypi.org/project/pulumi-postgresql)
5+
[![NuGet version](https://badge.fury.io/nu/pulumi.postgresql.svg)](https://badge.fury.io/nu/pulumi.postgresql)
6+
[![PkgGoDev](https://pkg.go.dev/badge/github.com/pulumi/pulumi-postgresql/sdk/v2/go)](https://pkg.go.dev/github.com/pulumi/pulumi-postgresql/sdk/v2/go)
7+
[![License](https://img.shields.io/npm/l/%40pulumi%2Fpulumi.svg)](https://github.com/pulumi/pulumi-postgresql/blob/master/LICENSE)
28

39
# postgresql Resource Provider
410

‎provider/cmd/pulumi-resource-postgresql/schema.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,8 +1230,9 @@
12301230
"python": {
12311231
"readme": "\u003e This provider is a derived work of the [Terraform Provider](https://github.com/terraform-providers/terraform-provider-postgresql)\n\u003e distributed under [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). If you encounter a bug or missing feature,\n\u003e first check the [`pulumi/pulumi-postgresql` repo](https://github.com/pulumi/pulumi-postgresql/issues); however, if that doesn't turn up anything,\n\u003e please consult the source [`terraform-providers/terraform-provider-postgresql` repo](https://github.com/terraform-providers/terraform-provider-postgresql/issues).",
12321232
"requires": {
1233-
"pulumi": "\u003e=2.0.0,\u003c3.0.0"
1234-
}
1233+
"pulumi": "\u003e=2.9.0,\u003c3.0.0"
1234+
},
1235+
"usesIOClasses": true
12351236
}
12361237
}
12371238
}

‎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.5.4
8-
github.com/pulumi/pulumi/sdk/v2 v2.5.1-0.20200701223250-45d2fa95d60b
7+
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.2
8+
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200821035132-629254334213
99
github.com/terraform-providers/terraform-provider-postgresql v1.7.1
1010
)
1111

‎provider/go.sum‎

Lines changed: 124 additions & 0 deletions
Large diffs are not rendered by default.

‎provider/resources.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ func Provider() tfbridge.ProviderInfo {
131131
},
132132
},
133133
Python: &tfbridge.PythonInfo{
134-
// List any Python dependencies and their version ranges
135134
Requires: map[string]string{
136-
"pulumi": ">=2.0.0,<3.0.0",
135+
"pulumi": ">=2.9.0,<3.0.0",
137136
},
137+
UsesIOClasses: true,
138138
},
139139
CSharp: &tfbridge.CSharpInfo{
140140
PackageReferences: map[string]string{

‎sdk/dotnet/Pulumi.PostgreSql.csproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@
1919
<NoWarn>1701;1702;1591</NoWarn>
2020
</PropertyGroup>
2121

22+
<PropertyGroup>
23+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
24+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
25+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
26+
</PropertyGroup>
27+
28+
<ItemGroup>
29+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
30+
</ItemGroup>
31+
2232
<ItemGroup>
2333
<EmbeddedResource Include="version.txt" />
2434
<Content Include="version.txt" />

‎sdk/nodejs/provider.ts‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,22 @@ export class Provider extends pulumi.ProviderResource {
3737
*/
3838
constructor(name: string, args?: ProviderArgs, opts?: pulumi.ResourceOptions) {
3939
let inputs: pulumi.Inputs = {};
40-
inputs["clientcert"] = pulumi.output(args ? args.clientcert : undefined).apply(JSON.stringify);
41-
inputs["connectTimeout"] = pulumi.output((args ? args.connectTimeout : undefined) || (<any>utilities.getEnvNumber("PGCONNECT_TIMEOUT") || 180)).apply(JSON.stringify);
42-
inputs["database"] = (args ? args.database : undefined) || (utilities.getEnv("PGDATABASE") || "postgres");
43-
inputs["databaseUsername"] = args ? args.databaseUsername : undefined;
44-
inputs["expectedVersion"] = args ? args.expectedVersion : undefined;
45-
inputs["host"] = (args ? args.host : undefined) || utilities.getEnv("PGHOST");
46-
inputs["maxConnections"] = pulumi.output(args ? args.maxConnections : undefined).apply(JSON.stringify);
47-
inputs["password"] = (args ? args.password : undefined) || utilities.getEnv("PGPASSWORD");
48-
inputs["port"] = pulumi.output((args ? args.port : undefined) || (<any>utilities.getEnvNumber("PGPORT") || 5432)).apply(JSON.stringify);
49-
inputs["sslMode"] = args ? args.sslMode : undefined;
50-
inputs["sslmode"] = (args ? args.sslmode : undefined) || utilities.getEnv("PGSSLMODE");
51-
inputs["sslrootcert"] = args ? args.sslrootcert : undefined;
52-
inputs["superuser"] = pulumi.output(args ? args.superuser : undefined).apply(JSON.stringify);
53-
inputs["username"] = (args ? args.username : undefined) || (utilities.getEnv("PGUSER") || "postgres");
40+
{
41+
inputs["clientcert"] = pulumi.output(args ? args.clientcert : undefined).apply(JSON.stringify);
42+
inputs["connectTimeout"] = pulumi.output((args ? args.connectTimeout : undefined) || (<any>utilities.getEnvNumber("PGCONNECT_TIMEOUT") || 180)).apply(JSON.stringify);
43+
inputs["database"] = (args ? args.database : undefined) || (utilities.getEnv("PGDATABASE") || "postgres");
44+
inputs["databaseUsername"] = args ? args.databaseUsername : undefined;
45+
inputs["expectedVersion"] = args ? args.expectedVersion : undefined;
46+
inputs["host"] = (args ? args.host : undefined) || utilities.getEnv("PGHOST");
47+
inputs["maxConnections"] = pulumi.output(args ? args.maxConnections : undefined).apply(JSON.stringify);
48+
inputs["password"] = (args ? args.password : undefined) || utilities.getEnv("PGPASSWORD");
49+
inputs["port"] = pulumi.output((args ? args.port : undefined) || (<any>utilities.getEnvNumber("PGPORT") || 5432)).apply(JSON.stringify);
50+
inputs["sslMode"] = args ? args.sslMode : undefined;
51+
inputs["sslmode"] = (args ? args.sslmode : undefined) || utilities.getEnv("PGSSLMODE");
52+
inputs["sslrootcert"] = args ? args.sslrootcert : undefined;
53+
inputs["superuser"] = pulumi.output(args ? args.superuser : undefined).apply(JSON.stringify);
54+
inputs["username"] = (args ? args.username : undefined) || (utilities.getEnv("PGUSER") || "postgres");
55+
}
5456
if (!opts) {
5557
opts = {}
5658
}

‎sdk/python/README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
[![Build Status](https://travis-ci.com/pulumi/pulumi-postgresql.svg?token=eHg7Zp5zdDDJfTjY8ejq&branch=master)](https://travis-ci.com/pulumi/pulumi-postgresql)
1+
[![Actions Status](https://github.com/pulumi/pulumi-postgresql/workflows/master/badge.svg)](https://github.com/pulumi/pulumi-postgresql/actions)
2+
[![Slack](http://www.pulumi.com/images/docs/badges/slack.svg)](https://slack.pulumi.com)
3+
[![NPM version](https://badge.fury.io/js/%40pulumi%2Fpostgresql.svg)](https://www.npmjs.com/package/@pulumi/postgresql)
4+
[![Python version](https://badge.fury.io/py/pulumi-postgresql.svg)](https://pypi.org/project/pulumi-postgresql)
5+
[![NuGet version](https://badge.fury.io/nu/pulumi.postgresql.svg)](https://badge.fury.io/nu/pulumi.postgresql)
6+
[![PkgGoDev](https://pkg.go.dev/badge/github.com/pulumi/pulumi-postgresql/sdk/v2/go)](https://pkg.go.dev/github.com/pulumi/pulumi-postgresql/sdk/v2/go)
7+
[![License](https://img.shields.io/npm/l/%40pulumi%2Fpulumi.svg)](https://github.com/pulumi/pulumi-postgresql/blob/master/LICENSE)
28

39
# postgresql Resource Provider
410

‎sdk/python/pulumi_postgresql/__init__.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,10 @@
1111
from .provider import *
1212
from .role import *
1313
from .schema import *
14+
from ._inputs import *
15+
from . import outputs
16+
17+
# Make subpackages available:
18+
from . import (
19+
config,
20+
)

0 commit comments

Comments
 (0)