fix(auth, iam): log if boto3 version insufficient for cname

Author: Brooke-white

redshift_connector/iam_helper.py

@@ -114,7 +114,7 @@ def set_iam_properties(info: RedshiftProperty) -> RedshiftProperty:
 
         if info.iam and info.is_cname:
             if IdpAuthHelper.get_pkg_version("boto3") < Version("1.26.157"):
-                raise ModuleNotFoundError(
+                _logger.debug(
                     "boto3 >= 1.26.157 required for authentication with Amazon Redshift using custom domain name. "
                     "Please upgrade the installed version of boto3 to use this functionality."
                 )
@@ -440,7 +440,7 @@ def set_cluster_credentials(
                         typing.Dict[str, typing.Union[str, datetime.datetime]],
                         client.get_cluster_credentials_with_iam(**request_params),
                     )
-                except ClientError as e:
+                except Exception as e:
                     if info.is_cname:
                         _logger.debug(
                             "Failed to get_cluster_credentials_with_iam. Assuming cluster incorrectly classified as cname, retrying..."
@@ -484,7 +484,7 @@ def set_cluster_credentials(
                         typing.Dict[str, typing.Union[str, datetime.datetime]],
                         client.get_cluster_credentials(**request_params),
                     )
-                except ClientError as e:
+                except Exception as e:
                     if info.is_cname:
                         _logger.debug(
                             "Failed to get_cluster_credentials. Assuming cluster incorrectly classified as cname, retrying..."

test/manual/test_redshift_custom_domain.py

@@ -13,7 +13,7 @@
 """
 
 
-# @pytest.mark.skip(reason="manual")
+@pytest.mark.skip(reason="manual")
 @pytest.mark.parametrize("sslmode", (SupportedSSLMode.VERIFY_CA, SupportedSSLMode.VERIFY_FULL))
 def test_native_connect(provisioned_cname_db_kwargs, sslmode):
     # this test requires aws default profile contains valid credentials that provide permissions for
@@ -40,7 +40,7 @@ def test_native_connect(provisioned_cname_db_kwargs, sslmode):
         pass
 
 
-# @pytest.mark.skip(reason="manual")
+@pytest.mark.skip(reason="manual")
 @pytest.mark.parametrize("sslmode", (SupportedSSLMode.VERIFY_CA, SupportedSSLMode.VERIFY_FULL))
 def test_iam_connect(provisioned_cname_db_kwargs, sslmode):
     # this test requires aws default profile contains valid credentials that provide permissions for
@@ -62,7 +62,7 @@ def test_idp_connect(okta_idp, provisioned_cname_db_kwargs):
     pass
 
 
-# @pytest.mark.skip(reason="manual")
+@pytest.mark.skip(reason="manual")
 def test_nlb_connect():
     args = {
         "iam": True,

test/unit/test_iam_helper.py

@@ -810,7 +810,6 @@ def test_get_cluster_credentials_api_type_will_use_correct_api(conn_params, prov
     (
         ("1.17.110", {"iam": True, "ssl": True, "auth_profile": "SomeTestProfile", "cluster_identifier": "my_cluster"}),
         ("1.17.100", {"iam": True, "ssl": True, "auth_profile": "SomeTestProfile", "cluster_identifier": "my_cluster"}),
-        ("1.26.156", {"iam": True, "host": "mycustom.domain.name"}),
     ),
 )
 def test_set_iam_properties_raises_exception_when_insufficient_boto3_version(mocker, boto3_version, connection_args):