added assets bucket to cloudfront to serve media and static files from cloudfront distribution

Author: briancaffey

awscdk/awscdk/cdk_app_root.py

@@ -58,13 +58,18 @@ def __init__(
             self, "StaticSiteBucket", full_app_name=full_app_name
         ).static_site_bucket
 
+        self.assets = Assets(
+            self, "BackendAssets", full_app_name=full_app_name
+        )
+
         self.cloudfront = CloudFront(
             self,
             "StaticSite",
             hosted_zone=self.hosted_zone,
             static_site_bucket_name=self.static_site_bucket.bucket_name,  # noqa
             certificate=self.certificate,
             alb=self.alb.load_balancer_dns_name,
+            assets_bucket=self.assets.assets_bucket,
             full_domain_name=full_domain_name,
             full_app_name=full_app_name,
         )
@@ -83,10 +88,6 @@ def __init__(
 
         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, full_app_name=full_app_name
         )

awscdk/awscdk/cloudfront.py

@@ -17,6 +17,7 @@ def __init__(
         static_site_bucket_name: str,
         hosted_zone: route53.IHostedZone,
         certificate: acm.ICertificate,
+        assets_bucket: s3.IBucket,
         alb: str,
         full_domain_name: str,
         full_app_name: str,
@@ -28,6 +29,7 @@ def __init__(
             f"{static_site_bucket_name}.s3-website-us-east-1.amazonaws.com"
         )
         path_patterns = ["/api/*", "/admin/*", "/flower/*"]
+
         self.distribution = cloudfront.CloudFrontWebDistribution(
             self,
             "CloudFrontDistribution",
@@ -62,6 +64,23 @@ def __init__(
                         )
                     ],
                 ),
+                cloudfront.SourceConfiguration(
+                    s3_origin_source=cloudfront.S3OriginConfig(
+                        s3_bucket_source=assets_bucket
+                    ),
+                    behaviors=[
+                        cloudfront.Behavior(
+                            allowed_methods=cloudfront.CloudFrontAllowedMethods.ALL,
+                            path_pattern=path_pattern,
+                            forwarded_values={
+                                "headers": ["*"],
+                                "cookies": {"forward": "all"},
+                                "query_string": True,
+                            },
+                        )
+                        for path_pattern in ["/static/*", "/media/*"]
+                    ],
+                ),
             ],
             alias_configuration=cloudfront.AliasConfiguration(
                 acm_cert_ref=certificate.certificate_arn,

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:
@@ -408,6 +408,37 @@ Resources:
         Version: "2012-10-17"
     Metadata:
       aws:cdk:path: dev-mysite-com-stack/StaticSiteBucket/StaticSiteBucket/Policy/Resource
+  BackendAssetsAssetsBucket62473847:
+    Type: AWS::S3::Bucket
+    Properties:
+      BucketName: dev-mysite-com-assets
+      Tags:
+        - Key: StackName
+          Value: dev-mysite-com
+    UpdateReplacePolicy: Retain
+    DeletionPolicy: Retain
+    Metadata:
+      aws:cdk:path: dev-mysite-com-stack/BackendAssets/AssetsBucket/Resource
+  BackendAssetsAssetsBucketPolicyE8C83357:
+    Type: AWS::S3::BucketPolicy
+    Properties:
+      Bucket:
+        Ref: BackendAssetsAssetsBucket62473847
+      PolicyDocument:
+        Statement:
+          - Action: s3:GetObject
+            Effect: Allow
+            Principal: "*"
+            Resource:
+              Fn::Join:
+                - ""
+                - - Fn::GetAtt:
+                      - BackendAssetsAssetsBucket62473847
+                      - Arn
+                  - /static/*
+        Version: "2012-10-17"
+    Metadata:
+      aws:cdk:path: dev-mysite-com-stack/BackendAssets/AssetsBucket/Policy/Resource
   StaticSiteCloudFrontDistributionCFDistributionA70E78CD:
     Type: AWS::CloudFront::Distribution
     Properties:
@@ -478,6 +509,48 @@ Resources:
             PathPattern: /flower/*
             TargetOriginId: origin1
             ViewerProtocolPolicy: redirect-to-https
+          - AllowedMethods:
+              - DELETE
+              - GET
+              - HEAD
+              - OPTIONS
+              - PATCH
+              - POST
+              - PUT
+            CachedMethods:
+              - GET
+              - HEAD
+            Compress: true
+            ForwardedValues:
+              Cookies:
+                Forward: all
+              Headers:
+                - "*"
+              QueryString: true
+            PathPattern: /static/*
+            TargetOriginId: origin3
+            ViewerProtocolPolicy: redirect-to-https
+          - AllowedMethods:
+              - DELETE
+              - GET
+              - HEAD
+              - OPTIONS
+              - PATCH
+              - POST
+              - PUT
+            CachedMethods:
+              - GET
+              - HEAD
+            Compress: true
+            ForwardedValues:
+              Cookies:
+                Forward: all
+              Headers:
+                - "*"
+              QueryString: true
+            PathPattern: /media/*
+            TargetOriginId: origin3
+            ViewerProtocolPolicy: redirect-to-https
         DefaultCacheBehavior:
           AllowedMethods:
             - GET
@@ -524,6 +597,12 @@ Resources:
                 - - Ref: StaticSiteBucket6BF500B9
                   - .s3-website-us-east-1.amazonaws.com
             Id: origin2
+          - DomainName:
+              Fn::GetAtt:
+                - BackendAssetsAssetsBucket62473847
+                - RegionalDomainName
+            Id: origin3
+            S3OriginConfig: {}
         PriceClass: PriceClass_100
         ViewerCertificate:
           AcmCertificateArn:
@@ -557,37 +636,6 @@ Resources:
           Value: dev-mysite-com
     Metadata:
       aws:cdk:path: dev-mysite-com-stack/Ecs/EcsCluster/Resource
-  BackendAssetsAssetsBucket62473847:
-    Type: AWS::S3::Bucket
-    Properties:
-      BucketName: dev-mysite-com-assets
-      Tags:
-        - Key: StackName
-          Value: dev-mysite-com
-    UpdateReplacePolicy: Retain
-    DeletionPolicy: Retain
-    Metadata:
-      aws:cdk:path: dev-mysite-com-stack/BackendAssets/AssetsBucket/Resource
-  BackendAssetsAssetsBucketPolicyE8C83357:
-    Type: AWS::S3::BucketPolicy
-    Properties:
-      Bucket:
-        Ref: BackendAssetsAssetsBucket62473847
-      PolicyDocument:
-        Statement:
-          - Action: s3:GetObject
-            Effect: Allow
-            Principal: "*"
-            Resource:
-              Fn::Join:
-                - ""
-                - - Fn::GetAtt:
-                      - BackendAssetsAssetsBucket62473847
-                      - Arn
-                  - /static/*
-        Version: "2012-10-17"
-    Metadata:
-      aws:cdk:path: dev-mysite-com-stack/BackendAssets/AssetsBucket/Policy/Resource
   RdsDBClusterDBSecret28397CCA:
     Type: AWS::SecretsManager::Secret
     Properties:
@@ -822,7 +870,7 @@ Resources:
               - - Ref: AWS::AccountId
                 - .dkr.ecr.us-east-1.
                 - Ref: AWS::URLSuffix
-                - /aws-cdk/assets:315e2df1a1c69ccadd512a824f2ac30372ca3ad34f88048d06058db1be8f2bf9
+                - /aws-cdk/assets:cecf15b2b6427c94fe8347ab93564105a951a8de4a7f7c927ada0374f2a9c97c
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -917,8 +965,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
@@ -1028,7 +1076,7 @@ Resources:
               - - Ref: AWS::AccountId
                 - .dkr.ecr.us-east-1.
                 - Ref: AWS::URLSuffix
-                - /aws-cdk/assets:315e2df1a1c69ccadd512a824f2ac30372ca3ad34f88048d06058db1be8f2bf9
+                - /aws-cdk/assets:cecf15b2b6427c94fe8347ab93564105a951a8de4a7f7c927ada0374f2a9c97c
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -1215,7 +1263,7 @@ Resources:
               - - Ref: AWS::AccountId
                 - .dkr.ecr.us-east-1.
                 - Ref: AWS::URLSuffix
-                - /aws-cdk/assets:315e2df1a1c69ccadd512a824f2ac30372ca3ad34f88048d06058db1be8f2bf9
+                - /aws-cdk/assets:cecf15b2b6427c94fe8347ab93564105a951a8de4a7f7c927ada0374f2a9c97c
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -1401,7 +1449,7 @@ Resources:
               - - Ref: AWS::AccountId
                 - .dkr.ecr.us-east-1.
                 - Ref: AWS::URLSuffix
-                - /aws-cdk/assets:315e2df1a1c69ccadd512a824f2ac30372ca3ad34f88048d06058db1be8f2bf9
+                - /aws-cdk/assets:cecf15b2b6427c94fe8347ab93564105a951a8de4a7f7c927ada0374f2a9c97c
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -1489,4 +1537,3 @@ 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-s3-deployment=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
-

backend/backend/settings/base.py

@@ -251,18 +251,14 @@
 # https://docs.djangoproject.com/en/2.1/howto/static-files/
 
 AWS_DEFAULT_ACL = None
-
 AWS_STORAGE_BUCKET_NAME = os.environ.get(
     "AWS_STORAGE_BUCKET_NAME", "bucketname"
 )
 AWS_S3_CUSTOM_DOMAIN = f"{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com"
 AWS_S3_OBJECT_PARAMETERS = {
     "CacheControl": "max-age=86400",
 }
-
 AWS_PRIVATE_MEDIA_LOCATION = "media/private"
-AWS_STATIC_LOCATION = "static"
-
 PRIVATE_FILE_STORAGE = "backend.storage_backends.PrivateMediaStorage"
 
 

backend/backend/settings/production.py

@@ -12,10 +12,9 @@
 
 # AWS S3 Static Files
 
-AWS_STATIC_LOCATION = "static"
 STATICFILES_STORAGE = "backend.storage_backends.StaticStorage"
-STATIC_URL = f"https://{AWS_S3_CUSTOM_DOMAIN}/{AWS_STATIC_LOCATION}/"  # noqa
-
+STATIC_URL = "/static/"
+MEDIA_URL = "/media/"
 
 # Logging