Add ssl prefer to remaining redshift areas, increase timeout (maybe)

CHANGELOG.md

@@ -39,6 +39,7 @@ The types of changes are:
 - Fixed and optimized Database Icon SVGs used in Datamap [#4969](https://github.com/ethyca/fides/pull/4969)
 - Fixed "add" icons on some buttons being wrong size [#4975](https://github.com/ethyca/fides/pull/4975)
 - Masked "Keyfile credentials" input on integration config form [#4971](https://github.com/ethyca/fides/pull/4971)
+- Handles further ssl needs for Generating Datasets from Redshift [#4981](https://github.com/ethyca/fides/pull/4981)
 - Fixed ability to update consent preferences after they've previously been set [#4984](https://github.com/ethyca/fides/pull/4984)
 - Fixed validations for privacy declaration taxonomy labels when creating/updating a System [#4982](https://github.com/ethyca/fides/pull/4982)
 - Allow property-specific messaging to work with non-custom templates [#4986](https://github.com/ethyca/fides/pull/4986)

src/fides/core/utils.py

@@ -41,6 +41,7 @@
     )
     if "redshift" in connection_string:
         connect_args["sslmode"] = "prefer"
+        connect_args["connect_timeout"] = 60
     try:
         engine = sqlalchemy.create_engine(connection_string, connect_args=connect_args)
     except Exception as err:
@@ -58,8 +59,15 @@
     """
     Use SQLAlchemy to create a DB engine.
     """
+    # Pymssql doesn't support this arg
+    connect_args: Dict[str, Any] = (
+        {"connect_timeout": 10} if "pymssql" not in connection_string else {}
+    )
+    if "redshift" in connection_string:
+        connect_args["sslmode"] = "prefer"
+        connect_args["connect_timeout"] = 60
     try:
-        engine = sqlalchemy.create_engine(connection_string)
+        engine = sqlalchemy.create_engine(connection_string, connect_args=connect_args)
         with engine.begin() as connection:
             connection.execute("SELECT 1")
     except SQLAlchemyError as error: