fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! General improvements

docker-image-worker/s3_utils.py

@@ -1,37 +1,77 @@
 import boto3
 from botocore.exceptions import ClientError
 
+import os
+import logging
+
 def get_s3_client(use_role=False, role_name=None, aws_access_key_id=None, aws_secret_access_key=None, endpoint_url=None, region=None):
     """
     Create and return an S3 client based on the provided authentication method, endpoint, and region.
     """
+    logging.basicConfig(level=logging.INFO)
+    logger = logging.getLogger(__name__)
+
     client_kwargs = {}
     
+    # Log authentication method being attempted
+    logger.info("Attempting S3 client creation with:")
+    logger.info(f"- Region: {region if region else 'default'}")
+    logger.info(f"- Endpoint URL: {endpoint_url if endpoint_url else 'default'}")
+    
     if endpoint_url:
         client_kwargs['endpoint_url'] = endpoint_url
     elif region:
         client_kwargs['region_name'] = region
 
+    # Check for AWS Web Identity token
+    token_file = os.environ.get('AWS_WEB_IDENTITY_TOKEN_FILE')
+    role_arn = os.environ.get('AWS_ROLE_ARN')
+    if token_file or role_arn:
+        logger.info("AWS Web Identity configuration detected:")
+        logger.info(f"- Token file path: {token_file}")
+        logger.info(f"- Role ARN: {role_arn}")
+        logger.info(f"- Session name: {os.environ.get('AWS_ROLE_SESSION_NAME', 'default')}")
+
     if aws_access_key_id and aws_secret_access_key:
+        logger.info("Using explicit AWS credentials")
         # Use explicit credentials if provided
         client_kwargs['aws_access_key_id'] = aws_access_key_id
         client_kwargs['aws_secret_access_key'] = aws_secret_access_key
         return boto3.client('s3', **client_kwargs)
     elif use_role and role_name:
         # Assume specific role if requested
-        sts_client = boto3.client('sts')
-        assumed_role_object = sts_client.assume_role(
+        logger.info(f"Attempting to assume role: {role_name}")
+        try:
+            sts_client = boto3.client('sts')
+            # Get current identity for logging
+            identity = sts_client.get_caller_identity()
+            logger.info(f"Current identity: {identity['Arn']}")
+            
+            assumed_role_object = sts_client.assume_role(
             RoleArn=f"arn:aws:iam::{boto3.client('sts').get_caller_identity()['Account']}:role/{role_name}",
             RoleSessionName="AssumeRoleSession"
         )
-        credentials = assumed_role_object['Credentials']
-        client_kwargs['aws_access_key_id'] = credentials['AccessKeyId']
-        client_kwargs['aws_secret_access_key'] = credentials['SecretAccessKey']
-        client_kwargs['aws_session_token'] = credentials['SessionToken']
-        return boto3.client('s3', **client_kwargs)
+            credentials = assumed_role_object['Credentials']
+            client_kwargs['aws_access_key_id'] = credentials['AccessKeyId']
+            client_kwargs['aws_secret_access_key'] = credentials['SecretAccessKey']
+            client_kwargs['aws_session_token'] = credentials['SessionToken']
+            return boto3.client('s3', **client_kwargs)
+        except Exception as e:
+            logger.error(f"Failed to assume role {role_name}: {str(e)}")
+            raise
     else:
         # Use default credentials (environment, instance profile, or pod service account)
-        return boto3.client('s3', **client_kwargs)
+        logger.info("Using default credential provider chain")
+        try:
+            client = boto3.client('s3', **client_kwargs)
+            # Try to get caller identity to verify credentials
+            sts = boto3.client('sts')
+            identity = sts.get_caller_identity()
+            logger.info(f"Successfully authenticated as: {identity['Arn']}")
+            return client
+        except Exception as e:
+            logger.error(f"Failed to create S3 client: {str(e)}")
+            raise
 
 def parse_s3_path(s3_path):
     """