fix(connection): require cluster_identifier when IAM is enabled

Author: Brooke-white

redshift_connector/iam_helper.py

@@ -105,6 +105,10 @@ def set_iam_properties(
             "AWS credentials, or AWS profile"
         )
     elif info.iam is True:
+        if cluster_identifier is None:
+            raise InterfaceError(
+                "Invalid connection property setting. cluster_identifier must be provided when IAM is enabled"
+            )
         if not any((credentials_provider, access_key_id, secret_access_key, session_token, profile)):
             raise InterfaceError(
                 "Invalid connection property setting. Credentials provider, AWS credentials, or AWS profile must be"
@@ -153,16 +157,10 @@ def set_iam_properties(
                 "session_token is provided"
             )
 
-    if user is None:
-        raise InterfaceError("Invalid connection property setting. user must be specified")
-    if host is None:
-        raise InterfaceError("Invalid connection property setting. host must be specified")
-    if database is None:
-        raise InterfaceError("Invalid connection property setting. database must be specified")
-    if port is None:
-        raise InterfaceError("Invalid connection property setting. port must be specified")
-    if password is None:
-        raise InterfaceError("Invalid connection property setting. password must be specified")
+    if not all((user, host, database, port, password)):
+        raise InterfaceError(
+            "Invalid connection property setting. " "user, password, host, database, port, and password  are required."
+        )
 
     if client_protocol_version not in ClientProtocolVersion.list():
         raise InterfaceError(

test/unit/test_iam_helper.py

@@ -100,7 +100,7 @@ def test_set_iam_properties_fails_when_info_is_none(missing_param):
     keywords: typing.Dict = {missing_param: None}
     with pytest.raises(InterfaceError) as excinfo:
         set_iam_properties(**get_set_iam_properties_args(**keywords))
-    assert "Invalid connection property setting. {} must be specified".format(missing_param) in str(excinfo.value)
+    assert "Invalid connection property setting" in str(excinfo.value)
 
 
 ssl_mode_descriptions: typing.List[typing.Tuple[typing.Optional[str], str]] = [
@@ -291,6 +291,7 @@ def test_set_iam_properties_via_aws_credentials(mocker, test_input):
     info_obj: typing.Dict[str, typing.Any] = get_set_iam_properties_args(**test_input)
     info_obj["ssl"] = True
     info_obj["iam"] = True
+    info_obj["cluster_identifier"] = "blah"
 
     mocker.patch("redshift_connector.iam_helper.set_iam_credentials", return_value=None)
     set_iam_properties(**info_obj)