fix(ecs-patterns): Fix issue related to protocol being passed to targ…

…et group
aws · Nov 13, 2019 · 5e6bfce · 5e6bfce
1 parent 6fa4713
commit 5e6bfce
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/base/application-load-balanced-service-base.ts
@@ -111,7 +111,8 @@ export interface ApplicationLoadBalancedServiceBaseProps {
   /**
    * Listener port of the application load balancer that will serve traffic to the service.
    *
-   * @default 80
+   * @default - The default listener port is determined from the protocol (port 80 for HTTP,
+   * port 443 for HTTPS). A domain name and zone must be also be specified if using HTTPS.
    */
   readonly listenerPort?: number;
 
@@ -286,8 +287,7 @@ export abstract class ApplicationLoadBalancedServiceBase extends cdk.Construct {
     const protocol = props.protocol !== undefined ? props.protocol : (props.certificate ? ApplicationProtocol.HTTPS : ApplicationProtocol.HTTP);
 
     const targetProps = {
-      port: props.listenerPort !== undefined ? props.listenerPort : 80,
-      protocol
+      port: 80
     };
 
     this.listener = this.loadBalancer.addListener('PublicListener', {

diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/base/network-load-balanced-service-base.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/base/network-load-balanced-service-base.ts
@@ -255,7 +255,7 @@ export abstract class NetworkLoadBalancedServiceBase extends cdk.Construct {
     const listenerPort = props.listenerPort !== undefined ? props.listenerPort : 80;
 
     const targetProps = {
-      port: listenerPort
+      port: 80
     };
 
     this.listener = this.loadBalancer.addListener('PublicListener', { port: listenerPort });

diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.l3s.ts b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/test.l3s.ts
@@ -414,6 +414,15 @@ export = {
       }]
     }));
 
+    expect(stack).to(haveResource('AWS::ElasticLoadBalancingV2::TargetGroup', {
+      Port: 80,
+      Protocol: 'HTTP',
+      TargetType: "ip",
+      VpcId: {
+        Ref: "VPCB9E5F0B4"
+      }
+    }));
+
     expect(stack).to(haveResource("AWS::ECS::Service", {
       DesiredCount: 1,
       LaunchType: "FARGATE",

diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.special-listener.expected.json b/packages/@aws-cdk/aws-ecs-patterns/test/fargate/integ.special-listener.expected.json
@@ -386,7 +386,7 @@
     "FargateNlbServiceLBPublicListenerECSGroup7501571D": {
       "Type": "AWS::ElasticLoadBalancingV2::TargetGroup",
       "Properties": {
-        "Port": 2015,
+        "Port": 80,
         "Protocol": "TCP",
         "TargetType": "ip",
         "VpcId": {
@@ -667,7 +667,7 @@
     "FargateAlbServiceLBPublicListenerECSGroupB3826700": {
       "Type": "AWS::ElasticLoadBalancingV2::TargetGroup",
       "Properties": {
-        "Port": 2015,
+        "Port": 80,
         "Protocol": "HTTP",
         "TargetType": "ip",
         "VpcId": {