From 62e1121f4eb4f970bf27326fd736a6fcbe6dd3f1 Mon Sep 17 00:00:00 2001
From: Jakub Miazek <the@grillazz.com>
Date: Sun, 13 Nov 2022 16:55:59 +0100
Subject: [PATCH] setup poetry env vars for github ci

---
 .github/workflows/build-and-test.yml | 17 +++++++++--------
 app/config.py                        |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 05b5cf4..af73303 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -12,6 +12,15 @@ jobs:
         python-version: ["3.10"]
       fail-fast: false
 
+    env:
+      PYTHONDONTWRITEBYTECODE: 1
+      PYTHONUNBUFFERED: 1
+      SQL_DB: testdb
+      SQL_HOST: 127.0.0.1
+      SQL_USER: app-user
+      POSTGRES_PASSWORD: secret
+      PGPASSWORD: secret
+
     services:
       sqldb:
         image: postgres:14
@@ -47,11 +56,3 @@ jobs:
         run: poetry run pytest
       - name: Lint Code
         run: poetry run ruff .
-        env:
-          PYTHONDONTWRITEBYTECODE: 1
-          PYTHONUNBUFFERED: 1
-          SQL_DB: testdb
-          SQL_HOST: 127.0.0.1
-          SQL_USER: app-user
-          POSTGRES_PASSWORD: secret
-          PGPASSWORD: secret
\ No newline at end of file
diff --git a/app/config.py b/app/config.py
index d7050bd..df210f5 100644
--- a/app/config.py
+++ b/app/config.py
@@ -27,10 +27,10 @@ class Settings(BaseSettings):
 
     """
 
-    pg_user: str = os.getenv("SQL_USER", "app-user")
-    pg_pass: str = os.getenv("POSTGRES_PASSWORD", "secret")
+    pg_user: str = os.getenv("SQL_USER", "")
+    pg_pass: str = os.getenv("POSTGRES_PASSWORD", "")
     pg_host: str = os.getenv("SQL_HOST", "")
-    pg_database: str = os.getenv("SQL_DB", "testdb")
+    pg_database: str = os.getenv("SQL_DB", "")
     asyncpg_url: str = f"postgresql+asyncpg://{pg_user}:{pg_pass}@{pg_host}:5432/{pg_database}"
 
     jwt_secret_key: str = os.getenv("SECRET_KEY", "")