wip: config refactor

.env.example

@@ -10,9 +10,9 @@ WEB_SERVER=web_server
 MONGODB_HOST=mongodb
 MONGODB_PORT=27017
 MONGODB_USER=farmer
-MONGODB_PASS=tractor
-MONGO_DB=greenhouse
-MONGO_COLLECTION=greens
-MONGO_TEST_DB=farmland
+MONGODB_PASSWORD=tractor
+MONGODB_DATABASE=greenhouse
+MONGODB_COLLECTION=greens
+MONGODB_TEST=farmland
 MONGO_URL=mongodb://farmer:tractor@mongodb:27017/?retryWrites=true&w=majority
 

.github/workflows/build-and-test.yml

@@ -26,10 +26,10 @@ jobs:
       MONGODB_HOST: mongodb
       MONGODB_PORT: 27017
       MONGODB_USER: farmer
-      MONGODB_PASS: tractor
-      MONGO_DB: greenhouse
-      MONGO_COLLECTION: greens
-      MONGO_TEST_DB: farmland
+      MONGODB_PASSWORD: tractor
+      MONGODB_DATABASE: greenhouse
+      MONGODB_COLLECTION: greens
+      MONGODB_TEST: farmland
       MONGO_URL: mongodb://farmer:[email protected]:27017/?retryWrites=true&w=majority
 
     services:

docker-compose.yml

@@ -25,8 +25,8 @@ services:
     ports:
       - "27017:27017"
     environment:
-      - "MONGO_INITDB_DATABASE=${MONGO_DB}"
+      - "MONGO_INITDB_DATABASE=${MONGODB_DATABASE}"
       - "MONGO_INITDB_ROOT_USERNAME=${MONGODB_USER}"
-      - "MONGO_INITDB_ROOT_PASSWORD=${MONGODB_PASS}"
+      - "MONGO_INITDB_ROOT_PASSWORD=${MONGODB_PASSWORD}"
     command:
       mongod --quiet --logpath /dev/null

greens/config.py

@@ -28,9 +28,9 @@ class Settings(BaseSettings):
     web_server: str = os.getenv("WEB_SERVER", "web_server")
 
     db_url: str = os.getenv("MONGO_URL", "")
-    db_name: str = os.getenv("MONGO_DB", "")
-    collection: str = os.getenv("MONGO_COLLECTION", "")
-    test_db_name: str = os.getenv("MONGO_TEST_DB", "")
+    mongodb_database: str = os.getenv("MONGODB_DATABASE", "")
+    collection: str = os.getenv("MONGODB_COLLECTION", "")
+    mongodb_test: str = os.getenv("MONGODB_TEST", "")
 
     MONGODB_HOST: str
     MONGODB_PORT: int
@@ -48,7 +48,7 @@ def mongodb_url(self) -> MongoDsn:
             username=self.MONGODB_USER,
             password=self.MONGODB_PASSWORD,
 
-            path=self.db_name,
+            path=self.mongodb_name, # TODO: url query params goes here
         )
 
 settings = Settings()

greens/main.py

@@ -16,7 +16,7 @@ async def lifespan(app: FastAPI):
     app.state.logger = get_logger(__name__)
     app.state.logger.info("Starting greens on your farmland...mmm")
     app.state.mongo_client, app.state.mongo_db, app.state.mongo_collection = await init_mongo(
-        global_settings.db_name, global_settings.db_url, global_settings.collection
+        global_settings.mongodb_database, global_settings.db_url, global_settings.collection
     )
     try:
         yield

tests/conftest.py

@@ -25,6 +25,6 @@ async def client() -> AsyncGenerator:
     ) as client:
         app.state.logger = get_logger(__name__)
         app.state.mongo_client, app.state.mongo_db, app.state.mongo_collection = await init_mongo(
-            global_settings.test_db_name, global_settings.db_url, global_settings.collection
+            global_settings.mongodb_test, global_settings.db_url, global_settings.collection
         )
         yield client