Merge branch '32-fix-elasticache-subnet-reference' into 'develop'

Resolve "Subnet group [default] belongs to a different VPC X than Y"

Closes #32

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

Author: briancaffey

awscdk/awscdk/awscdk.egg-info/requires.txt

@@ -3,6 +3,7 @@ aws-cdk.aws_certificatemanager==1.38.0
 aws-cdk.aws_secretsmanager==1.38.0
 aws-cdk.aws_route53==1.38.0
 aws-cdk.aws_s3==1.38.0
+aws_cdk.aws_s3_deployment==1.38.0
 aws-cdk.aws_cloudfront==1.38.0
 aws-cdk.aws_route53_targets==1.38.0
 aws-cdk.aws_ecr==1.38.0

awscdk/awscdk/elasticache.py

@@ -46,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,  # noqa
+            cache_subnet_group_name=self.elasticache_subnet_group.ref,  # noqa
         )

awscdk/awscdk/static_site_bucket.py

@@ -1,5 +1,8 @@
+import os
+
 from aws_cdk import (
     aws_s3 as s3,
+    aws_s3_deployment as s3_deployment,
     aws_iam as iam,
     core,
 )
@@ -33,3 +36,7 @@ def __init__(
         )
 
         self.static_site_bucket.add_to_resource_policy(self.policy_statement)
+
+        if os.path.isdir("../quasar/dist/pwa"):
+            print("quasar assets dir")
+            # TODO: S3 Deployment if there are files in the pwa folder

awscdk/setup.py

@@ -20,6 +20,7 @@
         "aws-cdk.aws_secretsmanager==1.38.0",
         "aws-cdk.aws_route53==1.38.0",
         "aws-cdk.aws_s3==1.38.0",
+        "aws_cdk.aws_s3_deployment==1.38.0",
         "aws-cdk.aws_cloudfront==1.38.0",
         "aws-cdk.aws_route53_targets==1.38.0",
         "aws-cdk.aws_ecr==1.38.0",

awscdk/stack.yml

@@ -820,7 +820,7 @@ Resources:
               - - Ref: AWS::AccountId
                 - .dkr.ecr.us-east-1.
                 - Ref: AWS::URLSuffix
-                - /aws-cdk/assets:1da57cd88c50ee3c4ef711e428963792b0ac58ea8173a192b45622a829fec77b
+                - /aws-cdk/assets:e9bd2944752269283bca892a634e5fb9e54f6646415dbc7fc0118bca834b3e04
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -1026,7 +1026,7 @@ Resources:
               - - Ref: AWS::AccountId
                 - .dkr.ecr.us-east-1.
                 - Ref: AWS::URLSuffix
-                - /aws-cdk/assets:1da57cd88c50ee3c4ef711e428963792b0ac58ea8173a192b45622a829fec77b
+                - /aws-cdk/assets:e9bd2944752269283bca892a634e5fb9e54f6646415dbc7fc0118bca834b3e04
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -1213,7 +1213,7 @@ Resources:
               - - Ref: AWS::AccountId
                 - .dkr.ecr.us-east-1.
                 - Ref: AWS::URLSuffix
-                - /aws-cdk/assets:1da57cd88c50ee3c4ef711e428963792b0ac58ea8173a192b45622a829fec77b
+                - /aws-cdk/assets:e9bd2944752269283bca892a634e5fb9e54f6646415dbc7fc0118bca834b3e04
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -1399,7 +1399,7 @@ Resources:
               - - Ref: AWS::AccountId
                 - .dkr.ecr.us-east-1.
                 - Ref: AWS::URLSuffix
-                - /aws-cdk/assets:1da57cd88c50ee3c4ef711e428963792b0ac58ea8173a192b45622a829fec77b
+                - /aws-cdk/assets:e9bd2944752269283bca892a634e5fb9e54f6646415dbc7fc0118bca834b3e04
           LogConfiguration:
             LogDriver: awslogs
             Options: