feat(aws-elasticloadbalancing): add crossZone property (aws#2786)

enable cross-zone load balancing by default to comply with AWS Console behaviour
ScOut3R · Jun 12, 2019 · 3a84384 · 3a84384
1 parent 58de24d
commit 3a84384
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 6 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
@@ -691,7 +691,7 @@
             "Protocol": "http"
           }
         ],
-        "CrossZone": false,
+        "CrossZone": true,
         "HealthCheck": {
           "HealthyThreshold": "2",
           "Interval": "30",

diff --git a/packages/@aws-cdk/aws-codedeploy/test/server/integ.deployment-group.expected.json b/packages/@aws-cdk/aws-codedeploy/test/server/integ.deployment-group.expected.json
@@ -725,7 +725,7 @@
             "Protocol": "http"
           }
         ],
-        "CrossZone": false,
+        "CrossZone": true,
         "Scheme": "internal",
         "SecurityGroups": [
           {

diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/lib/load-balancer.ts b/packages/@aws-cdk/aws-elasticloadbalancing/lib/load-balancer.ts
@@ -56,7 +56,7 @@ export interface LoadBalancerProps {
    * This controls whether the load balancer evenly distributes requests
    * across each availability zone
    *
-   * @default - false.
+   * @default true
    */
   readonly crossZone?: boolean;
 }
@@ -236,7 +236,7 @@ export class LoadBalancer extends Resource implements IConnectable {
       listeners: Lazy.anyValue({ produce: () => this.listeners }),
       scheme: props.internetFacing ? 'internet-facing' : 'internal',
       healthCheck: props.healthCheck && healthCheckToJSON(props.healthCheck),
-      crossZone: props.crossZone || false,
+      crossZone: (props.crossZone === undefined || props.crossZone) ? true : false
     });
     if (props.internetFacing) {
       this.elb.node.addDependency(...subnets.map(s => s.internetConnectivityEstablished));

diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/test/integ.elb.expected.json b/packages/@aws-cdk/aws-elasticloadbalancing/test/integ.elb.expected.json
@@ -228,7 +228,7 @@
             "Protocol": "http"
           }
         ],
-        "CrossZone": false,
+        "CrossZone": true,
         "HealthCheck": {
           "HealthyThreshold": "2",
           "Interval": "30",

diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/test/test.loadbalancer.ts b/packages/@aws-cdk/aws-elasticloadbalancing/test/test.loadbalancer.ts
@@ -112,7 +112,45 @@ export = {
     }));
 
     test.done();
-  }
+  },
+
+  'disable cross zone load balancing'(test: Test) {
+    // GIVEN
+    const stack = new Stack();
+    const vpc = new Vpc(stack, 'VCP');
+
+    // WHEN
+    new LoadBalancer(stack, 'LB', {
+      vpc,
+      crossZone: false,
+    });
+
+    // THEN
+    expect(stack).to(haveResource('AWS::ElasticLoadBalancing::LoadBalancer', {
+      CrossZone: false
+    }));
+
+    test.done();
+  },
+
+  'cross zone load balancing enabled by default'(test: Test) {
+    // GIVEN
+    const stack = new Stack();
+    const vpc = new Vpc(stack, 'VCP');
+
+    // WHEN
+    new LoadBalancer(stack, 'LB', {
+      vpc,
+    });
+
+    // THEN
+    expect(stack).to(haveResource('AWS::ElasticLoadBalancing::LoadBalancer', {
+      CrossZone: true
+    }));
+
+    test.done();
+  },
+
 };
 
 class FakeTarget implements ILoadBalancerTarget {