Merge branch 'main' into TheRealAmazonKendra/batch-test-fix

mergify[bot] · web-flow · commit b1084e880757 · 2022-08-11T21:21:27.000Z
diff --git a/packages/@aws-cdk/aws-cloud9/lib/environment.ts b/packages/@aws-cdk/aws-cloud9/lib/environment.ts
@@ -34,6 +34,8 @@ export enum ConnectionType {
   CONNECT_SSH = 'CONNECT_SSH',
   /**
    * Connect through AWS Systems Manager
+   * When using SSM, service role and instance profile aren't automatically created.
+   * See https://docs.aws.amazon.com/cloud9/latest/user-guide/ec2-ssm.html#service-role-ssm
    */
   CONNECT_SSM = 'CONNECT_SSM'
 }
diff --git a/packages/@aws-cdk/aws-cloud9/test/cloud9.integ.snapshot/C9Stack.assets.json b/packages/@aws-cdk/aws-cloud9/test/cloud9.integ.snapshot/C9Stack.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "20.0.0",
   "files": {
-    "f9e7c320234302f703a47f0be7da188a1e91f7863c71a04835efd508d926216c": {
+    "bce46c387f7a562ced8e71e7f0c8bd1829de8aa12a8f5938bf4ccba9f3748d84": {
       "source": {
         "path": "C9Stack.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "f9e7c320234302f703a47f0be7da188a1e91f7863c71a04835efd508d926216c.json",
+          "objectKey": "bce46c387f7a562ced8e71e7f0c8bd1829de8aa12a8f5938bf4ccba9f3748d84.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
diff --git a/packages/@aws-cdk/aws-cloud9/test/cloud9.integ.snapshot/C9Stack.template.json b/packages/@aws-cdk/aws-cloud9/test/cloud9.integ.snapshot/C9Stack.template.json
@@ -360,9 +360,9 @@
   "C9EnvF05FC3BE": {
    "Type": "AWS::Cloud9::EnvironmentEC2",
    "Properties": {
+    "InstanceType": "t2.micro",
     "ConnectionType": "CONNECT_SSH",
     "ImageId": "amazonlinux-2-x86_64",
-    "InstanceType": "t2.micro",
     "Repositories": [
      {
       "PathComponent": "/foo",
diff --git a/packages/@aws-cdk/aws-cloud9/test/cloud9.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-cloud9/test/cloud9.integ.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"17.0.0"}
+{"version":"20.0.0"}
diff --git a/packages/@aws-cdk/aws-cloud9/test/cloud9.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-cloud9/test/cloud9.integ.snapshot/manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "17.0.0",
+  "version": "20.0.0",
   "artifacts": {
     "Tree": {
       "type": "cdk:tree",
diff --git a/packages/@aws-cdk/aws-cloud9/test/cloud9.integ.snapshot/tree.json b/packages/@aws-cdk/aws-cloud9/test/cloud9.integ.snapshot/tree.json
@@ -8,8 +8,8 @@
         "id": "Tree",
         "path": "Tree",
         "constructInfo": {
-          "fqn": "@aws-cdk/core.Construct",
-          "version": "0.0.0"
+          "fqn": "constructs.Construct",
+          "version": "10.1.71"
         }
       },
       "C9Stack": {
@@ -646,6 +646,8 @@
                   "aws:cdk:cloudformation:type": "AWS::Cloud9::EnvironmentEC2",
                   "aws:cdk:cloudformation:props": {
                     "instanceType": "t2.micro",
+                    "connectionType": "CONNECT_SSH",
+                    "imageId": "amazonlinux-2-x86_64",
                     "repositories": [
                       {
                         "repositoryUrl": {
diff --git a/packages/@aws-cdk/aws-cloud9/test/connection-type.integ.snapshot/C9ConnectionTypeStack.template.json b/packages/@aws-cdk/aws-cloud9/test/connection-type.integ.snapshot/C9ConnectionTypeStack.template.json
@@ -10,7 +10,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "C9Stack/VPC"
+      "Value": "C9ConnectionTypeStack/VPC"
      }
     ]
    }
@@ -42,7 +42,7 @@
      },
      {
       "Key": "Name",
-      "Value": "C9Stack/VPC/PublicSubnet1"
+      "Value": "C9ConnectionTypeStack/VPC/PublicSubnet1"
      }
     ]
    }
@@ -56,7 +56,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "C9Stack/VPC/PublicSubnet1"
+      "Value": "C9ConnectionTypeStack/VPC/PublicSubnet1"
      }
     ]
    }
@@ -94,7 +94,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "C9Stack/VPC/PublicSubnet1"
+      "Value": "C9ConnectionTypeStack/VPC/PublicSubnet1"
      }
     ]
    }
@@ -114,7 +114,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "C9Stack/VPC/PublicSubnet1"
+      "Value": "C9ConnectionTypeStack/VPC/PublicSubnet1"
      }
     ]
    }
@@ -146,7 +146,7 @@
      },
      {
       "Key": "Name",
-      "Value": "C9Stack/VPC/PublicSubnet2"
+      "Value": "C9ConnectionTypeStack/VPC/PublicSubnet2"
      }
     ]
    }
@@ -160,7 +160,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "C9Stack/VPC/PublicSubnet2"
+      "Value": "C9ConnectionTypeStack/VPC/PublicSubnet2"
      }
     ]
    }
@@ -218,7 +218,7 @@
      },
      {
       "Key": "Name",
-      "Value": "C9Stack/VPC/PrivateSubnet1"
+      "Value": "C9ConnectionTypeStack/VPC/PrivateSubnet1"
      }
     ]
    }
@@ -232,7 +232,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "C9Stack/VPC/PrivateSubnet1"
+      "Value": "C9ConnectionTypeStack/VPC/PrivateSubnet1"
      }
     ]
    }
@@ -287,7 +287,7 @@
      },
      {
       "Key": "Name",
-      "Value": "C9Stack/VPC/PrivateSubnet2"
+      "Value": "C9ConnectionTypeStack/VPC/PrivateSubnet2"
      }
     ]
    }
@@ -301,7 +301,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "C9Stack/VPC/PrivateSubnet2"
+      "Value": "C9ConnectionTypeStack/VPC/PrivateSubnet2"
      }
     ]
    }
@@ -335,7 +335,7 @@
     "Tags": [
      {
       "Key": "Name",
-      "Value": "C9Stack/VPC"
+      "Value": "C9ConnectionTypeStack/VPC"
      }
     ]
    }
@@ -360,9 +360,9 @@
   "C9EnvF05FC3BE": {
    "Type": "AWS::Cloud9::EnvironmentEC2",
    "Properties": {
-    "ConnectionType": "CONNECT_SSM",
-    "ImageId": "amazonlinux-2-x86_64",
     "InstanceType": "t2.micro",
+    "ConnectionType": "CONNECT_SSH",
+    "ImageId": "amazonlinux-2-x86_64",
     "Repositories": [
      {
       "PathComponent": "/foo",
diff --git a/packages/@aws-cdk/aws-cloud9/test/connection-type.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-cloud9/test/connection-type.integ.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"17.0.0"}
+{"version":"20.0.0"}
diff --git a/packages/@aws-cdk/aws-cloud9/test/connection-type.integ.snapshot/cloud9connectiontypeDefaultTestDeployAssert401C3608.template.json b/packages/@aws-cdk/aws-cloud9/test/connection-type.integ.snapshot/cloud9connectiontypeDefaultTestDeployAssert401C3608.template.json
@@ -0,0 +1 @@
+{}
diff --git a/packages/@aws-cdk/aws-cloud9/test/connection-type.integ.snapshot/integ.json b/packages/@aws-cdk/aws-cloud9/test/connection-type.integ.snapshot/integ.json
@@ -1,14 +1,11 @@
 {
   "version": "20.0.0",
   "testCases": {
-    "integ.connection-type": {
+    "cloud-9-connection-type/DefaultTest": {
       "stacks": [
-        "C9Stack"
+        "C9ConnectionTypeStack"
       ],
-      "diffAssets": false,
-      "stackUpdateWorkflow": true
+      "assertionStack": "cloud9connectiontypeDefaultTestDeployAssert401C3608"
     }
-  },
-  "synthContext": {},
-  "enableLookups": false
+  }
 }
diff --git a/packages/@aws-cdk/aws-cloud9/test/connection-type.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-cloud9/test/connection-type.integ.snapshot/manifest.json
diff --git a/packages/@aws-cdk/aws-cloud9/test/connection-type.integ.snapshot/tree.json b/packages/@aws-cdk/aws-cloud9/test/connection-type.integ.snapshot/tree.json
diff --git a/packages/@aws-cdk/aws-cloud9/test/image-id.integ.snapshot/C9Stack.template.json b/packages/@aws-cdk/aws-cloud9/test/image-id.integ.snapshot/C9Stack.template.json
diff --git a/packages/@aws-cdk/aws-cloud9/test/image-id.integ.snapshot/tree.json b/packages/@aws-cdk/aws-cloud9/test/image-id.integ.snapshot/tree.json
diff --git a/packages/@aws-cdk/aws-cloud9/test/integ.connection-type.ts b/packages/@aws-cdk/aws-cloud9/test/integ.connection-type.ts

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ export enum ConnectionType {`
`34`	`34`	`CONNECT_SSH = 'CONNECT_SSH',`
`35`	`35`	`/**`
`36`	`36`	`* Connect through AWS Systems Manager`
	`37`	`+ * When using SSM, service role and instance profile aren't automatically created.`
	`38`	`+ * See https://docs.aws.amazon.com/cloud9/latest/user-guide/ec2-ssm.html#service-role-ssm`
`37`	`39`	`*/`
`38`	`40`	`CONNECT_SSM = 'CONNECT_SSM'`
`39`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "20.0.0",`
`3`	`3`	`"files": {`
`4`		`- "f9e7c320234302f703a47f0be7da188a1e91f7863c71a04835efd508d926216c": {`
	`4`	`+ "bce46c387f7a562ced8e71e7f0c8bd1829de8aa12a8f5938bf4ccba9f3748d84": {`
`5`	`5`	`"source": {`
`6`	`6`	`"path": "C9Stack.template.json",`
`7`	`7`	`"packaging": "file"`
`8`	`8`	`},`
`9`	`9`	`"destinations": {`
`10`	`10`	`"current_account-current_region": {`
`11`	`11`	`"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",`
`12`		`- "objectKey": "f9e7c320234302f703a47f0be7da188a1e91f7863c71a04835efd508d926216c.json",`
	`12`	`+ "objectKey": "bce46c387f7a562ced8e71e7f0c8bd1829de8aa12a8f5938bf4ccba9f3748d84.json",`
`13`	`13`	`"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"version":"17.0.0"}`
	`1`	`+{"version":"20.0.0"}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "17.0.0",`
	`2`	`+ "version": "20.0.0",`
`3`	`3`	`"artifacts": {`
`4`	`4`	`"Tree": {`
`5`	`5`	`"type": "cdk:tree",`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"Tags": [`
`11`	`11`	`{`
`12`	`12`	`"Key": "Name",`
`13`		`- "Value": "C9Stack/VPC"`
	`13`	`+ "Value": "C9ConnectionTypeStack/VPC"`
`14`	`14`	`}`
`15`	`15`	`]`
`16`	`16`	`}`
`@@ -42,7 +42,7 @@`
`42`	`42`	`},`
`43`	`43`	`{`
`44`	`44`	`"Key": "Name",`
`45`		`- "Value": "C9Stack/VPC/PublicSubnet1"`
	`45`	`+ "Value": "C9ConnectionTypeStack/VPC/PublicSubnet1"`
`46`	`46`	`}`
`47`	`47`	`]`
`48`	`48`	`}`
`@@ -56,7 +56,7 @@`
`56`	`56`	`"Tags": [`
`57`	`57`	`{`
`58`	`58`	`"Key": "Name",`
`59`		`- "Value": "C9Stack/VPC/PublicSubnet1"`
	`59`	`+ "Value": "C9ConnectionTypeStack/VPC/PublicSubnet1"`
`60`	`60`	`}`
`61`	`61`	`]`
`62`	`62`	`}`
`@@ -94,7 +94,7 @@`
`94`	`94`	`"Tags": [`
`95`	`95`	`{`
`96`	`96`	`"Key": "Name",`
`97`		`- "Value": "C9Stack/VPC/PublicSubnet1"`
	`97`	`+ "Value": "C9ConnectionTypeStack/VPC/PublicSubnet1"`
`98`	`98`	`}`
`99`	`99`	`]`
`100`	`100`	`}`
`@@ -114,7 +114,7 @@`
`114`	`114`	`"Tags": [`
`115`	`115`	`{`
`116`	`116`	`"Key": "Name",`
`117`		`- "Value": "C9Stack/VPC/PublicSubnet1"`
	`117`	`+ "Value": "C9ConnectionTypeStack/VPC/PublicSubnet1"`
`118`	`118`	`}`
`119`	`119`	`]`
`120`	`120`	`}`
`@@ -146,7 +146,7 @@`
`146`	`146`	`},`
`147`	`147`	`{`
`148`	`148`	`"Key": "Name",`
`149`		`- "Value": "C9Stack/VPC/PublicSubnet2"`
	`149`	`+ "Value": "C9ConnectionTypeStack/VPC/PublicSubnet2"`
`150`	`150`	`}`
`151`	`151`	`]`
`152`	`152`	`}`
`@@ -160,7 +160,7 @@`
`160`	`160`	`"Tags": [`
`161`	`161`	`{`
`162`	`162`	`"Key": "Name",`
`163`		`- "Value": "C9Stack/VPC/PublicSubnet2"`
	`163`	`+ "Value": "C9ConnectionTypeStack/VPC/PublicSubnet2"`
`164`	`164`	`}`
`165`	`165`	`]`
`166`	`166`	`}`
`@@ -218,7 +218,7 @@`
`218`	`218`	`},`
`219`	`219`	`{`
`220`	`220`	`"Key": "Name",`
`221`		`- "Value": "C9Stack/VPC/PrivateSubnet1"`
	`221`	`+ "Value": "C9ConnectionTypeStack/VPC/PrivateSubnet1"`
`222`	`222`	`}`
`223`	`223`	`]`
`224`	`224`	`}`
`@@ -232,7 +232,7 @@`
`232`	`232`	`"Tags": [`
`233`	`233`	`{`
`234`	`234`	`"Key": "Name",`
`235`		`- "Value": "C9Stack/VPC/PrivateSubnet1"`
	`235`	`+ "Value": "C9ConnectionTypeStack/VPC/PrivateSubnet1"`
`236`	`236`	`}`
`237`	`237`	`]`
`238`	`238`	`}`
`@@ -287,7 +287,7 @@`
`287`	`287`	`},`
`288`	`288`	`{`
`289`	`289`	`"Key": "Name",`
`290`		`- "Value": "C9Stack/VPC/PrivateSubnet2"`
	`290`	`+ "Value": "C9ConnectionTypeStack/VPC/PrivateSubnet2"`
`291`	`291`	`}`
`292`	`292`	`]`
`293`	`293`	`}`
`@@ -301,7 +301,7 @@`
`301`	`301`	`"Tags": [`
`302`	`302`	`{`
`303`	`303`	`"Key": "Name",`
`304`		`- "Value": "C9Stack/VPC/PrivateSubnet2"`
	`304`	`+ "Value": "C9ConnectionTypeStack/VPC/PrivateSubnet2"`
`305`	`305`	`}`
`306`	`306`	`]`
`307`	`307`	`}`
`@@ -335,7 +335,7 @@`
`335`	`335`	`"Tags": [`
`336`	`336`	`{`
`337`	`337`	`"Key": "Name",`
`338`		`- "Value": "C9Stack/VPC"`
	`338`	`+ "Value": "C9ConnectionTypeStack/VPC"`
`339`	`339`	`}`
`340`	`340`	`]`
`341`	`341`	`}`
`@@ -360,9 +360,9 @@`
`360`	`360`	`"C9EnvF05FC3BE": {`
`361`	`361`	`"Type": "AWS::Cloud9::EnvironmentEC2",`
`362`	`362`	`"Properties": {`
`363`		`- "ConnectionType": "CONNECT_SSM",`
`364`		`- "ImageId": "amazonlinux-2-x86_64",`
`365`	`363`	`"InstanceType": "t2.micro",`
	`364`	`+ "ConnectionType": "CONNECT_SSH",`
	`365`	`+ "ImageId": "amazonlinux-2-x86_64",`
`366`	`366`	`"Repositories": [`
`367`	`367`	`{`
`368`	`368`	`"PathComponent": "/foo",`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "20.0.0",`
`3`	`3`	`"testCases": {`
`4`		`- "integ.connection-type": {`
	`4`	`+ "cloud-9-connection-type/DefaultTest": {`
`5`	`5`	`"stacks": [`
`6`		`- "C9Stack"`
	`6`	`+ "C9ConnectionTypeStack"`
`7`	`7`	`],`
`8`		`- "diffAssets": false,`
`9`		`- "stackUpdateWorkflow": true`
	`8`	`+ "assertionStack": "cloud9connectiontypeDefaultTestDeployAssert401C3608"`
`10`	`9`	`}`
`11`		`- },`
`12`		`- "synthContext": {},`
`13`		`- "enableLookups": false`
	`10`	`+ }`
`14`	`11`	`}`