Upgraded modules, added commit id to build process, unified env variables

src/db.py

@@ -5,13 +5,13 @@ from contextlib import asynccontextmanager
 import aiomysql
 import pymysql.err
 
-from secret_manager import return_credentials
+from secret_manager import get_secret
 from simple_logger_handler import setup_logger
 
-db_username = return_credentials("/etc/secrets/db_username")
-db_password = return_credentials("/etc/secrets/db_password")
-db_host = os.getenv("BACKEND_PN_DB_HOST","localhost")
-db_database = os.getenv("BACKEND_PN_DB_DATABASE","app")
+db_username = get_secret(os.getenv("DB_USERNAME",""),"/etc/secrets/db_username")
+db_password = get_secret(os.getenv("DB_PASSWORD",""),"/etc/secrets/db_password")
+db_host = os.getenv("DB_HOST","localhost")
+db_database = os.getenv("DB_DATABASE","app")
 
 logger = setup_logger(__name__)
 

src/rabbitmq_handler.py

@@ -9,7 +9,7 @@ from aio_pika.exceptions import AMQPException
 import metrics
 from db import db_manager
 from device_token_repository import database_lookup_by_user_id, database_lookup_by_uuid, remove_inactive_push_token
-from secret_manager import cleanup_secret_files, return_credentials
+from secret_manager import cleanup_secret_files, get_secret
 from secret_manager.fernet_encryption import decrypt_token
 from send_notification import send_notification
 from simple_logger_handler import setup_logger
@@ -17,11 +17,11 @@ from simple_logger_handler import setup_logger
 logger = setup_logger(__name__)
 
 
-rmq_username = return_credentials("/etc/secrets/rmq_username")
-rmq_password = return_credentials("/etc/secrets/rmq_password")
-rmq_host = os.getenv("BACKEND_PN_RMQ_HOST", "localhost:30672")
-rmq_vhost = os.getenv("BACKEND_PN_RMQ_VHOST", "app_notifications")
-rmq_exchange = os.getenv("BACKEND_PN_RMQ_EXCHANGE", "app_notifications")
+rmq_username = get_secret(os.getenv("RMQ_USERNAME",""),"/etc/secrets/rmq_username")
+rmq_password = get_secret(os.getenv("RMQ_PASSWORD",""),"/etc/secrets/rmq_password")
+rmq_host = os.getenv("RMQ_HOST", "localhost:30672")
+rmq_vhost = os.getenv("RMQ_VHOST", "app_notifications")
+rmq_exchange = os.getenv("RMQ_EXCHANGE", "app_notifications")
 
 RABBITMQ_URL = f"amqp://{rmq_username}:{rmq_password}@{rmq_host}/{rmq_vhost}"
 
@@ -302,7 +302,8 @@ class RabbitMQConsumer:
 
 
 async def main():
-	logger.info("[APP] Starting application")
+	logger.info("[App] Starting application")
+	logger.info(f"[App] Build commit id={os.getenv("COMMIT_ID","unknown")}")
 	await db_manager.connect()
 	consumer = RabbitMQConsumer(db_manager=db_manager)
 	await consumer.connect()