Skip to content

Commit 9313775

Browse files
stack72stack72
authored
Merge pull request #104 from pulumi/bridge-v2.19.0
Upgrade to v2.19.0 of the pulumi-terraform-bridge
2 parents 6591f2b + 1a380ee commit 9313775

File tree

31 files changed

+1422
-274
lines changed

31 files changed

+1422
-274
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
## HEAD (Unreleased)
2-
_(none)_
2+
* Upgrade to pulumi-terraform-bridge v2.19.0
3+
**Please Note:** This includes a bug fix that stops mutating resources options in the nodejs provider
4+
* Avoid storing config from the environment into the state
35

46
---
57

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

Lines changed: 14 additions & 70 deletions
Large diffs are not rendered by default.

‎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.18.1
8-
github.com/pulumi/pulumi/sdk/v2 v2.18.0
7+
github.com/pulumi/pulumi-terraform-bridge/v2 v2.19.0
8+
github.com/pulumi/pulumi/sdk/v2 v2.20.1-0.20210212181059-f4b0fa86fedc
99
github.com/terraform-providers/terraform-provider-postgresql v1.7.1
1010
)
1111

‎provider/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -627,13 +627,13 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
627627
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
628628
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
629629
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
630-
github.com/pulumi/pulumi-terraform-bridge/v2 v2.18.1 h1:1j7tmOWhR3gvK9T8smYmMxqpOj+CbLCYmMvdbwP4bOI=
631-
github.com/pulumi/pulumi-terraform-bridge/v2 v2.18.1/go.mod h1:UrgBEaSeCcTUfjd4bdYe3YdQpBMr4ewN00wuVH+jDh0=
632-
github.com/pulumi/pulumi/pkg/v2 v2.18.0 h1:vH+VyzpxWZVW7CSJ7ThD0w6uKXQa5j+TptzyQM6eT2o=
633-
github.com/pulumi/pulumi/pkg/v2 v2.18.0/go.mod h1:bAbzFeU3gHu1diqcckqUqaFf5dP02BfJlP8dnHwm00k=
630+
github.com/pulumi/pulumi-terraform-bridge/v2 v2.19.0 h1:V5pLq3IwjdnhZYJyU7FZBA9jpgdj3cAOSyPfLD8HjWA=
631+
github.com/pulumi/pulumi-terraform-bridge/v2 v2.19.0/go.mod h1:uvKH79L6R+rBhfqxp6gZqxasm904MvNoc/UtFcCCvVI=
632+
github.com/pulumi/pulumi/pkg/v2 v2.20.1-0.20210212181059-f4b0fa86fedc h1:OKgY4zg5/aksD8XNrjKQi1z4axbGh+R70hCbZNrRHAM=
633+
github.com/pulumi/pulumi/pkg/v2 v2.20.1-0.20210212181059-f4b0fa86fedc/go.mod h1:bAbzFeU3gHu1diqcckqUqaFf5dP02BfJlP8dnHwm00k=
634634
github.com/pulumi/pulumi/sdk/v2 v2.2.1/go.mod h1:QNbWpL4gvf3X0lUFT7TXA2Jo1ff/Ti2l97AyFGYwvW4=
635-
github.com/pulumi/pulumi/sdk/v2 v2.18.0 h1:fOno92mnb/4xoVV+TqtQG0W6KCJLe87JyfBVVhZ8voE=
636-
github.com/pulumi/pulumi/sdk/v2 v2.18.0/go.mod h1:fCFhRV6NmidWetmgDPA76efL+s0JqLlS54JJIwfOt+o=
635+
github.com/pulumi/pulumi/sdk/v2 v2.20.1-0.20210212181059-f4b0fa86fedc h1:3fFCltLbUZE0eMJu/MYDP2W43oqM45iuKcbbuqi94gk=
636+
github.com/pulumi/pulumi/sdk/v2 v2.20.1-0.20210212181059-f4b0fa86fedc/go.mod h1:fCFhRV6NmidWetmgDPA76efL+s0JqLlS54JJIwfOt+o=
637637
github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e h1:Dik4Qe/+xguB8JagPyXNlbOnRiXGmq/PSPQTGunYnTk=
638638
github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e/go.mod h1:sZ9FUzGO+yM41hsQHs/yIcj/Y993qMdBxBU5mpDmAfQ=
639639
github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=

‎provider/resources.go‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -76,34 +76,6 @@ func Provider() tfbridge.ProviderInfo {
7676
Homepage: "https://pulumi.io",
7777
Repository: "https://github.com/pulumi/pulumi-postgresql",
7878
Config: map[string]*tfbridge.SchemaInfo{
79-
"host": {
80-
Default: &tfbridge.DefaultInfo{
81-
EnvVars: []string{"PGHOST"},
82-
},
83-
},
84-
"port": {
85-
Default: &tfbridge.DefaultInfo{
86-
EnvVars: []string{"PGPORT"},
87-
Value: 5432,
88-
},
89-
},
90-
"database": {
91-
Default: &tfbridge.DefaultInfo{
92-
EnvVars: []string{"PGDATABASE"},
93-
Value: "postgres",
94-
},
95-
},
96-
"username": {
97-
Default: &tfbridge.DefaultInfo{
98-
EnvVars: []string{"PGUSER"},
99-
Value: "postgres",
100-
},
101-
},
102-
"password": {
103-
Default: &tfbridge.DefaultInfo{
104-
EnvVars: []string{"PGPASSWORD"},
105-
},
106-
},
10779
"sslmode": {
10880
Default: &tfbridge.DefaultInfo{
10981
EnvVars: []string{"PGSSLMODE"},

‎sdk/dotnet/Config/Config.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static class Config
2121
/// <summary>
2222
/// The name of the database to connect to in order to conenct to (defaults to `postgres`).
2323
/// </summary>
24-
public static string? Database { get; set; } = __config.Get("database") ?? Utilities.GetEnv("PGDATABASE") ?? "postgres";
24+
public static string? Database { get; set; } = __config.Get("database");
2525

2626
/// <summary>
2727
/// Database username associated to the connected user (for user name maps)
@@ -36,7 +36,7 @@ public static class Config
3636
/// <summary>
3737
/// Name of PostgreSQL server address to connect to
3838
/// </summary>
39-
public static string? Host { get; set; } = __config.Get("host") ?? Utilities.GetEnv("PGHOST");
39+
public static string? Host { get; set; } = __config.Get("host");
4040

4141
/// <summary>
4242
/// Maximum number of connections to establish to the database. Zero means unlimited.
@@ -46,12 +46,12 @@ public static class Config
4646
/// <summary>
4747
/// Password to be used if the PostgreSQL server demands password authentication
4848
/// </summary>
49-
public static string? Password { get; set; } = __config.Get("password") ?? Utilities.GetEnv("PGPASSWORD");
49+
public static string? Password { get; set; } = __config.Get("password");
5050

5151
/// <summary>
5252
/// The PostgreSQL port number to connect to at the server host, or socket file name extension for Unix-domain connections
5353
/// </summary>
54-
public static int? Port { get; set; } = __config.GetInt32("port") ?? Utilities.GetEnvInt32("PGPORT") ?? 5432;
54+
public static int? Port { get; set; } = __config.GetInt32("port");
5555

5656
public static string? Scheme { get; set; } = __config.Get("scheme");
5757

@@ -77,7 +77,7 @@ public static class Config
7777
/// <summary>
7878
/// PostgreSQL user name to connect as
7979
/// </summary>
80-
public static string? Username { get; set; } = __config.Get("username") ?? Utilities.GetEnv("PGUSER") ?? "postgres";
80+
public static string? Username { get; set; } = __config.Get("username");
8181

8282
public static class Types
8383
{

‎sdk/dotnet/Provider.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,7 @@ public sealed class ProviderArgs : Pulumi.ResourceArgs
134134
public ProviderArgs()
135135
{
136136
ConnectTimeout = Utilities.GetEnvInt32("PGCONNECT_TIMEOUT") ?? 180;
137-
Database = Utilities.GetEnv("PGDATABASE") ?? "postgres";
138-
Host = Utilities.GetEnv("PGHOST");
139-
Password = Utilities.GetEnv("PGPASSWORD");
140-
Port = Utilities.GetEnvInt32("PGPORT") ?? 5432;
141137
Sslmode = Utilities.GetEnv("PGSSLMODE");
142-
Username = Utilities.GetEnv("PGUSER") ?? "postgres";
143138
}
144139
}
145140
}

‎sdk/go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module github.com/pulumi/pulumi-postgresql/sdk/v2
33
go 1.14
44

55
require (
6+
github.com/blang/semver v3.5.1+incompatible
67
github.com/pkg/errors v0.9.1
7-
github.com/pulumi/pulumi/sdk/v2 v2.18.0
8+
github.com/pulumi/pulumi/sdk/v2 v2.20.0
89
)

0 commit comments

Comments
 (0)