Better security config reading

Author: stephen-riggs

src/murfey/cli/repost_failed_calls.py

@@ -1,6 +1,5 @@
 import argparse
 import json
-import os
 from datetime import datetime
 from functools import partial
 from pathlib import Path
@@ -10,6 +9,8 @@
 from jose import jwt
 from workflows.transport.pika_transport import PikaTransport
 
+from murfey.util.config import security_from_file
+
 
 def dlq_purge(
     dlq_dump_path: Path, queue: str, rabbitmq_credentials: Path
@@ -133,11 +134,8 @@ def run():
     )
     args = parser.parse_args()
 
-    # Set the environment variable then read it by importing the security config
-    os.environ["MURFEY_SECURITY_CONFIGURATION"] = args.config
-    from murfey.util.config import get_security_config
-
-    security_config = get_security_config()
+    # Read the security config file
+    security_config = security_from_file(args.config)
 
     # Get the token to post to the api with
     token = jwt.encode(

tests/conftest.py

@@ -1,5 +1,4 @@
 import json
-import os
 
 import pytest
 from sqlmodel import Session
@@ -35,4 +34,3 @@ def mock_security_configuration(tmp_path):
     }
     with open(config_file, "w") as f:
         json.dump(security_config, f)
-    os.environ["MURFEY_SECURITY_CONFIGURATION"] = str(config_file)