Merge branch 'develop'

Author: briancaffey

awscdk/awscdk/backend.py

@@ -14,6 +14,7 @@ def __init__(
         self,
         scope: core.Construct,
         id: str,
+        image: ecs.AssetImage,
         load_balancer,
         cluster: ecs.ICluster,
         environment_variables: core.Construct,
@@ -28,11 +29,7 @@ def __init__(
 
         self.backend_task.add_container(
             "DjangoBackend",
-            image=ecs.AssetImage(
-                "../backend",
-                file="scripts/prod/Dockerfile",
-                target="production",
-            ),
+            image=image,
             logging=ecs.LogDrivers.aws_logs(stream_prefix="Backend"),
             environment=environment_variables.regular_variables,
             secrets=environment_variables.secret_variables,

awscdk/awscdk/backend_tasks.py

@@ -11,6 +11,7 @@ def __init__(
         self,
         scope: core.Construct,
         id: str,
+        image: ecs.AssetImage,
         cluster: ecs.ICluster,
         environment_variables: core.Construct,
         full_app_name: str,
@@ -20,10 +21,6 @@ def __init__(
             scope, id, **kwargs,
         )
 
-        image = ecs.AssetImage(
-            "../backend", file="scripts/prod/Dockerfile", target="production",
-        )
-
         self.migrate_task = ecs.FargateTaskDefinition(
             self, "MigrateTask", family=f"{full_app_name}-migrate"
         )

awscdk/awscdk/cdk_app_root.py

@@ -1,4 +1,4 @@
-from aws_cdk import core
+from aws_cdk import core, aws_ecs as ecs
 
 from cert import SiteCertificate
 from hosted_zone import HostedZone
@@ -74,9 +74,15 @@ def __init__(
             self, "RdsDBCluster", vpc=self.vpc.vpc, full_app_name=full_app_name
         )
 
-        # self.elasticache = ElastiCache(
-        #     self, "ElastiCacheRedis", vpc=self.vpc.vpc
-        # )
+        self.elasticache = ElastiCache(
+            self, "ElastiCacheRedis", vpc=self.vpc.vpc
+        )
+
+        # image used for all django containers
+        # gunicorn, daphne, celery workers, celery beat
+        self.image = ecs.AssetImage(
+            "../backend", file="scripts/prod/Dockerfile", target="production",
+        )
 
         self.variables = Variables(
             self,
@@ -86,11 +92,13 @@ def __init__(
             postgres_host=self.rds.rds_cluster.get_att(
                 "Endpoint.Address"
             ).to_string(),
+            redis_host=self.elasticache.elasticache.attr_redis_endpoint_address,  # noqa
         )
 
         self.backend = Backend(
             self,
             "Backend",
+            image=self.image,
             load_balancer=self.alb,
             cluster=self.ecs.cluster,
             environment_variables=self.variables,
@@ -101,6 +109,7 @@ def __init__(
         self.backend_tasks = BackendTasks(
             self,
             "BackendTasks",
+            image=self.image,
             cluster=self.ecs.cluster,
             environment_variables=self.variables,
             full_app_name=full_app_name,

awscdk/awscdk/elasticache.py

@@ -23,8 +23,7 @@ def __init__(
                     ip_protocol="tcp",
                     to_port=6379,
                     from_port=6379,
-                    # TODO: replace this with ECS security group
-                    source_security_group_id="security-group-id",
+                    source_security_group_id=vpc.vpc_default_security_group,
                 )
             ],
         )
@@ -47,5 +46,5 @@ def __init__(
             vpc_security_group_ids=[
                 self.elasticache_security_group.get_att("GroupId").to_string()
             ],
-            cache_subnet_group_name=self.elasticache_subnet_group.cache_subnet_group_name,
+            cache_subnet_group_name=self.elasticache_subnet_group.cache_subnet_group_name,  # noqa
         )

awscdk/awscdk/env_vars.py

@@ -10,6 +10,7 @@ def __init__(
         id: str,
         bucket_name: str,
         postgres_host: str,
+        redis_host: str,
         db_secret: secrets.ISecret,
         **kwargs,
     ) -> None:
@@ -36,6 +37,7 @@ def __init__(
             "SECRET_KEY": os.environ.get(
                 "SECRET_KEY", "mysecretkey123"
             ),  # self.django_secret_key.to_string(),
+            "REDIS_SERVICE_HOST": redis_host,
         }
 
         self.secret_variables = {

awscdk/stack.yml

@@ -665,7 +665,6 @@ Resources:
           - - "{{resolve:secretsmanager:"
             - Ref: RdsDBClusterDBSecret28397CCA
             - :SecretString:password::}}
-      Port: 5432
       Tags:
         - Key: StackName
           Value: dev-mysite-com
@@ -675,6 +674,49 @@ Resources:
             - GroupId
     Metadata:
       aws:cdk:path: dev-mysite-com-stack/RdsDBCluster/DBCluster
+  ElastiCacheRedisElastiCacheSecurityGroupA36895A6:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: ElastiCacheSecurityGroup
+      SecurityGroupIngress:
+        - FromPort: 6379
+          IpProtocol: tcp
+          SourceSecurityGroupId:
+            Fn::GetAtt:
+              - VpcC3027511
+              - DefaultSecurityGroup
+          ToPort: 6379
+      Tags:
+        - Key: StackName
+          Value: dev-mysite-com
+      VpcId:
+        Ref: VpcC3027511
+    Metadata:
+      aws:cdk:path: dev-mysite-com-stack/ElastiCacheRedis/ElastiCacheSecurityGroup
+  ElastiCacheRedisCfnSubnetGroup403949FE:
+    Type: AWS::ElastiCache::SubnetGroup
+    Properties:
+      Description: The subnet group for ElastiCache
+      SubnetIds:
+        - Ref: VpcIsolatedSubnet1SubnetDC3C6AF8
+        - Ref: VpcIsolatedSubnet2SubnetB479B99C
+    Metadata:
+      aws:cdk:path: dev-mysite-com-stack/ElastiCacheRedis/CfnSubnetGroup
+  ElastiCacheRedisElastiCacheClusterRedis25390D9F:
+    Type: AWS::ElastiCache::CacheCluster
+    Properties:
+      CacheNodeType: cache.t2.micro
+      Engine: redis
+      NumCacheNodes: 1
+      Tags:
+        - Key: StackName
+          Value: dev-mysite-com
+      VpcSecurityGroupIds:
+        - Fn::GetAtt:
+            - ElastiCacheRedisElastiCacheSecurityGroupA36895A6
+            - GroupId
+    Metadata:
+      aws:cdk:path: dev-mysite-com-stack/ElastiCacheRedis/ElastiCacheClusterRedis
   VariablesDjangoSecretKeyE4FA41EE:
     Type: AWS::SecretsManager::Secret
     Properties:
@@ -766,6 +808,11 @@ Resources:
                     - :SecretString:password::}}
             - Name: SECRET_KEY
               Value: mysecretkey123
+            - Name: REDIS_SERVICE_HOST
+              Value:
+                Fn::GetAtt:
+                  - ElastiCacheRedisElastiCacheClusterRedis25390D9F
+                  - RedisEndpoint.Address
           Essential: true
           Image:
             Fn::Join:
@@ -967,6 +1014,11 @@ Resources:
                     - :SecretString:password::}}
             - Name: SECRET_KEY
               Value: mysecretkey123
+            - Name: REDIS_SERVICE_HOST
+              Value:
+                Fn::GetAtt:
+                  - ElastiCacheRedisElastiCacheClusterRedis25390D9F
+                  - RedisEndpoint.Address
           Essential: true
           Image:
             Fn::Join:
@@ -1149,6 +1201,11 @@ Resources:
                     - :SecretString:password::}}
             - Name: SECRET_KEY
               Value: mysecretkey123
+            - Name: REDIS_SERVICE_HOST
+              Value:
+                Fn::GetAtt:
+                  - ElastiCacheRedisElastiCacheClusterRedis25390D9F
+                  - RedisEndpoint.Address
           Essential: true
           Image:
             Fn::Join:
@@ -1330,6 +1387,11 @@ Resources:
                     - :SecretString:password::}}
             - Name: SECRET_KEY
               Value: mysecretkey123
+            - Name: REDIS_SERVICE_HOST
+              Value:
+                Fn::GetAtt:
+                  - ElastiCacheRedisElastiCacheClusterRedis25390D9F
+                  - RedisEndpoint.Address
           Essential: true
           Image:
             Fn::Join:

backend/scripts/ci/Dockerfile

@@ -15,9 +15,7 @@ ADD backend/ /code/
 
 # build stage that generates quasar assets
 FROM node:10-alpine as build-stage
-ENV HTTP_PROTOCOL http
-ENV WS_PROTOCOL ws
-ENV DOMAIN_NAME localhost:9000
+ENV FULL_DOMAIN_NAME localhost:9000
 WORKDIR /app/
 COPY quasar/package.json /app/
 RUN npm cache verify
@@ -43,9 +41,9 @@ RUN npm -v
 
 # cypress dependencies
 RUN apt-get -qq install -y xvfb \
-  libgtk-3-dev \
-  libnotify-dev \
-  libgconf-2-4 \
-  libnss3 \
-  libxss1 \
-  libasound2
+    libgtk-3-dev \
+    libnotify-dev \
+    libgconf-2-4 \
+    libnss3 \
+    libxss1 \
+    libasound2

compose/minikube.yml

@@ -1,22 +1,18 @@
-version: '3.7'
+version: "3.7"
 
 services:
-
   frontend:
     image: frontend:2
     build:
       context: ../
       dockerfile: nginx/minikube/Dockerfile
       args:
-        - DOMAIN_NAME=minikube.local
+        - FULL_DOMAIN_NAME=minikube.local
         - GOOGLE_OAUTH2_KEY=google123
         - GITHUB_KEY=github123
-        - WS_PROTOCOL=ws
-        - HTTP_PROTOCOL=http
 
   backend:
     image: backend:1
     build:
       context: ../backend/
       dockerfile: scripts/dev/Dockerfile
-

docker-compose.yml

@@ -73,9 +73,7 @@ services:
       - GITHUB_KEY=${GITHUB_KEY}
       - GOOGLE_OAUTH2_KEY=${GOOGLE_OAUTH2_KEY}
       - FACEBOOK_KEY=${FACEBOOK_KEY}
-      - HTTP_PROTOCOL=http
-      - WS_PROTOCOL=ws
-      - DOMAIN_NAME=${DOMAIN_NAME}
+      - FULL_DOMAIN_NAME=${DOMAIN_NAME}
     restart: "no"
 
   backend: &backend
@@ -182,7 +180,7 @@ services:
       PGADMIN_DEFAULT_EMAIL: pgadmin4@pgadmin.org
       PGADMIN_DEFAULT_PASSWORD: admin
     volumes:
-       - pgadmin:/root/.pgadmin
+      - pgadmin:/root/.pgadmin
     ports:
       - "5050:80"
     depends_on:

documentation/docs/topics/minikube/README.md

@@ -775,11 +775,9 @@ services:
       context: ../
       dockerfile: nginx/minikube/Dockerfile
       args:
-        - DOMAIN_NAME=minikube.local
+        - FULL_DOMAIN_NAME=minikube.local
         - GOOGLE_OAUTH2_KEY=google123
         - GITHUB_KEY=github123
-        - WS_PROTOCOL=ws
-        - HTTP_PROTOCOL=http
 ```
 
 Make sure that your current shell has the correct environment variables set for the `DOCKER_HOST` by running: