chore(cloud9): fix integ test that cannot pass (#21561)

This integ test cannot pass using `CONNECT_SSM` because it requires setup of resources ahead of time that the L1 construct does not handle. Because roles use eventual consistency, just adding the role to the test isn't a good solution. `CONNECT_SSH` works just fine. A note has been added to the `ConnectionType.CONNECT_SSM` enum that a role and instance profile must be setup beforehand if it is selected. Eventually if/when an L2 construct is created we should handle this setup. ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Aug 11, 2022 · ebab1cd · ebab1cd
1 parent d1097b5
commit ebab1cd
Show file tree

Hide file tree

Showing 15 changed files with 170 additions and 542 deletions.
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/...age-id.integ.snapshot/C9Stack.assets.json → ...cloud9.integ.snapshot/C9Stack.assets.json b/...age-id.integ.snapshot/C9Stack.assets.json → ...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/...type.integ.snapshot/C9Stack.template.json → ...pshot/C9ConnectionTypeStack.template.json b/...type.integ.snapshot/C9Stack.template.json → ...pshot/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/...ion-type.integ.snapshot/cloud9connectiontypeDefaultTestDeployAssert401C3608.template.json b/...ion-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
+  }
 }