Fix tests to replicate signature error

Author: ch-yogya

tests/functional/attempt_replicate_signature_errors_using_session.py

@@ -7,11 +7,8 @@
 import time
 import threading
 import boto3
-<<<<<<< HEAD
-=======
 import os
 import urllib.request
->>>>>>> ca15ae9 (Add test to reproduce connection errors)
 from datetime import datetime
 from cassandra.cluster import Cluster
 from cassandra_sigv4.auth import SigV4AuthProvider
@@ -43,9 +40,6 @@ def create_short_lived_session(role_arn, region, role_session_duration=900):
         region_name=region
     )
 
-<<<<<<< HEAD
-def worker_thread(thread_id, session, endpoint, role_session_duration, results):
-=======
 def download_starfield_certificate():
     """Download the Starfield certificate at runtime."""
     cert_url = "https://certs.secureserver.net/repository/sf-class2-root.crt"
@@ -59,7 +53,6 @@ def download_starfield_certificate():
     return cert_file
 
 def worker_thread(thread_id, session, endpoint, role_session_duration, results, cert_file):
->>>>>>> ca15ae9 (Add test to reproduce connection errors)
     """Worker thread that connects and queries Keyspaces."""
     print(f"[{datetime.now()}] Thread {thread_id}: Starting")
 
@@ -69,11 +62,7 @@ def worker_thread(thread_id, session, endpoint, role_session_duration, results,
 
         # Create SSL context
         ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
-<<<<<<< HEAD
-        ssl_context.load_verify_locations('sf-class2-root.crt')
-=======
         ssl_context.load_verify_locations(cert_file)
->>>>>>> ca15ae9 (Add test to reproduce connection errors)
         ssl_context.verify_mode = ssl.CERT_REQUIRED
 
         # Create cluster
@@ -240,8 +229,6 @@ def run_multithreaded_test(region, endpoint, account_id, role_name, num_threads=
         return True
 
 if __name__ == "__main__":
-<<<<<<< HEAD
-=======
     # Create .gitignore if it doesn't exist to ensure cert files aren't committed
     gitignore_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), ".gitignore")
     if not os.path.exists(gitignore_path):
@@ -265,33 +252,5 @@ def run_multithreaded_test(region, endpoint, account_id, role_name, num_threads=
 
     args = parser.parse_args()
 
-    success = run_multithreaded_test(args.region, args.endpoint, args.account_id, args.role_name, args.threads, args.duration)
-    sys.exit(0 if success else 1)
-
-if __name__ == "__main__":
-    # Create .gitignore if it doesn't exist to ensure cert files aren't committed
-    gitignore_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), ".gitignore")
-    if not os.path.exists(gitignore_path):
-        with open(gitignore_path, "w") as f:
-            f.write("# Ignore certificate files\n*.crt\n*.crt.temp\n")
-    else:
-        # Ensure certificate patterns are in .gitignore
-        with open(gitignore_path, "r") as f:
-            content = f.read()
-        if "*.crt" not in content:
-            with open(gitignore_path, "a") as f:
-                f.write("\n# Ignore certificate files\n*.crt\n*.crt.temp\n")
-    
->>>>>>> ca15ae9 (Add test to reproduce connection errors)
-    parser = argparse.ArgumentParser(description="Multi-threaded test for SigV4 signature errors")
-    parser.add_argument("--region", required=True, help="AWS region")
-    parser.add_argument("--endpoint", required=True, help="Keyspaces endpoint")
-    parser.add_argument("--account-id", required=True, help="AWS account ID for the role")
-    parser.add_argument("--role-name", required=True, help="IAM role name to assume")
-    parser.add_argument("--threads", type=int, default=5, help="Number of threads")
-    parser.add_argument("--duration", type=int, default=10, help="Test duration in minutes")
-    
-    args = parser.parse_args()
-    
     success = run_multithreaded_test(args.region, args.endpoint, args.account_id, args.role_name, args.threads, args.duration)
     sys.exit(0 if success else 1)

tests/functional/run_replicate_signature_errors_test.sh

@@ -4,7 +4,7 @@
 # Check if required arguments are provided
 if [ "$#" -lt 4 ]; then
     echo "Usage: $0 <region> <endpoint> <account-id> <role-name> [threads] [duration_minutes]"
-    echo "Example: $0 us-east-1 cassandra.us-east-1.amazonaws.com 768726360020 KeyspacesIntegrationTestRole 10 15"
+    echo "Example: $0 us-east-1 cassandra.us-east-1.amazonaws.com <> KeyspacesIntegrationTestRole 10 15"
     exit 1
 fi
 
@@ -38,17 +38,13 @@ echo "Running multi-threaded test for signature errors..."
 echo "Threads: ${THREADS}"
 echo "Duration: ${DURATION} minutes"
 
-<<<<<<< HEAD
-python attempt_replicate_signature_errors.py --region "$REGION" --endpoint "$ENDPOINT" --account-id "$ACCOUNT_ID" --role-name "$ROLE_NAME" --threads "$THREADS" --duration "$DURATION"
-=======
 # Determine the correct path to the Python script
 SCRIPT_PATH="attempt_replicate_signature_errors_using_session.py"
 if [ ! -f "$SCRIPT_PATH" ] && [ -f "tests/functional/$SCRIPT_PATH" ]; then
     SCRIPT_PATH="tests/functional/$SCRIPT_PATH"
 fi
 
 python "$SCRIPT_PATH" --region "$REGION" --endpoint "$ENDPOINT" --account-id "$ACCOUNT_ID" --role-name "$ROLE_NAME" --threads "$THREADS" --duration "$DURATION"
->>>>>>> ca15ae9 (Add test to reproduce connection errors)
 
 # Check the exit code
 if [ $? -eq 0 ]; then