From bebfef03bfb8ff5198a0e01558dab01d51527b6b Mon Sep 17 00:00:00 2001
From: Rico Huijbers <rix0rrr@gmail.com>
Date: Fri, 5 Oct 2018 11:07:38 +0200
Subject: [PATCH] fix(aws-ec2): fix typo in resource identifier (#818)

This will mutate deployed VPC resources, but I verified that the route table association can be replaced without the deployment getting stuck.

I did not verify it does not have on impact on availability for the duration.
---
 .../integ.asg-w-classic-loadbalancer.expected.json   | 12 ++++++------
 .../test/integ.asg-w-elbv2.expected.json             |  8 ++++----
 packages/@aws-cdk/aws-ec2/lib/vpc.ts                 |  2 +-
 .../@aws-cdk/aws-ec2/test/integ.vpc.expected.json    | 12 ++++++------
 .../test/integ.elb.expected.json                     |  4 ++--
 .../test/integ.alb.expected.json                     |  8 ++++----
 .../test/integ.nlb.expected.json                     |  8 ++++----
 .../aws-lambda/test/integ.vpc-lambda.expected.json   |  8 ++++----
 .../aws-rds/test/integ.cluster.expected.json         |  8 ++++----
 .../aws-route53/test/integ.route53.expected.json     | 12 ++++++------
 10 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-classic-loadbalancer.expected.json b/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-classic-loadbalancer.expected.json
index 11f6f40f5d196..e1b0eedbe3bc4 100644
--- a/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-classic-loadbalancer.expected.json
+++ b/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-classic-loadbalancer.expected.json
@@ -46,7 +46,7 @@
         ]
       }
     },
-    "VPCPublicSubnet1RouteTableAssociatioin249B4093": {
+    "VPCPublicSubnet1RouteTableAssociation0B0896DC": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -126,7 +126,7 @@
         ]
       }
     },
-    "VPCPublicSubnet2RouteTableAssociatioin766225D7": {
+    "VPCPublicSubnet2RouteTableAssociation5A808732": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -206,7 +206,7 @@
         ]
       }
     },
-    "VPCPublicSubnet3RouteTableAssociatioinF4E24B3B": {
+    "VPCPublicSubnet3RouteTableAssociation427FE0C6": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -286,7 +286,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet1RouteTableAssociatioin77F7CA18": {
+    "VPCPrivateSubnet1RouteTableAssociation347902D1": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -340,7 +340,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet2RouteTableAssociatioinC31995B4": {
+    "VPCPrivateSubnet2RouteTableAssociation0C73D413": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -394,7 +394,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet3RouteTableAssociatioin3B0B6B38": {
+    "VPCPrivateSubnet3RouteTableAssociationC28D144E": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.expected.json b/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.expected.json
index e7f59cf158a9a..65c1a6fee950f 100644
--- a/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.expected.json
+++ b/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.expected.json
@@ -46,7 +46,7 @@
         ]
       }
     },
-    "VPCPublicSubnet1RouteTableAssociatioin249B4093": {
+    "VPCPublicSubnet1RouteTableAssociation0B0896DC": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -126,7 +126,7 @@
         ]
       }
     },
-    "VPCPublicSubnet2RouteTableAssociatioin766225D7": {
+    "VPCPublicSubnet2RouteTableAssociation5A808732": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -206,7 +206,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet1RouteTableAssociatioin77F7CA18": {
+    "VPCPrivateSubnet1RouteTableAssociation347902D1": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -260,7 +260,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet2RouteTableAssociatioinC31995B4": {
+    "VPCPrivateSubnet2RouteTableAssociation0C73D413": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
diff --git a/packages/@aws-cdk/aws-ec2/lib/vpc.ts b/packages/@aws-cdk/aws-ec2/lib/vpc.ts
index 697deef84aa9b..11c4f9c918cb4 100644
--- a/packages/@aws-cdk/aws-ec2/lib/vpc.ts
+++ b/packages/@aws-cdk/aws-ec2/lib/vpc.ts
@@ -486,7 +486,7 @@ export class VpcSubnet extends VpcSubnetRef implements cdk.ITaggable {
     this.routeTableId = table.ref;
 
     // Associate the public route table for this subnet, to this subnet
-    const routeAssoc = new cloudformation.SubnetRouteTableAssociationResource(this, 'RouteTableAssociatioin', {
+    const routeAssoc = new cloudformation.SubnetRouteTableAssociationResource(this, 'RouteTableAssociation', {
       subnetId: this.subnetId,
       routeTableId: table.ref
     });
diff --git a/packages/@aws-cdk/aws-ec2/test/integ.vpc.expected.json b/packages/@aws-cdk/aws-ec2/test/integ.vpc.expected.json
index 511cafc47ace0..3df9527a9028f 100644
--- a/packages/@aws-cdk/aws-ec2/test/integ.vpc.expected.json
+++ b/packages/@aws-cdk/aws-ec2/test/integ.vpc.expected.json
@@ -46,7 +46,7 @@
         ]
       }
     },
-    "MyVpcPublicSubnet1RouteTableAssociatioin3562612E": {
+    "MyVpcPublicSubnet1RouteTableAssociation2ECEE1CB": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -126,7 +126,7 @@
         ]
       }
     },
-    "MyVpcPublicSubnet2RouteTableAssociatioin8E74FB35": {
+    "MyVpcPublicSubnet2RouteTableAssociation227DE78D": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -206,7 +206,7 @@
         ]
       }
     },
-    "MyVpcPublicSubnet3RouteTableAssociatioinA3FD1B71": {
+    "MyVpcPublicSubnet3RouteTableAssociation5C27DDA4": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -286,7 +286,7 @@
         ]
       }
     },
-    "MyVpcPrivateSubnet1RouteTableAssociatioin90CF6BAB": {
+    "MyVpcPrivateSubnet1RouteTableAssociation56D38C7E": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -340,7 +340,7 @@
         ]
       }
     },
-    "MyVpcPrivateSubnet2RouteTableAssociatioin803693C0": {
+    "MyVpcPrivateSubnet2RouteTableAssociation86A610DA": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -394,7 +394,7 @@
         ]
       }
     },
-    "MyVpcPrivateSubnet3RouteTableAssociatioinFB4A6FE6": {
+    "MyVpcPrivateSubnet3RouteTableAssociationD951741C": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/test/integ.elb.expected.json b/packages/@aws-cdk/aws-elasticloadbalancing/test/integ.elb.expected.json
index 0203dcbaccd44..458026fd7584e 100644
--- a/packages/@aws-cdk/aws-elasticloadbalancing/test/integ.elb.expected.json
+++ b/packages/@aws-cdk/aws-elasticloadbalancing/test/integ.elb.expected.json
@@ -46,7 +46,7 @@
         ]
       }
     },
-    "VPCPublicSubnet1RouteTableAssociatioin249B4093": {
+    "VPCPublicSubnet1RouteTableAssociation0B0896DC": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -126,7 +126,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet1RouteTableAssociatioin77F7CA18": {
+    "VPCPrivateSubnet1RouteTableAssociation347902D1": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.expected.json b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.expected.json
index 5d337cebcb360..e56c37e3c76ad 100644
--- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.expected.json
+++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.alb.expected.json
@@ -46,7 +46,7 @@
         ]
       }
     },
-    "VPCPublicSubnet1RouteTableAssociatioin249B4093": {
+    "VPCPublicSubnet1RouteTableAssociation0B0896DC": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -126,7 +126,7 @@
         ]
       }
     },
-    "VPCPublicSubnet2RouteTableAssociatioin766225D7": {
+    "VPCPublicSubnet2RouteTableAssociation5A808732": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -206,7 +206,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet1RouteTableAssociatioin77F7CA18": {
+    "VPCPrivateSubnet1RouteTableAssociation347902D1": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -260,7 +260,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet2RouteTableAssociatioinC31995B4": {
+    "VPCPrivateSubnet2RouteTableAssociation0C73D413": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.nlb.expected.json b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.nlb.expected.json
index 6c7d92a1e87fe..a27c8b8c2db10 100644
--- a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.nlb.expected.json
+++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/integ.nlb.expected.json
@@ -46,7 +46,7 @@
         ]
       }
     },
-    "VPCPublicSubnet1RouteTableAssociatioin249B4093": {
+    "VPCPublicSubnet1RouteTableAssociation0B0896DC": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -126,7 +126,7 @@
         ]
       }
     },
-    "VPCPublicSubnet2RouteTableAssociatioin766225D7": {
+    "VPCPublicSubnet2RouteTableAssociation5A808732": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -206,7 +206,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet1RouteTableAssociatioin77F7CA18": {
+    "VPCPrivateSubnet1RouteTableAssociation347902D1": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -260,7 +260,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet2RouteTableAssociatioinC31995B4": {
+    "VPCPrivateSubnet2RouteTableAssociation0C73D413": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
diff --git a/packages/@aws-cdk/aws-lambda/test/integ.vpc-lambda.expected.json b/packages/@aws-cdk/aws-lambda/test/integ.vpc-lambda.expected.json
index 93e729c8fe111..0c4084d96dda6 100644
--- a/packages/@aws-cdk/aws-lambda/test/integ.vpc-lambda.expected.json
+++ b/packages/@aws-cdk/aws-lambda/test/integ.vpc-lambda.expected.json
@@ -46,7 +46,7 @@
         ]
       }
     },
-    "VPCPublicSubnet1RouteTableAssociatioin249B4093": {
+    "VPCPublicSubnet1RouteTableAssociation0B0896DC": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -126,7 +126,7 @@
         ]
       }
     },
-    "VPCPublicSubnet2RouteTableAssociatioin766225D7": {
+    "VPCPublicSubnet2RouteTableAssociation5A808732": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -206,7 +206,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet1RouteTableAssociatioin77F7CA18": {
+    "VPCPrivateSubnet1RouteTableAssociation347902D1": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -260,7 +260,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet2RouteTableAssociatioinC31995B4": {
+    "VPCPrivateSubnet2RouteTableAssociation0C73D413": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
diff --git a/packages/@aws-cdk/aws-rds/test/integ.cluster.expected.json b/packages/@aws-cdk/aws-rds/test/integ.cluster.expected.json
index 0da9a7177f3b8..a6c2dc2522720 100644
--- a/packages/@aws-cdk/aws-rds/test/integ.cluster.expected.json
+++ b/packages/@aws-cdk/aws-rds/test/integ.cluster.expected.json
@@ -46,7 +46,7 @@
         ]
       }
     },
-    "VPCPublicSubnet1RouteTableAssociatioin249B4093": {
+    "VPCPublicSubnet1RouteTableAssociation0B0896DC": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -126,7 +126,7 @@
         ]
       }
     },
-    "VPCPublicSubnet2RouteTableAssociatioin766225D7": {
+    "VPCPublicSubnet2RouteTableAssociation5A808732": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -206,7 +206,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet1RouteTableAssociatioin77F7CA18": {
+    "VPCPrivateSubnet1RouteTableAssociation347902D1": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -260,7 +260,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet2RouteTableAssociatioinC31995B4": {
+    "VPCPrivateSubnet2RouteTableAssociation0C73D413": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
diff --git a/packages/@aws-cdk/aws-route53/test/integ.route53.expected.json b/packages/@aws-cdk/aws-route53/test/integ.route53.expected.json
index 4da2fb5686c5f..363df70cd4d99 100644
--- a/packages/@aws-cdk/aws-route53/test/integ.route53.expected.json
+++ b/packages/@aws-cdk/aws-route53/test/integ.route53.expected.json
@@ -46,7 +46,7 @@
         ]
       }
     },
-    "VPCPublicSubnet1RouteTableAssociatioin249B4093": {
+    "VPCPublicSubnet1RouteTableAssociation0B0896DC": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -126,7 +126,7 @@
         ]
       }
     },
-    "VPCPublicSubnet2RouteTableAssociatioin766225D7": {
+    "VPCPublicSubnet2RouteTableAssociation5A808732": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -206,7 +206,7 @@
         ]
       }
     },
-    "VPCPublicSubnet3RouteTableAssociatioinF4E24B3B": {
+    "VPCPublicSubnet3RouteTableAssociation427FE0C6": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -286,7 +286,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet1RouteTableAssociatioin77F7CA18": {
+    "VPCPrivateSubnet1RouteTableAssociation347902D1": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -340,7 +340,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet2RouteTableAssociatioinC31995B4": {
+    "VPCPrivateSubnet2RouteTableAssociation0C73D413": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {
@@ -394,7 +394,7 @@
         ]
       }
     },
-    "VPCPrivateSubnet3RouteTableAssociatioin3B0B6B38": {
+    "VPCPrivateSubnet3RouteTableAssociationC28D144E": {
       "Type": "AWS::EC2::SubnetRouteTableAssociation",
       "Properties": {
         "RouteTableId": {