added flower service to ecs

Author: briancaffey

awscdk/awscdk/backend.py

@@ -57,7 +57,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs,) -> None:
             "BackendTarget",
             port=80,
             targets=[self.backend_service],
-            priority=1,
+            priority=2,
             path_patterns=["*"],
             health_check=elbv2.HealthCheck(
                 healthy_http_codes="200-299", path="/api/health-check/",

awscdk/awscdk/cdk_app_root.py

@@ -13,6 +13,7 @@
 from ecs import EcsStack
 from env_vars import Variables
 from static_site_bucket import StaticSiteStack
+from flower import FlowerServiceStack
 
 from backend import BackendServiceStack
 from backend_tasks import BackendTasksStack
@@ -93,6 +94,7 @@ def __init__(
         )
 
         self.backend_service = BackendServiceStack(self, "BackendServiceStack")
+        self.flower_service = FlowerServiceStack(self, "FlowerServiceStack")
 
         self.celery_default_service = CeleryDefaultServiceStack(
             self, "CeleryDefaultServiceStack"

awscdk/awscdk/flower.py

@@ -24,7 +24,7 @@ def __init__(self, scope: core.Construct, id: str, **kwargs,) -> None:
         )
         CELERY_BROKER_URL = f"redis://{REDIS_SERVICE_HOST}:6379/0"
         self.flower_task.add_container(
-            "BackendContainer",
+            "FlowerContainer",
             image=ecs.ContainerImage.from_registry("mher/flower"),
             logging=ecs.LogDrivers.aws_logs(
                 stream_prefix="FlowerContainer",
@@ -37,13 +37,6 @@ def __init__(self, scope: core.Construct, id: str, **kwargs,) -> None:
             ],
         )
 
-        scope.backend_assets_bucket.grant_read_write(
-            self.backend_task.task_role
-        )
-
-        for secret in [scope.variables.django_secret_key, scope.rds.db_secret]:
-            secret.grant_read(self.backend_task.task_role)
-
         port_mapping = ecs.PortMapping(
             container_port=5555, protocol=ecs.Protocol.TCP
         )
@@ -57,16 +50,18 @@ def __init__(self, scope: core.Construct, id: str, **kwargs,) -> None:
             cluster=scope.ecs.cluster,
             security_group=ec2.SecurityGroup.from_security_group_id(
                 self,
-                "BackendServiceSecurityGroup",
+                "FlowerServiceSecurityGroup",
                 security_group_id=scope.vpc.vpc_default_security_group,
             ),
         )
 
         scope.https_listener.add_targets(
-            "BackendTarget",
+            "FlowerTarget",
             port=80,
             targets=[self.flower_service],
             priority=1,
-            path_patterns=["/flower/*"],
-            health_check=elbv2.HealthCheck(healthy_http_codes="200-401",),
+            path_patterns=["/flower/*", "flower/*"],
+            health_check=elbv2.HealthCheck(
+                healthy_http_codes="200-401", path="/flower/"
+            ),
         )