Merge branch 'pulumi:main' into cdk-metadata-messages

pulumi · Jan 22, 2024 · 17809c0 · 17809c0
2 parents dbc1ecb + 7537b91
commit 17809c0
Show file tree

Hide file tree

Showing 4 changed files with 3,246 additions and 124 deletions.
diff --git a/examples/examples_nodejs_test.go b/examples/examples_nodejs_test.go
@@ -63,6 +63,7 @@ func TestALB(t *testing.T) {
 		With(integration.ProgramTestOptions{
 			Dir:        filepath.Join(getCwd(t), "alb"),
 			NoParallel: true, // Resources may collide with TestFargate
+			RetryFailedSteps: true, // Workaround for https://github.com/pulumi/pulumi-aws-native/issues/1186
 		})
 
 	integration.ProgramTest(t, &test)
@@ -73,6 +74,7 @@ func TestFargate(t *testing.T) {
 		With(integration.ProgramTestOptions{
 			Dir:        filepath.Join(getCwd(t), "fargate"),
 			NoParallel: true,
+			RetryFailedSteps: true, // Workaround for https://github.com/pulumi/pulumi-aws-native/issues/1186
 		})
 
 	integration.ProgramTest(t, &test)

diff --git a/examples/go.mod b/examples/go.mod
@@ -2,4 +2,6 @@ module github.com/pulumi/pulumi-cdk/examples
 
 go 1.16
 
-require github.com/pulumi/pulumi/pkg/v3 v3.29.0
+require github.com/pulumi/pulumi/pkg/v3 v3.99.0
+
+replace sourcegraph.com/sourcegraph/appdash-data => github.com/sourcegraph/appdash-data v0.0.0-20151005211030-6f926ddc37d5