Fixing failing tests after merge for pull request #162 from GuodongB/main

Author: ling_aws

.gitignore

@@ -17,7 +17,6 @@ __pycache__/
 .Python
 build/
 develop-eggs/
-dist/
 downloads/
 eggs/
 .eggs/
@@ -173,4 +172,9 @@ statements_to_be_avoided.txt
 
 core/*/logs/*
 tools/*/logs/*
-tools/*/tests/logs/*
+tools/*/tests/logs/*
+
+.python-version
+testDrive*/
+testDrive*
+/testDrive*/

common/util.py

@@ -13,7 +13,6 @@
     r"(.+)\.(.+)\.(.+).redshift-serverless(-dev)?\.amazonaws\.com:[0-9]{4,5}\/(.)+"
 )
 
-
 def db_connect(
     interface="psql",
     host=None,
@@ -126,7 +125,6 @@ def cluster_dict(endpoint, is_serverless=False, start_time=None, end_time=None):
 
     return cluster
 
-
 def bucket_dict(bucket_url):
     bucket, path = None, None
     try:
@@ -146,7 +144,6 @@ def bucket_dict(bucket_url):
         path = ""
     return {"url": bucket_url, "bucket_name": bucket, "prefix": path}
 
-
 def matches_filters(obj, filters):
     """Check if the object matches the filters.  The object just needs to
     provide a supported_filters() function.  This also assumes filters has already
@@ -171,23 +168,26 @@ def matches_filters(obj, filters):
     else:
         return False
 
-
 def get_connection_key(database_name, username, pid):
     return f"{database_name}_{username}_{pid}"
 
-
 def is_serverless(config):
-    if ".com.cn" in config["target_cluster_endpoint"] and len(config["target_cluster_endpoint"].split(".")) == 7:
-        serverless_cluster_endpoint_pattern = (r"(.+)\.(.+)\.(.+).redshift-serverless(-dev)?\.amazonaws\.com\.cn:[0-9]{4,5}\/(.)+")
-    return bool(
-        re.fullmatch(serverless_cluster_endpoint_pattern, config["target_cluster_endpoint"])
-    )
-
+    endpoint = config["target_cluster_endpoint"]
+    
+    # Determine the domain suffix based on region
+    if ".com.cn" in endpoint and len(endpoint.split(".")) == 7:
+        domain_suffix = "amazonaws.com.cn"
+    else:
+        domain_suffix = "amazonaws.com"
+    
+    # Build the pattern dynamically
+    pattern = rf"(.+)\.(.+)\.(.+).redshift-serverless(-dev)?\.{domain_suffix}:[0-9]{{4,5}}\/(.)+"
+    
+    return bool(re.fullmatch(pattern, endpoint))
 
 def current_offset_ms(ref_time):
     return (datetime.datetime.now(tz=datetime.timezone.utc) - ref_time).total_seconds() * 1000.0
 
-
 # exception thrown if credentials can't be retrieved
 class CredentialsException(Exception):
     pass