#125 Docker configuration changes

Author: kalbfled

.env.local

@@ -1,5 +1,5 @@
-# this file is used to set environment variables for the local development environment. If you need to override any of these
-# values then source this file in your shell before bringing up fastapi.
+# This file is used to set environment variables for the local development environment. If you need to override any of these
+# values, source this file in your shell before bringing up fastapi.
 export ACCESS_TOKEN_EXPIRE_SECONDS=60
 export AWS_ACCESS_KEY_ID=test
 export AWS_SECRET_ACCESS_KEY=test
@@ -10,4 +10,4 @@ export ENP_ADMIN_SECRET_KEY=not-very-secret
 export ENP_DB_PORT=5433
 export ENV=local
 export NAPI_DB_READ_URI=postgresql+psycopg://postgres:LocalPassword@localhost:5432/notification_api
-export NAPI_DB_WRITE_URI=postgresql+psycopg://postgres:LocalPassword@localhost:5432/notification_api
+export NAPI_DB_WRITE_URI=postgresql+psycopg://postgres:LocalPassword@localhost:5432/notification_api

.talismanrc

@@ -1,8 +1,6 @@
 fileignoreconfig:
 - filename: .env.example
   checksum: f04bd8b8a51131d412bea4b8098e714ca01f4c7475eeb0a40d196d922070ba43
-- filename: .env.local
-  checksum: 60e7f10e36a8635b33bc26945e6336ae183fe603a15169e462027339360a00f4
 - filename: .github/workflows/deploy.yml
   checksum: fc90179b23528cc9668f868361e0889635deb8ebd4b78ff738f4143a151b3e64
 - filename: app/auth.py
@@ -18,11 +16,9 @@ fileignoreconfig:
 - filename: cd/perf.env
   checksum: 5c50afeea60016a131f94dacd3086db9cbb4c6af573be19c7de91bbb51e04db7
 - filename: ci/.env.docker
-  checksum: 89c9897e4d29e36b9c001d98a0c0cd28b08858d367771b5e1ec50e398bc19e23
-- filename: ci/.env.local
-  checksum: b9a695faea7f7f98ad3b1f221938144cc70667f70a8ab9e3828499fe1005d556
-- filename: ci/.local.env
-  checksum: 47e9f19fdfb3655ceb51cfee25242e87d45bb05618a1cca6ac2bc8a709e0cdf9
+  checksum: ff5147be5734e677fcb8bfbeaaa59e54d5b395f531ac371fb183494eaf954582
+- filename: .env.local
+  checksum: d3c7432f462f22fd75aaad2619858447819fd484214dabd4f1e421690d6d9b2e
 - filename: ci/docker-compose-local.yml
   checksum: c73beda98c39232441d86f6d6f6f2858274f9703f8a462eac1effacfbb9aa39d
 - filename: poetry.lock

app/db/db_init.py

@@ -33,12 +33,20 @@ async def init_db() -> None:
     # call to "run_sync" will not create anything.
     import app.db.models  # noqa
 
-    # These methods are copy/paste due to globals.
-    await create_write_engine()
-    await create_read_engine()
+    try:
+        # These methods are copy/paste due to globals.
+        await create_write_engine()
+        await create_read_engine()
+    except:
+        logger.exception('Uncaught exception during ENP database initialization')
+        raise
 
-    # notification_api database connections
-    await init_napi_metadata()
+    try:
+        # notification_api database connections
+        await init_napi_metadata()
+    except:
+        logger.exception('Uncaught exception during NAPI database metadata initialization')
+        raise
 
     logger.info('...database engines initialized.')
 

app/main.py

@@ -88,8 +88,8 @@ def create_app() -> CustomFastAPI:
     app.include_router(v2_legacy_notification_router)
     app.include_router(v2_notification_router)
 
-    # Static site for MkDocs. If unavailable locally, run `mkdocs build` to create the site files
-    # Or run the application locally with Docker.
+    # Static site for MkDocs. If unavailable locally, run `mkdocs build` to create the site files,
+    # or run the application locally with Docker.
     if os.path.exists(MKDOCS_DIRECTORY):
         app.mount('/mkdocs', StaticFiles(directory=MKDOCS_DIRECTORY, html=True), name='mkdocs')
 

ci/.env.docker

@@ -1,4 +1,4 @@
-# this file is used by docker-compose-local.yml to set environment variables for the local development environment
+# This file is used by docker-compose-local.yml to set environment variables for the local development environment.
 AWS_ACCESS_KEY_ID=test
 AWS_REGION_NAME=us-east-1
 AWS_SECRET_ACCESS_KEY=test
@@ -8,5 +8,9 @@ ENP_ADMIN_SECRET_KEY=not-very-secret
 ENP_DB_NAME=va_enp_api
 ENP_DB_PORT=5432
 ENV=local
-NAPI_DB_READ_URI=postgresql://postgres:[email protected]:5432/notification_api
-NAPI_DB_WRITE_URI=postgresql://postgres:[email protected]:5432/notification_api
+
+# These values assume the a notification-api database container is running with the name "ci-db-1".
+# The running containers should be part of the Docker "ci_default" network, and the container
+# name should resolve to an IP address.
+NAPI_DB_READ_URI=postgresql://postgres:LocalPassword@ci-db-1:5432/notification_api
+NAPI_DB_WRITE_URI=postgresql://postgres:LocalPassword@ci-db-1:5432/notification_api

run_app_local.py

@@ -1,4 +1,4 @@
-"""File for running the app locally with uvicorn. Simply run this file in debug mode to debug the app locally."""
+"""File for running the app locally with uvicorn. Run this file in debug mode to debug the app locally."""
 
 import uvicorn
 from dotenv import load_dotenv