Sync backend with boilerplate

.gitignore

@@ -2,5 +2,4 @@ __pycache__/
 *.py[cod]
 .idea/
 db.sqlite3
-.pytest_cache/
-.env
+.pytest_cache/

.travis.yml

@@ -1,8 +1,7 @@
 language: python
 python:
   - "3.6"
-install:
-  - pip install pipenv
-  - pipenv install --dev
+services:
+  - docker
 script:
-  - pipenv run pytest
+  - BACKEND_IMAGE=backend docker-compose -f docker-compose-ci.yml run backend /app/scripts/dev/run_tests.sh

Dockerfile

@@ -9,12 +9,14 @@ RUN apk update \
     && apk add postgresql-dev \
     && apk add build-base linux-headers pcre-dev
 
+RUN pip install awscli
+
 EXPOSE 3031
-WORKDIR /code
-COPY Pipfile Pipfile.lock ./
+WORKDIR /app
+COPY Pipfile Pipfile.lock /app/
 RUN pip install --upgrade pip
 RUN pip install pipenv
 RUN pipenv install --system --dev
-COPY . .
+COPY . /app
 
-CMD ["./run-backend.sh"]
+CMD ["/app/scripts/run-backend.sh"]

Pipfile

@@ -9,6 +9,9 @@ djangorestframework = "~=3.10"
 djangorestframework-jwt = "~=1.11"
 django-hashid-field = "~=2.1"
 dj-database-url = "*"
+uwsgi = "*"
+boto3 = "==1.9.93"
+"psycopg2-binary" = "*"
 
 [dev-packages]
 factory_boy = "==2.10.0"

docker-compose-ci.yml

@@ -0,0 +1,35 @@
+version: '3'
+
+services:
+  db:
+    image: postgres:9.6.8
+    ports:
+    - "5432:5432"
+    env_file: test.env
+
+  localstack:
+    image: localstack/localstack:0.10.2
+    ports:
+      - "4567-4584:4567-4584"
+    environment:
+      - SERVICES=secretsmanager
+      - DEBUG=${DEBUG- }
+      - DATA_DIR=${DATA_DIR- }
+      - PORT_WEB_UI=${PORT_WEB_UI- }
+      - LAMBDA_EXECUTOR=${LAMBDA_EXECUTOR- }
+      - LAMBDA_REMOTE_DOCKER=false
+      - KINESIS_ERROR_PROBABILITY=${KINESIS_ERROR_PROBABILITY- }
+      - DOCKER_HOST=unix:///var/run/docker.sock
+      - AWS_EXECUTION_ENV=True
+      - AWS_DEFAULT_REGION=us-east-1
+      - AWS_ACCESS_KEY_ID=foo
+      - AWS_SECRET_ACCESS_KEY=bar
+
+  backend:
+    image: ${BACKEND_IMAGE}
+    depends_on:
+      - db
+      - localstack
+    restart: on-failure
+    env_file: test.env
+    command: ./scripts/dev/run_tests.sh

restauth/settings.py

@@ -1,9 +1,19 @@
 import os
+import json
 import dj_database_url
+import boto3
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+secrets_manager = boto3.client(
+    'secretsmanager', endpoint_url=os.environ.get('SECRET_MANAGER_ENDPOINT_URL', None))
+
+db_secret_arn = os.environ['DB_SECRET_ARN']
+
+db_secret_value = secrets_manager.get_secret_value(SecretId=db_secret_arn)
+# contains host, username, password and port
+db_connection_config = json.loads(db_secret_value.get('SecretString'))
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
@@ -64,7 +74,17 @@
 # https://docs.djangoproject.com/en/1.11/ref/settings/#databases
 
 DATABASES = {
-    'default': dj_database_url.parse('sqlite:///db.sqlite3'),
+    "default": {
+        "ENGINE": "django.db.backends.postgresql",
+        "NAME": os.getenv("POSTGRES_DB"),
+        "USER": db_connection_config.get('username'),
+        "PASSWORD": db_connection_config.get('password'),
+        "HOST": db_connection_config.get('host'),
+        # Persistent connections avoid the overhead of re-establishing a connection
+        # to the database in each request
+        "CONN_MAX_AGE": int(os.getenv("POSTGRES_CONN_MAX_AGE", '60')),
+        "PORT": db_connection_config.get('port'),
+    }
 }
 
 

scripts/dev/install_localstack_fixtures.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e
+
+function wait_for_secretsmanager {
+  until aws --no-sign-request --endpoint-url="$SECRET_MANAGER_ENDPOINT_URL" secretsmanager list-secrets; do
+    >&2 echo "Secretsmanager is unavailable - sleeping"
+    sleep 1
+  done
+}
+
+function install_db_secret {
+  SECRET_STRING="{\"host\": \"db\", \"username\": \"$POSTGRES_USER\", \"password\": \"$POSTGRES_PASSWORD\", \"port\": $POSTGRES_PORT}"
+
+  aws --endpoint-url="$SECRET_MANAGER_ENDPOINT_URL" secretsmanager create-secret \
+      --name "$DB_SECRET_ARN" \
+      --secret-string "$SECRET_STRING"
+}

scripts/dev/run-backend.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -e
+
+. $(dirname "$0")/install_localstack_fixtures.sh
+
+# wait untill secretsmanager become ready
+wait_for_secretsmanager
+echo "Secrets manager is up"
+
+# install all localstack fixtures
+{
+    install_db_secret &&
+    echo "DB secrets set"
+} || {
+    echo "DB secrets NOT set"
+}
+
+python ./scripts/dev/wait_for_postgres.py &&
+  ./manage.py migrate &&
+  ./manage.py runserver 0.0.0.0:8000