Skip to content

Commit 7547cd9

Browse files
pulumi-botiwahbe
pulumi-bot
and
iwahbe
authored
Upgrade pulumi-terraform-bridge to v3.92.0 (#578)
This PR was generated via `$ upgrade-provider pulumi/pulumi-postgresql --kind=bridge --pr-reviewers=iwahbe`. --- - Upgrading pulumi-terraform-bridge from v3.91.1 to v3.92.0. --------- Co-authored-by: Ian Wahbe <me@iwahbe.com>
1 parent b24a874 commit 7547cd9

35 files changed

+280
-90
lines changed

‎docs/_index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ import (
14031403

14041404
func main() {
14051405
pulumi.Run(func(ctx *pulumi.Context) error {
1406-
current, err := core.GetClientConfig(ctx, nil, nil)
1406+
current, err := core.GetClientConfig(ctx, map[string]interface{}{}, nil)
14071407
if err != nil {
14081408
return err
14091409
}

‎examples/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/pulumi/pulumi-postgresql/examples/v3
22

33
go 1.21
44

5-
require github.com/pulumi/pulumi/pkg/v3 v3.133.0
5+
require github.com/pulumi/pulumi/pkg/v3 v3.136.1
66

77
require (
88
cloud.google.com/go v0.112.1 // indirect
@@ -123,7 +123,7 @@ require (
123123
github.com/pmezard/go-difflib v1.0.0 // indirect
124124
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
125125
github.com/pulumi/esc v0.10.0 // indirect
126-
github.com/pulumi/pulumi/sdk/v3 v3.133.0 // indirect
126+
github.com/pulumi/pulumi/sdk/v3 v3.136.1 // indirect
127127
github.com/rivo/uniseg v0.4.4 // indirect
128128
github.com/rogpeppe/go-internal v1.12.0 // indirect
129129
github.com/ryanuber/go-glob v1.0.0 // indirect

‎examples/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,10 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435
342342
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE=
343343
github.com/pulumi/esc v0.10.0 h1:jzBKzkLVW0mePeanDRfqSQoCJ5yrkux0jIwAkUxpRKE=
344344
github.com/pulumi/esc v0.10.0/go.mod h1:2Bfa+FWj/xl8CKqRTWbWgDX0SOD4opdQgvYSURTGK2c=
345-
github.com/pulumi/pulumi/pkg/v3 v3.133.0 h1:j1rd7ToLZIQc5H0427ISOXSbOIIemZ6B0MXtRhQ38Yg=
346-
github.com/pulumi/pulumi/pkg/v3 v3.133.0/go.mod h1:JtMAnrsFIccO138WcMfPdhO0PioDukKihnZC0xTRLwo=
347-
github.com/pulumi/pulumi/sdk/v3 v3.133.0 h1:o+7dbJZY9BVgAjOF5GYIWgjp/zpKAgWZwD4pPjUMXKQ=
348-
github.com/pulumi/pulumi/sdk/v3 v3.133.0/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8=
345+
github.com/pulumi/pulumi/pkg/v3 v3.136.1 h1:zA8aJZ7qI0QgZkBKjjQaYHEcigK6pZfrbfG38imXzWo=
346+
github.com/pulumi/pulumi/pkg/v3 v3.136.1/go.mod h1:Iz8QIs07AbEdrO52hEIEM5C4VBDUYFH2NdM9u2xxBxY=
347+
github.com/pulumi/pulumi/sdk/v3 v3.136.1 h1:VJWTgdBrLvvzIkMbGq/epNEfT65P9gTvw14UF/I7hTI=
348+
github.com/pulumi/pulumi/sdk/v3 v3.136.1/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI=
349349
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
350350
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
351351
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=

‎provider/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ toolchain go1.22.7
66

77
require (
88
github.com/cyrilgdn/terraform-provider-postgresql v0.0.0
9-
github.com/pulumi/providertest v0.0.14
10-
github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.1
11-
github.com/pulumi/pulumi/sdk/v3 v3.133.0
9+
github.com/pulumi/providertest v0.1.2
10+
github.com/pulumi/pulumi-terraform-bridge/v3 v3.92.0
11+
github.com/pulumi/pulumi/sdk/v3 v3.136.1
1212
github.com/stretchr/testify v1.9.0
1313
)
1414

@@ -172,8 +172,8 @@ require (
172172
github.com/pulumi/inflector v0.1.1 // indirect
173173
github.com/pulumi/pulumi-java/pkg v0.16.1 // indirect
174174
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 // indirect
175-
github.com/pulumi/pulumi-yaml v1.10.0 // indirect
176-
github.com/pulumi/pulumi/pkg/v3 v3.133.0 // indirect
175+
github.com/pulumi/pulumi-yaml v1.10.3 // indirect
176+
github.com/pulumi/pulumi/pkg/v3 v3.136.1 // indirect
177177
github.com/pulumi/schema-tools v0.1.2 // indirect
178178
github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
179179
github.com/rivo/uniseg v0.4.4 // indirect

‎provider/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1922,20 +1922,20 @@ github.com/pulumi/esc v0.10.0 h1:jzBKzkLVW0mePeanDRfqSQoCJ5yrkux0jIwAkUxpRKE=
19221922
github.com/pulumi/esc v0.10.0/go.mod h1:2Bfa+FWj/xl8CKqRTWbWgDX0SOD4opdQgvYSURTGK2c=
19231923
github.com/pulumi/inflector v0.1.1 h1:dvlxlWtXwOJTUUtcYDvwnl6Mpg33prhK+7mzeF+SobA=
19241924
github.com/pulumi/inflector v0.1.1/go.mod h1:HUFCjcPTz96YtTuUlwG3i3EZG4WlniBvR9bd+iJxCUY=
1925-
github.com/pulumi/providertest v0.0.14 h1:5QlAPAAs82jkQraHsJvq1xgVfC7xtW8sFJwv2pHgxQ8=
1926-
github.com/pulumi/providertest v0.0.14/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0=
1925+
github.com/pulumi/providertest v0.1.2 h1:9pJS9MeNkMyGwyNeHmvh8QqLgJy39Nk2/ym5u7r13ng=
1926+
github.com/pulumi/providertest v0.1.2/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0=
19271927
github.com/pulumi/pulumi-java/pkg v0.16.1 h1:orHnDWFbpOERwaBLry9f+6nqPX7x0MsrIkaa5QDGAns=
19281928
github.com/pulumi/pulumi-java/pkg v0.16.1/go.mod h1:QH0DihZkWYle9XFc+LJ76m4hUo+fA3RdyaM90pqOaSM=
1929-
github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.1 h1:Twh0IKS1pGHP6LHDq1oR0vbHlV52asoUCC7spEJl3Ao=
1930-
github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.1/go.mod h1:DvueDDtOIbf7W1Or4oH0o7F990ozp/ROmlm/vgLoe+g=
1929+
github.com/pulumi/pulumi-terraform-bridge/v3 v3.92.0 h1:LOUHyMFGYkchv4Bzej7v+1W1ooaspgQG6/oZVJ+3lXY=
1930+
github.com/pulumi/pulumi-terraform-bridge/v3 v3.92.0/go.mod h1:aI3U3eanRcyOX05No+Nk6FuJvppx4jjcQwFelHSI8yE=
19311931
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 h1:mav2tSitA9BPJPLLahKgepHyYsMzwaTm4cvp0dcTMYw=
19321932
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8/go.mod h1:qUYk2c9i/yqMGNj9/bQyXpS39BxNDSXYjVN1njnq0zY=
1933-
github.com/pulumi/pulumi-yaml v1.10.0 h1:djbgMJCxJBmYMr4kOpAXH5iauxGohYjEuTLfxD3NUUI=
1934-
github.com/pulumi/pulumi-yaml v1.10.0/go.mod h1://lTvwHpgJ+WBKeMGiLrd/jinc4dl3eWV5LZ3G8iCfE=
1935-
github.com/pulumi/pulumi/pkg/v3 v3.133.0 h1:j1rd7ToLZIQc5H0427ISOXSbOIIemZ6B0MXtRhQ38Yg=
1936-
github.com/pulumi/pulumi/pkg/v3 v3.133.0/go.mod h1:JtMAnrsFIccO138WcMfPdhO0PioDukKihnZC0xTRLwo=
1937-
github.com/pulumi/pulumi/sdk/v3 v3.133.0 h1:o+7dbJZY9BVgAjOF5GYIWgjp/zpKAgWZwD4pPjUMXKQ=
1938-
github.com/pulumi/pulumi/sdk/v3 v3.133.0/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8=
1933+
github.com/pulumi/pulumi-yaml v1.10.3 h1:j5cjPiE32ILmjrWnC1cfZ0MWdqCZ8fg9wlaWk7HOtM4=
1934+
github.com/pulumi/pulumi-yaml v1.10.3/go.mod h1:MFMQXkaUP5YQUKVJ6Z/aagZDl2f8hdU9oGaJfTcMf1Y=
1935+
github.com/pulumi/pulumi/pkg/v3 v3.136.1 h1:zA8aJZ7qI0QgZkBKjjQaYHEcigK6pZfrbfG38imXzWo=
1936+
github.com/pulumi/pulumi/pkg/v3 v3.136.1/go.mod h1:Iz8QIs07AbEdrO52hEIEM5C4VBDUYFH2NdM9u2xxBxY=
1937+
github.com/pulumi/pulumi/sdk/v3 v3.136.1 h1:VJWTgdBrLvvzIkMbGq/epNEfT65P9gTvw14UF/I7hTI=
1938+
github.com/pulumi/pulumi/sdk/v3 v3.136.1/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI=
19391939
github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo=
19401940
github.com/pulumi/schema-tools v0.1.2/go.mod h1:62lgj52Tzq11eqWTIaKd+EVyYAu5dEcDJxMhTjvMO/k=
19411941
github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abqkI3OhJ0G04LLI=

‎provider/provider_program_test.go‎

Lines changed: 6 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/pulumi/providertest/pulumitest"
1616
"github.com/pulumi/providertest/pulumitest/assertpreview"
1717
"github.com/pulumi/providertest/pulumitest/opttest"
18-
"github.com/pulumi/pulumi/sdk/v3/go/auto"
1918
)
2019

2120
const providerName = "postgresql"
@@ -33,63 +32,20 @@ func TestUpgradeCoverage(t *testing.T) {
3332
providertest.ReportUpgradeCoverage(t)
3433
}
3534

36-
type UpgradeTestOpts struct {
37-
baselineVersion string
38-
assertFunc func(*testing.T, auto.PreviewResult)
39-
config map[string]string
40-
}
41-
42-
func WithBaselineVersion(baselineVersion string) func(opts *UpgradeTestOpts) {
43-
return func(opts *UpgradeTestOpts) {
44-
opts.baselineVersion = baselineVersion
45-
}
46-
}
47-
48-
func WithAssertFunc(assertFunc func(*testing.T, auto.PreviewResult)) func(opts *UpgradeTestOpts) {
49-
return func(opts *UpgradeTestOpts) {
50-
opts.assertFunc = assertFunc
51-
}
52-
}
53-
54-
func WithConfig(config map[string]string) func(opts *UpgradeTestOpts) {
55-
return func(opts *UpgradeTestOpts) {
56-
opts.config = config
57-
}
58-
}
59-
func testProviderUpgrade(t *testing.T, dir string, opts ...func(*UpgradeTestOpts)) {
60-
options := &UpgradeTestOpts{}
61-
for _, o := range opts {
62-
o(options)
63-
}
64-
testProviderUpgradeWithOpts(t, dir, options.baselineVersion, options.config, options.assertFunc)
65-
}
66-
67-
func testProviderUpgradeWithOpts(
68-
t *testing.T, dir, baselineVersion string, config map[string]string,
69-
assertFunction func(*testing.T, auto.PreviewResult),
70-
) {
35+
func testProviderUpgrade(t *testing.T, dir string) {
7136
if testing.Short() {
7237
t.Skipf("Skipping in testing.Short() mode, assuming this is a CI run without credentials")
7338
}
7439
cwd, err := os.Getwd()
7540
require.NoError(t, err)
76-
if baselineVersion == "" {
77-
baselineVersion = defaultBaselineVersion
78-
}
41+
7942
test := pulumitest.NewPulumiTest(t, dir,
80-
opttest.DownloadProviderVersion(providerName, baselineVersion),
43+
opttest.DownloadProviderVersion(providerName, defaultBaselineVersion),
8144
opttest.LocalProviderPath(providerName, filepath.Join(cwd, "..", "bin")),
8245
)
83-
for k, v := range config {
84-
test.SetConfig(k, v)
85-
}
86-
result := providertest.PreviewProviderUpgrade(t, test, providerName, baselineVersion,
46+
result := providertest.PreviewProviderUpgrade(t, test, providerName, defaultBaselineVersion,
8747
optproviderupgrade.DisableAttach())
88-
if assertFunction != nil {
89-
assertFunction(t, result)
90-
} else {
91-
assertpreview.HasNoReplacements(t, result)
92-
}
48+
assertpreview.HasNoReplacements(t, result)
9349
}
9450

9551
func testProgram(t *testing.T, dir string) {
@@ -107,7 +63,7 @@ func testProgram(t *testing.T, dir string) {
10763
opttest.LocalProviderPath(providerName, filepath.Join(cwd, "..", "bin")),
10864
opttest.SkipInstall(),
10965
)
110-
test.Up()
66+
test.Up(t)
11167
}
11268

11369
func TestPrograms(t *testing.T) {

‎sdk/go.mod‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/go.sum‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/nodejs/package.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/python/pulumi_postgresql/_inputs.py‎

Lines changed: 75 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)