briancaffey · briancaffey · Sep 3, 2020 · May 26, 2020 · May 28, 2020 · May 30, 2020
diff --git a/.env.template b/.env.template
@@ -1,13 +1,6 @@
 SECRET_KEY=secret
 DEBUG=True
 
-POSTGRES_NAME=postgres
-POSTGRES_USERNAME=postgres
-POSTGRES_PASSWORD=postgres
-POSTGRES_SERVICE_HOST=postgres
-POSTGRES_SERVICE_PORT=5432
-
-
 # social auth
 GITHUB_KEY=yourkey
 GITHUB_SECRET=yoursecret
@@ -18,9 +11,6 @@ GOOGLE_OAUTH2_SECRET=abcde-fghij
 SOCIAL_AUTH_FACEBOOK_KEY = ''
 SOCIAL_AUTH_FACEBOOK_SECRET = ''
 
-CELERY_BROKER_URL=redis://redis:6379/0
-CELERY_RESULT_BACKEND=redis://redis:6379/1
-
 DJANGO_EMAIL_HOST=mailhog
 DJANGO_EMAIL_PORT=1025
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -5,16 +5,14 @@ stages:
   - build
   - integration
   - release
-  - plan
   - deploy
 
 # gitlab ci deployment options
 include:
   - local: /gitlab-ci/documentation.yml
   - local: /gitlab-ci/renovate.yml
-  - local: /gitlab-ci/aws/cdk.yml
-  # - local: /gitlab-ci/aws/cloudformation.yml
-  #- local: /gitlab-ci/gcp/terraform.yml
+  - local: /gitlab-ci/aws/dev.yml
+  - local: /gitlab-ci/aws/app.yml
 
 .Pytest:
   image: python:3.8

diff --git a/.python-version b/.python-version
diff --git a/README.md b/README.md
@@ -4,13 +4,92 @@ Documentation for this project can be found here:
 
 [https://verbose-equals-true.gitlab.io/django-postgres-vue-gitlab-ecs/](https://verbose-equals-true.gitlab.io/django-postgres-vue-gitlab-ecs/)
 
+
+## Project Architecture Overview
+
+Here is an overview of the project architecture, including the CI/CD pipeline and the AWS infrastructure that will be automatically provisioned through the AWS Cloud Development Kit:
+
+![png](/architecture.png)
+
+(This diagram was created with [draw.io](https://draw.io). Here's the link to the a read-only version of the diagram on draw.io: [https://drive.google.com/file/d/1gU61zjoW80fCusUcswU1zhEE5VFB1Z5U/view?usp=sharing](https://drive.google.com/file/d/1gU61zjoW80fCusUcswU1zhEE5VFB1Z5U/view?usp=sharing)
+
+### Legend
+
+1 - GitLab is used to host the source code, test the source code and deploy the application to AWS.
+
+2 - Unit testing (see `.gitlab-ci.yml`)
+
+2a - Pytest
+
+2b - Jest
+
+2c - Cypress
+
+3 - Deployment phase (see `/gitlab-ci/aws/cdk.yml`)
+
+3a - Quasar PWA assets are built if there are changes in the `quasar` directory
+
+3b - AWS Cloud Development Kit (CDK) defines all infrastructure in AWS (4a - 12)
+
+3c - AWS CLI is used to run Fargate tasks through manual GitLab CI jobs
+
+4 - CDK Assets (ECR and S3 buckets that CDK uses internally to manage build assets and artifacts)
+
+4a - Elastic Container Repository is used to manage the Django docker image used in various parts of the application
+
+4b - S3 bucket used to store files associated with CDK and CloudFormation
+
+5 - Route53 is used to route traffic to the CloudFront distribution
+
+6 - CloudFront distribution that serves as the "front desk" of the application. It routes requests to to the correct CloudFront Origin
+
+7 - CloudFront Origin Configurations
+
+7a - S3 bucket for Quasar PWA assets
+
+7b - Application Load Balancer for Django application (`/api/`, `/admin/`, `/flower/`, `/ws/`, `/graphql/`)
+
+7c - S3 bucket for Django assets (static files, public media and private media)
+
+8 - Web server and websocket servers
+
+8a - Fargate service running uvicorn process (REST, GraphQL, Django Channels)
+
+8b - Autoscaling Group for Fargate Service that serves Django API
+
+9 - Celery and celery worker autoscaling
+
+9a - Fargate service that is autoscaled between 0 and `N` Fargate tasks for a given celery queue
+
+9b - Scheduled Event that triggers a Lambda to make a request to Django backend which collects celery queue metrics and published metrics to CloudWatch using boto3
+
+9c - Lambda event the makes a request to `/api/celery-metrics/`
+
+9d - CloudWatch alarm that is used to scale the Fargate service for a celery queue
+
+9e - Autoscaling group for celery Fargate service
+
+10 - Fargate tasks that run Django management commands such as `migrate` and `collectstatic`. These are triggered from manual GitLab CI jobs using the AWS CLI (3c)
+
+11 - ElastiCache for Redis, used for Caching, Celery Broker, Channels Layer, etc.
+
+12 - Aurora Postgres Serverless
+
 ## Local Development
 
 First, copy `.env.template` to a new file in the project's root directory called `.env`. This file will be read by `docker-compose` in the next step. Adjust any of the values in this file if needed, or add new variables for any secret information you need to pass to docker-compose (or to docker containers).
 
+```sh
+docker-compose up
+```
+
+Open `http://localhost` in your browser.
+
+You can specify environment variables for docker-compose by adding an `.env` file to the root of the project based on `.env.template`.
+
 ### Social Authentication Keys
 
-To use social sign on in development, you will need to create an application with the given provider.
+To use social sign on in local development, you will need to create an application with the given provider such as GitHub, Google, Facebook, etc.
 
 #### GitHub
 
@@ -23,14 +102,6 @@ Go to [https://github.com/settings/applications/new](https://github.com/settings
 
 In the `.env` file, add the `Client ID` of your GitHub OAuth App as the `GITHUB_KEY` variable, and add the `Client Secret` as the `GITHUB_SECRET` variable.
 
-```sh
-docker-compose up
-```
-
-Open `http://localhost` in your browser.
-
-You can specify environment variables for docker-compose by adding an `.env` file to the root of the project based on `.env.template`.
-
 ## VuePress Documentation
 
 This project uses VuePress for documentation. To view the documentation site locally, run the following command:

diff --git a/architecture.png b/architecture.png
diff --git a/awscdk/app.py b/awscdk/app.py
@@ -13,8 +13,8 @@
 # if the the production environent subdomain should nott be included in the URL
 # redefine `full_domain_name` to `base_domain_name` for that environment
 full_domain_name = f"{environment_name}.{base_domain_name}"  # dev.mysite.com
-# if environment_name == "prod":
-#     full_domain_name = base_domain_name
+if environment_name == "app":
+    full_domain_name = base_domain_name
 base_app_name = os.environ.get("APP_NAME", "mysite-com")
 full_app_name = f"{environment_name}-{base_app_name}"  # dev-mysite-com
 aws_region = os.environ.get("AWS_DEFAULT_REGION", "us-east-1")

diff --git a/backend/.dockerignore b/backend/.dockerignore
@@ -0,0 +1,2 @@
+media
+static
diff --git a/backend/apps/core/management/commands/watch_celery.py b/backend/apps/core/management/commands/watch_celery.py
diff --git a/backend/apps/core/management/commands/watch_celery_beat.py b/backend/apps/core/management/commands/watch_celery_beat.py
diff --git a/backend/backend/settings/base.py b/backend/backend/settings/base.py
@@ -11,15 +11,13 @@
 """
 
 import os
+from pathlib import Path
 
 from kombu import Queue
 import redis
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(
-    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-)
-
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve(strict=True).parent.parent.parent
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/
@@ -269,7 +267,7 @@
 # Assets
 
 STATIC_URL = "/static/"
-STATIC_ROOT = "/static/"
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
 
 MEDIA_URL = "/media/"
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")
diff --git a/backend/requirements/base.txt b/backend/requirements/base.txt
@@ -17,6 +17,7 @@ djangorestframework==3.11.0
 djangorestframework_simplejwt==4.4.0
 django-debug-toolbar==2.2
 
+gevent==20.6.2
 
 # Python Social Auth
 

diff --git a/backend/requirements/dev.txt b/backend/requirements/dev.txt
@@ -3,4 +3,8 @@ django-extensions==2.2.9  # NOTE: in installed_apps
 Werkzeug==1.0.1 # used for runserver_plus exception console
 ipython==7.14.0
 jupyter==1.0.0
-gql==2.0.0
+gql==2.0.0
+
+watchdog==0.10.3
+pyyaml==5.3.1
+argh==0.26.2
diff --git a/backend/scripts/ci/Dockerfile b/backend/scripts/ci/Dockerfile
diff --git a/backend/scripts/prod/start_prod.sh b/backend/scripts/prod/start_prod.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-gunicorn -t 300 -b 0.0.0.0:8000 backend.wsgi
+gunicorn -t 300 -k gevent -w 4 -b 0.0.0.0:8000 backend.wsgi
diff --git a/cloudformation/infrastructure/certs.yaml b/cloudformation/infrastructure/certs.yaml