From 5efad586509993f54d0e118e213e3ef0f465a6bf Mon Sep 17 00:00:00 2001 From: hay-kot Date: Thu, 29 Apr 2021 22:20:09 -0800 Subject: [PATCH] add db_username/password env variables --- mealie/core/config.py | 4 +++- template.env | 3 ++- tests/unit_tests/test_config.py | 9 +++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mealie/core/config.py b/mealie/core/config.py index 3c2826f79..6685e9634 100644 --- a/mealie/core/config.py +++ b/mealie/core/config.py @@ -104,7 +104,9 @@ class AppSettings(BaseSettings): return "/redoc" if self.API_DOCS else None SECRET: str = determine_secrets(DATA_DIR, PRODUCTION) - DB_URL: str = Field(default_factory=determine_sqlite_path, env="DB_URL") + DB_URL: str = Field(default_factory=determine_sqlite_path) + DB_USERNAME: str = 'mealie' + DB_PASSWORD: str = 'mealie' DEFAULT_GROUP: str = "Home" DEFAULT_EMAIL: str = "changeme@email.com" diff --git a/template.env b/template.env index 322f7cf8b..b0830ff38 100644 --- a/template.env +++ b/template.env @@ -16,7 +16,8 @@ API_DOCS=True # Sets the Database type to use. # DB_URL - +DB_USERNAME=mealie +DB_PASSWORD=mealie # Sets the token expiration time in hours. TOKEN_TIME=24 diff --git a/tests/unit_tests/test_config.py b/tests/unit_tests/test_config.py index a86abaae5..8dd0fd612 100644 --- a/tests/unit_tests/test_config.py +++ b/tests/unit_tests/test_config.py @@ -6,6 +6,9 @@ from mealie.core.config import CWD, DATA_DIR, AppDirectories, AppSettings, deter def test_default_settings(monkeypatch): monkeypatch.delenv("DEFAULT_GROUP", raising=False) monkeypatch.delenv("DEFAULT_PASSWORD", raising=False) + monkeypatch.delenv("DB_USERNAME", raising=False) + monkeypatch.delenv("DB_PASSWORD", raising=False) + monkeypatch.delenv("DEFAULT_PASSWORD", raising=False) monkeypatch.delenv("API_PORT", raising=False) monkeypatch.delenv("API_DOCS", raising=False) monkeypatch.delenv("IS_DEMO", raising=False) @@ -14,6 +17,8 @@ def test_default_settings(monkeypatch): assert app_settings.DEFAULT_GROUP == "Home" assert app_settings.DEFAULT_PASSWORD == "MyPassword" + assert app_settings.DB_USERNAME == "mealie" + assert app_settings.DB_PASSWORD == "mealie" assert app_settings.API_PORT == 9000 assert app_settings.API_DOCS is True assert app_settings.IS_DEMO is False @@ -25,6 +30,8 @@ def test_default_settings(monkeypatch): def test_non_default_settings(monkeypatch): monkeypatch.setenv("DEFAULT_GROUP", "Test Group") monkeypatch.setenv("DEFAULT_PASSWORD", "Test Password") + monkeypatch.setenv("DB_USERNAME", "mealie-test") + monkeypatch.setenv("DB_PASSWORD", "mealie-test") monkeypatch.setenv("API_PORT", "8000") monkeypatch.setenv("API_DOCS", "False") @@ -32,6 +39,8 @@ def test_non_default_settings(monkeypatch): assert app_settings.DEFAULT_GROUP == "Test Group" assert app_settings.DEFAULT_PASSWORD == "Test Password" + assert app_settings.DB_USERNAME == "mealie-test" + assert app_settings.DB_PASSWORD == "mealie-test" assert app_settings.API_PORT == 8000 assert app_settings.API_DOCS is False