refactored vpc and alb references for clarity

Author: briancaffey

awscdk/awscdk/alb.py

@@ -8,7 +8,7 @@
 )
 
 
-class ApplicationLoadBalancer(core.Construct):
+class ApplicationLoadBalancerResources(core.Construct):
     def __init__(
         self,
         scope: core.Construct,

awscdk/awscdk/backend.py

@@ -15,7 +15,7 @@ def __init__(
         scope: core.Construct,
         id: str,
         image: ecs.AssetImage,
-        load_balancer,
+        https_listener: elbv2.IApplicationListener,
         cluster: ecs.ICluster,
         environment_variables: core.Construct,
         security_group: str,
@@ -52,7 +52,7 @@ def __init__(
             ),
         )
 
-        load_balancer.https_listener.add_targets(
+        https_listener.add_targets(
             "BackendTarget",
             port=80,
             targets=[self.backend_service],

awscdk/awscdk/cdk_app_root.py

@@ -8,7 +8,7 @@
 from assets import Assets
 from rds import Rds
 from elasticache import ElastiCache
-from alb import ApplicationLoadBalancer
+from alb import ApplicationLoadBalancerResources
 from ecs import Ecs
 from env_vars import Variables
 from static_site_bucket import StaticSiteBucket
@@ -38,27 +38,31 @@ def __init__(
             self, "SiteCert", domain_name=full_domain_name
         )
 
-        self.vpc = Vpc(self, "Vpc")
+        self.vpc = Vpc(self, "Vpc").vpc
 
-        self.alb = ApplicationLoadBalancer(
+        self.alb_resources = ApplicationLoadBalancerResources(
             self,
             "ApplicationLoadBalancer",
             hosted_zone=self.hosted_zone,
             certificate=self.certificate,
-            vpc=self.vpc.vpc,
+            vpc=self.vpc,
         )
 
+        self.alb = self.alb_resources.alb
+
+        self.https_listener = self.alb_resources.https_listener
+
         self.static_site_bucket = StaticSiteBucket(
             self, "StaticSiteBucket", full_app_name=full_app_name
-        )
+        ).static_site_bucket
 
         self.cloudfront = CloudFront(
             self,
             "StaticSite",
             hosted_zone=self.hosted_zone,
-            static_site_bucket_name=self.static_site_bucket.static_site_bucket.bucket_name,  # noqa
+            static_site_bucket_name=self.static_site_bucket.bucket_name,  # noqa
             certificate=self.certificate,
-            alb=self.alb.alb.load_balancer_dns_name,
+            alb=self.alb.load_balancer_dns_name,
             full_domain_name=full_domain_name,
             full_app_name=full_app_name,
         )
@@ -68,21 +72,17 @@ def __init__(
         #     self, "ElasticContainerRepo", full_app_name=full_app_name
         # )
 
-        self.ecs = Ecs(
-            self, "Ecs", vpc=self.vpc.vpc, full_app_name=full_app_name
-        )
+        self.ecs = Ecs(self, "Ecs", vpc=self.vpc, full_app_name=full_app_name)
 
         self.assets = Assets(
             self, "BackendAssets", full_app_name=full_app_name
         )
 
         self.rds = Rds(
-            self, "RdsDBCluster", vpc=self.vpc.vpc, full_app_name=full_app_name
+            self, "RdsDBCluster", vpc=self.vpc, full_app_name=full_app_name
         )
 
-        self.elasticache = ElastiCache(
-            self, "ElastiCacheRedis", vpc=self.vpc.vpc
-        )
+        self.elasticache = ElastiCache(self, "ElastiCacheRedis", vpc=self.vpc)
 
         # image used for all django containers
         # gunicorn, daphne, celery workers, celery beat
@@ -105,10 +105,10 @@ def __init__(
             self,
             "Backend",
             image=self.image,
-            load_balancer=self.alb,
+            https_listener=self.https_listener,
             cluster=self.ecs.cluster,
             environment_variables=self.variables,
-            security_group=self.vpc.vpc.vpc_default_security_group,
+            security_group=self.vpc.vpc_default_security_group,
         )
 
         # migrate, collectstatic, createsuperuser

awscdk/stack.yml

@@ -283,8 +283,8 @@ Resources:
         Ref: VpcC3027511
     Metadata:
       aws:cdk:path: dev-mysite-com-stack/ApplicationLoadBalancer/ALB/SecurityGroup/Resource
-  ? ApplicationLoadBalancerALBSecurityGrouptodevmysitecomstackBackendBackendSecurityGroup987E976C8000947E9AB3
-  : Type: AWS::EC2::SecurityGroupEgress
+  ApplicationLoadBalancerALBSecurityGrouptodevmysitecomstackBackendBackendSecurityGroup987E976C8000947E9AB3:
+    Type: AWS::EC2::SecurityGroupEgress
     Properties:
       GroupId:
         Fn::GetAtt:
@@ -820,7 +820,7 @@ Resources:
               - - Ref: AWS::AccountId
                 - .dkr.ecr.us-east-1.
                 - Ref: AWS::URLSuffix
-                - /aws-cdk/assets:41bdd10a3c4f6c26292af664680559ccbaecfcd26073ddb0df264187ffa4fdfb
+                - /aws-cdk/assets:1da57cd88c50ee3c4ef711e428963792b0ac58ea8173a192b45622a829fec77b
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -915,8 +915,8 @@ Resources:
         - Ref: BackendBackendTaskExecutionRole3B22D4E5
     Metadata:
       aws:cdk:path: dev-mysite-com-stack/Backend/BackendTask/ExecutionRole/DefaultPolicy/Resource
-  ? BackendBackendSecurityGroupfromdevmysitecomstackApplicationLoadBalancerALBSecurityGroup41CD7D0380003CD57722
-  : Type: AWS::EC2::SecurityGroupIngress
+  BackendBackendSecurityGroupfromdevmysitecomstackApplicationLoadBalancerALBSecurityGroup41CD7D0380003CD57722:
+    Type: AWS::EC2::SecurityGroupIngress
     Properties:
       IpProtocol: tcp
       Description: Load balancer to target
@@ -1026,7 +1026,7 @@ Resources:
               - - Ref: AWS::AccountId
                 - .dkr.ecr.us-east-1.
                 - Ref: AWS::URLSuffix
-                - /aws-cdk/assets:41bdd10a3c4f6c26292af664680559ccbaecfcd26073ddb0df264187ffa4fdfb
+                - /aws-cdk/assets:1da57cd88c50ee3c4ef711e428963792b0ac58ea8173a192b45622a829fec77b
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -1213,7 +1213,7 @@ Resources:
               - - Ref: AWS::AccountId
                 - .dkr.ecr.us-east-1.
                 - Ref: AWS::URLSuffix
-                - /aws-cdk/assets:41bdd10a3c4f6c26292af664680559ccbaecfcd26073ddb0df264187ffa4fdfb
+                - /aws-cdk/assets:1da57cd88c50ee3c4ef711e428963792b0ac58ea8173a192b45622a829fec77b
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -1399,7 +1399,7 @@ Resources:
               - - Ref: AWS::AccountId
                 - .dkr.ecr.us-east-1.
                 - Ref: AWS::URLSuffix
-                - /aws-cdk/assets:41bdd10a3c4f6c26292af664680559ccbaecfcd26073ddb0df264187ffa4fdfb
+                - /aws-cdk/assets:1da57cd88c50ee3c4ef711e428963792b0ac58ea8173a192b45622a829fec77b
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -1487,3 +1487,4 @@ Resources:
     Type: AWS::CDK::Metadata
     Properties:
       Modules: aws-cdk=1.38.0,@aws-cdk/assets=1.38.0,@aws-cdk/aws-apigateway=1.38.0,@aws-cdk/aws-applicationautoscaling=1.38.0,@aws-cdk/aws-autoscaling=1.38.0,@aws-cdk/aws-autoscaling-common=1.38.0,@aws-cdk/aws-autoscaling-hooktargets=1.38.0,@aws-cdk/aws-batch=1.38.0,@aws-cdk/aws-certificatemanager=1.38.0,@aws-cdk/aws-cloudformation=1.38.0,@aws-cdk/aws-cloudfront=1.38.0,@aws-cdk/aws-cloudwatch=1.38.0,@aws-cdk/aws-codebuild=1.38.0,@aws-cdk/aws-codecommit=1.38.0,@aws-cdk/aws-codepipeline=1.38.0,@aws-cdk/aws-cognito=1.38.0,@aws-cdk/aws-ec2=1.38.0,@aws-cdk/aws-ecr=1.38.0,@aws-cdk/aws-ecr-assets=1.38.0,@aws-cdk/aws-ecs=1.38.0,@aws-cdk/aws-ecs-patterns=1.38.0,@aws-cdk/aws-elasticache=1.38.0,@aws-cdk/aws-elasticloadbalancing=1.38.0,@aws-cdk/aws-elasticloadbalancingv2=1.38.0,@aws-cdk/aws-events=1.38.0,@aws-cdk/aws-events-targets=1.38.0,@aws-cdk/aws-iam=1.38.0,@aws-cdk/aws-kms=1.38.0,@aws-cdk/aws-lambda=1.38.0,@aws-cdk/aws-logs=1.38.0,@aws-cdk/aws-rds=1.38.0,@aws-cdk/aws-route53=1.38.0,@aws-cdk/aws-route53-targets=1.38.0,@aws-cdk/aws-s3=1.38.0,@aws-cdk/aws-s3-assets=1.38.0,@aws-cdk/aws-sam=1.38.0,@aws-cdk/aws-secretsmanager=1.38.0,@aws-cdk/aws-servicediscovery=1.38.0,@aws-cdk/aws-sns=1.38.0,@aws-cdk/aws-sns-subscriptions=1.38.0,@aws-cdk/aws-sqs=1.38.0,@aws-cdk/aws-ssm=1.38.0,@aws-cdk/aws-stepfunctions=1.38.0,@aws-cdk/cloud-assembly-schema=1.38.0,@aws-cdk/core=1.38.0,@aws-cdk/custom-resources=1.38.0,@aws-cdk/cx-api=1.38.0,@aws-cdk/region-info=1.38.0,jsii-runtime=Python/3.6.8
+