Merge pull request #1140 from pulumi/mikhailshilkov/more-upgrade-tests

Enable more VPC upgrade tests
pulumi · Nov 3, 2023 · 5852b89 · 5852b89
2 parents 9340a4d + bb86cd0
commit 5852b89
Show file tree

Hide file tree

Showing 21 changed files with 15,596 additions and 17 deletions.
diff --git a/examples/ts-lb-simple/package.json b/examples/ts-lb-simple/package.json
@@ -5,9 +5,7 @@
   },
   "dependencies": {
     "@pulumi/aws": "^6.0.0",
+    "@pulumi/awsx": "latest",
     "@pulumi/pulumi": "^3.0.0"
-  },
-  "peerDependencies": {
-    "@pulumi/awsx": "latest"
   }
 }
diff --git a/examples/ts-lb-with-subnets/package.json b/examples/ts-lb-with-subnets/package.json
@@ -5,9 +5,7 @@
   },
   "dependencies": {
     "@pulumi/aws": "^6.0.0",
-    "@pulumi/pulumi": "^3.0.0"
-  },
-  "peerDependencies": {
+    "@pulumi/pulumi": "^3.0.0",
     "@pulumi/awsx": "latest"
   }
 }
diff --git a/examples/vpc/nodejs/custom-provider/package.json b/examples/vpc/nodejs/custom-provider/package.json
@@ -1,10 +1,11 @@
 {
     "name": "nodejs",
     "devDependencies": {
-        "@types/node": "^14"
+        "@types/node": "^18"
     },
     "dependencies": {
         "@pulumi/aws": "^6.0.0",
+        "@pulumi/awsx": "latest",
         "@pulumi/pulumi": "^3.0.0"
     }
 }
diff --git a/examples/vpc/nodejs/specific-vpc-layout/package.json b/examples/vpc/nodejs/specific-vpc-layout/package.json
@@ -1,9 +1,10 @@
 {
     "name": "nodejs",
     "devDependencies": {
-        "@types/node": "^14"
+        "@types/node": "^18"
     },
     "dependencies": {
-        "@pulumi/pulumi": "^3.0.0"
+        "@pulumi/pulumi": "^3.0.0",
+        "@pulumi/awsx": "latest"
     }
 }
diff --git a/examples/vpc/nodejs/vpc-multiple-similar-subnet-types/package.json b/examples/vpc/nodejs/vpc-multiple-similar-subnet-types/package.json
@@ -1,9 +1,10 @@
 {
     "name": "nodejs",
     "devDependencies": {
-        "@types/node": "^14"
+        "@types/node": "^18"
     },
     "dependencies": {
+        "@pulumi/awsx": "latest",
         "@pulumi/pulumi": "^3.0.0"
     }
 }
diff --git a/examples/vpc/nodejs/vpc-subnets-with-tags/package.json b/examples/vpc/nodejs/vpc-subnets-with-tags/package.json
@@ -1,9 +1,10 @@
 {
     "name": "nodejs",
     "devDependencies": {
-        "@types/node": "^14"
+        "@types/node": "^18"
     },
     "dependencies": {
+        "@pulumi/awsx": "latest",
         "@pulumi/pulumi": "^3.0.0"
     }
 }
diff --git a/examples/vpc/nodejs/vpc-with-service-endpoint/package.json b/examples/vpc/nodejs/vpc-with-service-endpoint/package.json
@@ -1,9 +1,10 @@
 {
     "name": "nodejs",
     "devDependencies": {
-        "@types/node": "^14"
+        "@types/node": "^18"
     },
     "dependencies": {
+        "@pulumi/awsx": "latest",
         "@pulumi/pulumi": "^3.0.0"
     }
 }
diff --git a/provider/provider_nodejs_test.go b/provider/provider_nodejs_test.go
@@ -33,18 +33,26 @@ func TestExamples(t *testing.T) {
 
 		"cloudtrail/nodejs",
 		"vpc/nodejs/default-args",
+		"vpc/nodejs/specific-vpc-layout",
+		"vpc/nodejs/vpc-with-service-endpoint",
+		"vpc/nodejs/vpc-multiple-similar-subnet-types",
+		"vpc/nodejs/vpc-subnets-with-tags",
 
 		// TODO[pulumi/pulumi-awsx#1114] this passes locally on Mac OS and Pulumi 3.86.0 but is failing in CI.
 		// "ts-nlb-simple",
+		// "ts-lb-simple",
 
 		// TODO[pulumi/pulumi-awsx#1112] skipping recording a few programs that time out locally after 20min.
-		// "ts-lb-simple",
+		// "ts-lb-with-subnets",
+		// "ts-lb-attach-lambda",
+		// "ts-lb-attach-ec2",
+
 		// TODO[pulumi/providertest#21] ecs/nodejs clobbers cloudtrail/nodejs.
 		// "ecs/nodejs"
 
 		// Skipping because it does not work on pre-2.x versions, so upgrade tests cannot run.
+		// "vpc/nodejs/custom-provider", // enableClassiclink and enableClassiclinkDnsSupport removed from outputs
 		// "ts-vpc-getDefaultVpc",  // Property 'vpc' does not exist
-		// "ts-ecr-simple",
 
 		// Still need to try recording these:
 		//
@@ -57,13 +65,13 @@ func TestExamples(t *testing.T) {
 		// "vpc/nodejs/vpc-with-service-endpoint",
 		// "vpc/nodejs/vpc-multiple-similar-subnet-types",
 		// "vpc/nodejs/vpc-subnets-with-tags",
+		// "ts-ecr-simple", // docker.Patch -> docker.Context
 	}
 
 	for _, ex := range examples {
 		dir := filepath.Join("..", "examples", ex)
 		t.Run(ex, test(dir).Run)
 	}
-
 }
 
 func test(dir string, opts ...providertest.Option) *providertest.ProviderTest {
@@ -74,13 +82,13 @@ func test(dir string, opts ...providertest.Option) *providertest.ProviderTest {
 			providertest.UpgradeTestMode_Quick,
 			"Quick mode is only supported for providers written in Go at the moment"),
 
-		providertest.WithBaselineVersion("1.0.6"),
+		providertest.WithBaselineVersion("1.0.6"), // latest v1
 
 		// Ensure we use the same region for all tests - when recording and replaying.
 		providertest.WithConfig("aws:region", "us-west-2"),
 
 		providertest.WithExtraBaselineDependencies(map[string]string{
-			"aws": "5.42.0",
+			"aws": "5.42.0", // latest v5
 		}),
 	)
 

diff --git a/provider/testdata/recorded/TestProviderUpgrade/custom-provider/1.0.6/grpc.json b/provider/testdata/recorded/TestProviderUpgrade/custom-provider/1.0.6/grpc.json