From da31cdcced30f22104adbd7d67a3ac3db99d3851 Mon Sep 17 00:00:00 2001
From: rswigginton <17180843+rswigginton@users.noreply.github.com>
Date: Thu, 18 Jan 2024 06:55:41 -0700
Subject: [PATCH] fix: change ssl_mode to sslmode (#408)

* fix: change ssl_mode to sslmode

* fix: remove comma causing sslkey=(None,) when MF_METADATA_DB_SSL_KEY_PATH not defined
---
 run_goose.py               | 2 +-
 services/utils/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/run_goose.py b/run_goose.py
index 5e594ae2..bb963c8d 100644
--- a/run_goose.py
+++ b/run_goose.py
@@ -61,7 +61,7 @@ def main():
     ssl_root_cert_path = os.environ.get("MF_METADATA_DB_SSL_ROOT_CERT")
 
     if ssl_mode in ['allow', 'prefer', 'require', 'verify-ca', 'verify-full']:
-        ssl_query = f'ssl_mode={ssl_mode}'
+        ssl_query = f'sslmode={ssl_mode}'
         if ssl_cert_path is not None:
             ssl_query = f'{ssl_query}&sslcert={ssl_cert_path}'
         if ssl_key_path is not None:
diff --git a/services/utils/__init__.py b/services/utils/__init__.py
index 782105f8..115896c0 100644
--- a/services/utils/__init__.py
+++ b/services/utils/__init__.py
@@ -228,7 +228,7 @@ def __init__(self,
         self._database_name = os.environ.get(prefix + "NAME", database_name)
         self._ssl_mode = os.environ.get(prefix + "SSL_MODE", ssl_mode)
         self._ssl_cert_path = os.environ.get(prefix + "SSL_CERT_PATH", ssl_cert_path)
-        self._ssl_key_path = os.environ.get(prefix + "SSL_KEY_PATH", ssl_key_path),
+        self._ssl_key_path = os.environ.get(prefix + "SSL_KEY_PATH", ssl_key_path)
         self._ssl_root_cert_path = os.environ.get(prefix + "SSL_ROOT_CERT_PATH", ssl_root_cert_path)
         conn_str_required_values = [
             self._host,