Merge branch '37-add-celery-worker' into 'develop'

Resolve "Add celery worker(s)"

Closes #37

See merge request verbose-equals-true/django-postgres-vue-gitlab-ecs!80

Author: briancaffey

awscdk/awscdk/cdk_app_root.py

@@ -5,7 +5,6 @@
 from cert import SiteCertificate
 from hosted_zone import HostedZone
 from cloudfront import CloudFront
-from ecr import ElasticContainerRepo
 from vpc import Vpc
 from assets import Assets
 from rds import Rds
@@ -17,6 +16,7 @@
 
 from backend import Backend
 from backend_tasks import BackendTasks
+from celery_workers import CeleryDefaultWorkerService
 
 
 class ApplicationStack(core.Stack):
@@ -105,6 +105,7 @@ def __init__(
             "Variables",
             bucket_name=self.assets.assets_bucket.bucket_name,
             db_secret=self.rds.db_secret,
+            full_domain_name=full_domain_name,
             postgres_host=self.rds.rds_cluster.get_att(
                 "Endpoint.Address"
             ).to_string(),
@@ -121,6 +122,10 @@ def __init__(
             security_group=self.vpc.vpc_default_security_group,
         )
 
+        self.celery_worker_service = CeleryDefaultWorkerService(
+            self, "CeleryWorkerService",
+        )
+
         # migrate, collectstatic, createsuperuser
         self.backend_tasks = BackendTasks(
             self,
@@ -137,6 +142,7 @@ def __init__(
             self.backend.backend_task.task_role,
             self.backend_tasks.collectstatic_task.task_role,
             self.backend_tasks.create_superuser_task.task_role,
+            self.celery_worker_service.celery_default_worker_task.task_role,
         ]
 
         for task_role in task_roles:

awscdk/awscdk/celery_workers.py

@@ -0,0 +1,49 @@
+from aws_cdk import (
+    core,
+    aws_ec2 as ec2,
+    aws_ecs as ecs,
+    aws_ecs_patterns as ecs_patterns,
+    aws_elasticloadbalancingv2 as elbv2,
+)
+
+
+class CeleryDefaultWorkerService(core.Construct):
+    def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
+        super().__init__(
+            scope, id, **kwargs,
+        )
+
+        self.celery_default_worker_task = ecs.FargateTaskDefinition(
+            self, "DefaultCeleryWorkerTask"
+        )
+
+        self.celery_default_worker_task.add_container(
+            "DefaultCeleryWorkerContaienr",
+            image=scope.image,
+            logging=ecs.LogDrivers.aws_logs(
+                stream_prefix="CeleryDefaultWorker"
+            ),
+            environment=scope.variables.regular_variables,
+            secrets=scope.variables.secret_variables,
+            command=[
+                'celery',
+                'worker',
+                '-A',
+                'backend.celery_app:app',
+                '-l',
+                'info',
+            ],
+        )
+
+        self.celery_default_worker_service = ecs.FargateService(
+            self,
+            "DefaultCeleryWorkerService",
+            task_definition=self.celery_default_worker_task,
+            assign_public_ip=True,
+            cluster=scope.ecs.cluster,
+            security_group=ec2.SecurityGroup.from_security_group_id(
+                self,
+                "CeleryDefaultWorkerSG",
+                security_group_id=scope.vpc.vpc_default_security_group,
+            ),
+        )

awscdk/awscdk/cloudfront.py

@@ -72,11 +72,7 @@ def __init__(
                         cloudfront.Behavior(
                             allowed_methods=cloudfront.CloudFrontAllowedMethods.ALL,
                             path_pattern=path_pattern,
-                            forwarded_values={
-                                "headers": ["*"],
-                                "cookies": {"forward": "all"},
-                                "query_string": True,
-                            },
+                            forwarded_values={"query_string": True},
                         )
                         for path_pattern in ["/static/*", "/media/*"]
                     ],

awscdk/awscdk/env_vars.py

@@ -12,6 +12,7 @@ def __init__(
         postgres_host: str,
         redis_host: str,
         db_secret: secrets.ISecret,
+        full_domain_name: str,
         **kwargs,
     ) -> None:
         super().__init__(
@@ -29,6 +30,7 @@ def __init__(
         self.regular_variables = {
             "DJANGO_SETTINGS_MODULE": "backend.settings.production",
             "DEBUG": "",
+            "FULL_DOMAIN_NAME": full_domain_name,
             "AWS_STORAGE_BUCKET_NAME": bucket_name,
             "POSTGRES_SERVICE_HOST": postgres_host,
             "POSTGRES_PASSWORD": db_secret.secret_value_from_json(