aws · rix0rrr · Sep 13, 2018 · Sep 13, 2018 · Sep 13, 2018 · Sep 13, 2018
diff --git a/examples/cdk-examples-typescript/ec2/index.ts b/examples/cdk-examples-typescript/ec2/index.ts
@@ -1,5 +1,6 @@
 import autoscaling = require('@aws-cdk/aws-autoscaling');
 import ec2 = require('@aws-cdk/aws-ec2');
+import elb = require('@aws-cdk/aws-elasticloadbalancing');
 import cdk = require('@aws-cdk/cdk');
 
 class AppWithVpc extends cdk.Stack {
@@ -14,7 +15,7 @@ class AppWithVpc extends cdk.Stack {
             machineImage: new ec2.AmazonLinuxImage()
         });
 
-        const clb = new ec2.ClassicLoadBalancer(this, 'LB', {
+        const clb = new elb.LoadBalancer(this, 'LB', {
             vpc,
             internetFacing: true
         });
@@ -40,7 +41,7 @@ class MyApp extends cdk.Stack {
             machineImage: new ec2.AmazonLinuxImage()
         });
 
-        const clb = new ec2.ClassicLoadBalancer(this, 'LB', {
+        const clb = new elb.LoadBalancer(this, 'LB', {
             vpc,
             internetFacing: true
         });

diff --git a/examples/cdk-examples-typescript/package.json b/examples/cdk-examples-typescript/package.json
@@ -28,6 +28,7 @@
     "@aws-cdk/aws-cognito": "^0.9.0",
     "@aws-cdk/aws-dynamodb": "^0.9.0",
     "@aws-cdk/aws-ec2": "^0.9.0",
+    "@aws-cdk/aws-elasticloadbalancing": "^0.9.0",
     "@aws-cdk/aws-iam": "^0.9.0",
     "@aws-cdk/aws-lambda": "^0.9.0",
     "@aws-cdk/aws-neptune": "^0.9.0",

diff --git a/examples/cdk-examples-typescript/use-vpc-from-another-stack/index.ts b/examples/cdk-examples-typescript/use-vpc-from-another-stack/index.ts
@@ -5,6 +5,7 @@
 // until we have that.
 import autoscaling = require('@aws-cdk/aws-autoscaling');
 import ec2 = require('@aws-cdk/aws-ec2');
+import elb = require('@aws-cdk/aws-elasticloadbalancing');
 import cdk = require('@aws-cdk/cdk');
 
 const app = new cdk.App(process.argv);
@@ -24,7 +25,7 @@ const asg = new autoscaling.AutoScalingGroup(appStack, 'ASG', {
     machineImage: new ec2.AmazonLinuxImage()
 });
 
-new ec2.ClassicLoadBalancer(appStack, 'LB', {
+new elb.LoadBalancer(appStack, 'LB', {
     vpc: importedVpc,
     internetFacing: true,
     listeners: [{

diff --git a/packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts b/packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts
@@ -1,4 +1,5 @@
 import ec2 = require('@aws-cdk/aws-ec2');
+import elb = require('@aws-cdk/aws-elasticloadbalancing');
 import iam = require('@aws-cdk/aws-iam');
 import sns = require('@aws-cdk/aws-sns');
 import cdk = require('@aws-cdk/cdk');
@@ -135,7 +136,7 @@ export interface AutoScalingGroupProps {
  *
  * The ASG spans all availability zones.
  */
-export class AutoScalingGroup extends cdk.Construct implements ec2.IClassicLoadBalancerTarget, ec2.IConnectable {
+export class AutoScalingGroup extends cdk.Construct implements elb.ILoadBalancerTarget, ec2.IConnectable {
     /**
      * The type of OS instances of this fleet are running.
      */
@@ -240,7 +241,7 @@ export class AutoScalingGroup extends cdk.Construct implements ec2.IClassicLoadB
         this.securityGroups.push(securityGroup);
     }
 
-    public attachToClassicLB(loadBalancer: ec2.ClassicLoadBalancer): void {
+    public attachToClassicLB(loadBalancer: elb.LoadBalancer): void {
         this.loadBalancerNames.push(loadBalancer.loadBalancerName);
     }
 

diff --git a/packages/@aws-cdk/aws-autoscaling/package.json b/packages/@aws-cdk/aws-autoscaling/package.json
@@ -61,6 +61,7 @@
   "dependencies": {
     "@aws-cdk/aws-ec2": "^0.9.0",
     "@aws-cdk/aws-iam": "^0.9.0",
+    "@aws-cdk/aws-elasticloadbalancing": "^0.9.0",
     "@aws-cdk/aws-sns": "^0.9.0",
     "@aws-cdk/cdk": "^0.9.0"
   },

diff --git a/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-loadbalancer.ts b/packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-loadbalancer.ts
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import ec2 = require('@aws-cdk/aws-ec2');
+import elb = require('@aws-cdk/aws-elasticloadbalancing');
 import cdk = require('@aws-cdk/cdk');
 import autoscaling = require('../lib');
 
@@ -16,17 +17,15 @@ const asg = new autoscaling.AutoScalingGroup(stack, 'Fleet', {
     machineImage: new ec2.AmazonLinuxImage(),
 });
 
-new ec2.ClassicLoadBalancer(stack, 'LB', {
+const lb = new elb.LoadBalancer(stack, 'LB', {
     vpc,
     internetFacing: true,
-    listeners: [{
-        externalPort: 80,
-        allowConnectionsFrom: [new ec2.AnyIPv4()]
-    }],
     healthCheck: {
         port: 80
     },
-    targets: [asg]
 });
 
+lb.addTarget(asg);
+lb.addListener({ externalPort: 80 });
+
 process.stdout.write(app.run());
diff --git a/packages/@aws-cdk/aws-ec2/README.md b/packages/@aws-cdk/aws-ec2/README.md
@@ -1,7 +1,7 @@
 ## AWS Compute and Networking Construct Library
 
-The `@aws-cdk/aws-ec2` package contains primitives for setting up networking,
-instances, and load balancers.
+The `@aws-cdk/aws-ec2` package contains primitives for setting up networking and
+instances.
 
 ### VPC
 
@@ -172,30 +172,6 @@ The `VpcNetwork` above will have the exact same subnet definitions as listed
 above. However, this time the VPC will have only 1 NAT Gateway and all
 Application subnets will route to the NAT Gateway.
 
-
-### Load Balancer
-
-Load balancers send traffic to one or more fleets. Create a load balancer,
-set up listeners and a health check, and supply the fleet(s) you want to load
-balance to in the `targets` property.
-
-The load balancer allows all connections by default. If you want to change that,
-pass the `allowConnectionsFrom` property while setting up the listener.
-
-```ts
-new ec2.ClassicLoadBalancer(stack, 'LB', {
-    vpc,
-    internetFacing: true,
-    listeners: [{
-        externalPort: 80,
-    }],
-    healthCheck: {
-        port: 80
-    },
-    targets: [fleet]
-});
-```
-
 ### Allowing Connections
 
 In AWS, all connections to and from EC2 instances are governed by *Security

diff --git a/packages/@aws-cdk/aws-ec2/lib/index.ts b/packages/@aws-cdk/aws-ec2/lib/index.ts
@@ -1,6 +1,5 @@
 export * from './connections';
 export * from './instance-types';
-export * from './load-balancer';
 export * from './machine-image';
 export * from './security-group';
 export * from './security-group-rule';

diff --git a/packages/@aws-cdk/aws-ec2/package.json b/packages/@aws-cdk/aws-ec2/package.json
@@ -59,7 +59,6 @@
     "pkglint": "^0.9.0"
   },
   "dependencies": {
-    "@aws-cdk/aws-elasticloadbalancing": "^0.9.0",
     "@aws-cdk/aws-iam": "^0.9.0",
     "@aws-cdk/cdk": "^0.9.0",
     "@aws-cdk/util": "^0.9.0"

diff --git a/packages/@aws-cdk/aws-ec2/test/test.loadbalancer.ts b/packages/@aws-cdk/aws-ec2/test/test.loadbalancer.ts
diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/README.md b/packages/@aws-cdk/aws-elasticloadbalancing/README.md
@@ -1,2 +1,35 @@
-## CDK Constructs for AWS Elastic Load Balancing (ELB)
-This module is part of the [AWS Cloud Development Kit](https://github.com/awslabs/aws-cdk) project.
+## AWS Elastic Load Balancing Construct Library
+
+The `@aws-cdk/aws-ec2` package provides constructs for configuring
+classic load balancers.
+
+### Configuring a Load Balancer
+
+Load balancers send traffic to one or more AutoScalingGroups. Create a load
+balancer, set up listeners and a health check, and supply the fleet(s) you want
+to load balance to in the `targets` property.
+
+```ts
+const lb = new elb.LoadBalancer(stack, 'LB', {
+    vpc,
+    internetFacing: true,
+    healthCheck: {
+        port: 80
+    },
+});
+
+lb.addTarget(myAutoScalingGroup);
+lb.addListener({
+    externalPort: 80,
+});
+```
+
+The load balancer allows all connections by default. If you want to change that,
+pass the `allowConnectionsFrom` property while setting up the listener:
+
+```
+lb.addListener({
+    externalPort: 80,
+    allowConnectionsFrom: [mySecurityGroup]
+});
+```
diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/lib/index.ts b/packages/@aws-cdk/aws-elasticloadbalancing/lib/index.ts
@@ -1,2 +1,4 @@
 // AWS::ElasticLoadBalancing CloudFormation Resources:
 export * from './elasticloadbalancing.generated';
+
+export * from './load-balancer';