Merge branch '28-add-elasticache-redis' into 'develop'

added elasticache, updated env vars to include redis service host

Closes #28

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

Author: briancaffey

awscdk/awscdk/cdk_app_root.py

@@ -74,9 +74,9 @@ 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
@@ -92,6 +92,7 @@ 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(

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: