diff --git a/.gitignore b/.gitignore index bdee654..bd560ef 100644 --- a/.gitignore +++ b/.gitignore @@ -70,4 +70,6 @@ target/ mnt/ gen/ -swagger_server/requets_db/dbs/* \ No newline at end of file +swagger_server/requets_db/dbs/* + +.env \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 2001b5d..cbf51e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,5 @@ setuptools >= 21.0.0 swagger-ui-bundle >= 0.0.2 peewee==3.15.0 mariadb==1.0.11 -classla==1.1.0 \ No newline at end of file +classla==1.1.0 +python-decouple==3.6 \ No newline at end of file diff --git a/swagger_server/.env.template b/swagger_server/.env.template new file mode 100644 index 0000000..ce147b1 --- /dev/null +++ b/swagger_server/.env.template @@ -0,0 +1,5 @@ +MDB_DATABASE= +MDB_HOST= +MDB_PORT= +MDB_USER= +MDB_PASSWORD= \ No newline at end of file diff --git a/swagger_server/db_utils.py b/swagger_server/db_utils.py index b53203e..72c6ac5 100644 --- a/swagger_server/db_utils.py +++ b/swagger_server/db_utils.py @@ -1,24 +1,16 @@ import mariadb import sys +from decouple import config -# todo: DO NOT PUSH THIS TO GIT database_info = { - 'database': '...', - 'host': '...', - 'port': 0000, - 'user': '...', - 'password': '...' + 'database': config('MDB_DATABASE'), + 'host': config('MDB_HOST'), + 'port': config('MDB_PORT', cast=int), + 'user': config('MDB_USER'), + 'password': config('MDB_PASSWORD') } -# PUT THIS IN INSTEAD WHEN COMMITING, THIS IS ONLY TEMPORARY UNTIL AN .env FILE IS ADDED -database_info_tmp = { - 'database': '...', - 'host': '...', - 'port': 0000, - 'user': '...', - 'password': '...' -} # Connect to MariaDB Platform try: