toil 7.0.0__py3-none-any.whl → 8.0.0__py3-none-any.whl

toil/lib/aws/utils.py

@@ -15,35 +15,30 @@ import errno
 import logging
 import os
 import socket
-from typing import (Any,
-                    Callable,
-                    ContextManager,
-                    Dict,
-                    Iterable,
-                    Iterator,
-                    List,
-                    Optional,
-                    Set,
-                    cast)
+from collections.abc import Iterable, Iterator
+from typing import TYPE_CHECKING, Any, Callable, ContextManager, Optional, cast
 from urllib.parse import ParseResult
 
-from mypy_boto3_sdb.type_defs import AttributeTypeDef
-from toil.lib.aws import session, AWSRegionName, AWSServerErrors
+from toil.lib.aws import AWSRegionName, AWSServerErrors, session
+from toil.lib.conversions import strtobool
 from toil.lib.misc import printq
-from toil.lib.retry import (DEFAULT_DELAYS,
-                            DEFAULT_TIMEOUT,
-                            get_error_code,
-                            get_error_status,
-                            old_retry,
-                            retry, ErrorCondition)
+from toil.lib.retry import (
+    DEFAULT_DELAYS,
+    DEFAULT_TIMEOUT,
+    get_error_code,
+    get_error_status,
+    old_retry,
+    retry,
+)
+
+if TYPE_CHECKING:
+    from mypy_boto3_s3 import S3ServiceResource
+    from mypy_boto3_s3.service_resource import Bucket
+    from mypy_boto3_s3.service_resource import Object as S3Object
+    from mypy_boto3_sdb.type_defs import AttributeTypeDef
 
 try:
     from botocore.exceptions import ClientError, EndpointConnectionError
-    from mypy_boto3_iam import IAMClient, IAMServiceResource
-    from mypy_boto3_s3 import S3Client, S3ServiceResource
-    from mypy_boto3_s3.literals import BucketLocationConstraintType
-    from mypy_boto3_s3.service_resource import Bucket, Object
-    from mypy_boto3_sdb import SimpleDBClient
 except ImportError:
     ClientError = None  # type: ignore
     EndpointConnectionError = None  # type: ignore
@@ -54,63 +49,22 @@ logger = logging.getLogger(__name__)
 # These are error codes we expect from AWS if we are making requests too fast.
 # https://github.com/boto/botocore/blob/49f87350d54f55b687969ec8bf204df785975077/botocore/retries/standard.py#L316
 THROTTLED_ERROR_CODES = [
-        'Throttling',
-        'ThrottlingException',
-        'ThrottledException',
-        'RequestThrottledException',
-        'TooManyRequestsException',
-        'ProvisionedThroughputExceededException',
-        'TransactionInProgressException',
-        'RequestLimitExceeded',
-        'BandwidthLimitExceeded',
-        'LimitExceededException',
-        'RequestThrottled',
-        'SlowDown',
-        'PriorRequestNotComplete',
-        'EC2ThrottledException',
+    "Throttling",
+    "ThrottlingException",
+    "ThrottledException",
+    "RequestThrottledException",
+    "TooManyRequestsException",
+    "ProvisionedThroughputExceededException",
+    "TransactionInProgressException",
+    "RequestLimitExceeded",
+    "BandwidthLimitExceeded",
+    "LimitExceededException",
+    "RequestThrottled",
+    "SlowDown",
+    "PriorRequestNotComplete",
+    "EC2ThrottledException",
 ]
 
-@retry(errors=[AWSServerErrors])
-def delete_iam_role(
-    role_name: str, region: Optional[str] = None, quiet: bool = True
-) -> None:
-    # TODO: the Boto3 type hints are a bit oversealous here; they want hundreds
-    # of overloads of the client-getting methods to exist based on the literal
-    # string passed in, to return exactly the right kind of client or resource.
-    # So we end up having to wrap all the calls in casts, which kind of defeats
-    # the point of a nice fluent method you can call with the name of the thing
-    # you want; we should have been calling iam_client() and so on all along if
-    # we wanted MyPy to be able to understand us. So at some point we should
-    # consider revising our API here to be less annoying to explain to the type
-    # checker.
-    iam_client = session.client('iam', region_name=region)
-    iam_resource = session.resource('iam', region_name=region)
-    role = iam_resource.Role(role_name)
-    # normal policies
-    for attached_policy in role.attached_policies.all():
-        printq(f'Now dissociating policy: {attached_policy.policy_name} from role {role.name}', quiet)
-        role.detach_policy(PolicyArn=attached_policy.arn)
-    # inline policies
-    for inline_policy in role.policies.all():
-        printq(f'Deleting inline policy: {inline_policy.policy_name} from role {role.name}', quiet)
-        iam_client.delete_role_policy(RoleName=role.name, PolicyName=inline_policy.policy_name)
-    iam_client.delete_role(RoleName=role_name)
-    printq(f'Role {role_name} successfully deleted.', quiet)
-
-
-@retry(errors=[AWSServerErrors])
-def delete_iam_instance_profile(
-    instance_profile_name: str, region: Optional[str] = None, quiet: bool = True
-) -> None:
-    iam_resource = session.resource("iam", region_name=region)
-    instance_profile = iam_resource.InstanceProfile(instance_profile_name)
-    if instance_profile.roles is not None:
-        for role in instance_profile.roles:
-            printq(f'Now dissociating role: {role.name} from instance profile {instance_profile_name}', quiet)
-            instance_profile.remove_role(RoleName=role.name)
-    instance_profile.delete()
-    printq(f'Instance profile "{instance_profile_name}" successfully deleted.', quiet)
-
 
 @retry(errors=[AWSServerErrors])
 def delete_sdb_domain(
@@ -130,12 +84,12 @@ def connection_reset(e: Exception) -> bool:
     # errno is listed as 104. To be safe, we check for both:
     return isinstance(e, socket.error) and e.errno in (errno.ECONNRESET, 104)
 
+
 def connection_error(e: Exception) -> bool:
     """
     Return True if an error represents a failure to make a network connection.
     """
-    return (connection_reset(e)
-            or isinstance(e, EndpointConnectionError))
+    return connection_reset(e) or isinstance(e, EndpointConnectionError)
 
 
 # TODO: Replace with: @retry and ErrorCondition
@@ -143,34 +97,47 @@ def retryable_s3_errors(e: Exception) -> bool:
     """
     Return true if this is an error from S3 that looks like we ought to retry our request.
     """
-    return (connection_error(e)
-            or (isinstance(e, ClientError) and get_error_status(e) in (429, 500))
-            or (isinstance(e, ClientError) and get_error_code(e) in THROTTLED_ERROR_CODES)
-            # boto3 errors
-            or (isinstance(e, ClientError) and get_error_code(e) in THROTTLED_ERROR_CODES)
-            or (isinstance(e, ClientError) and 'BucketNotEmpty' in str(e))
-            or (isinstance(e, ClientError) and e.response.get('ResponseMetadata', {}).get('HTTPStatusCode') == 409 and 'try again' in str(e))
-            or (isinstance(e, ClientError) and e.response.get('ResponseMetadata', {}).get('HTTPStatusCode') in (404, 429, 500, 502, 503, 504)))
+    return (
+        connection_error(e)
+        or (isinstance(e, ClientError) and get_error_status(e) in (429, 500))
+        or (isinstance(e, ClientError) and get_error_code(e) in THROTTLED_ERROR_CODES)
+        # boto3 errors
+        or (isinstance(e, ClientError) and get_error_code(e) in THROTTLED_ERROR_CODES)
+        or (isinstance(e, ClientError) and "BucketNotEmpty" in str(e))
+        or (
+            isinstance(e, ClientError)
+            and e.response.get("ResponseMetadata", {}).get("HTTPStatusCode") == 409
+            and "try again" in str(e)
+        )
+        or (
+            isinstance(e, ClientError)
+            and e.response.get("ResponseMetadata", {}).get("HTTPStatusCode")
+            in (404, 429, 500, 502, 503, 504)
+        )
+    )
 
 
-def retry_s3(delays: Iterable[float] = DEFAULT_DELAYS, timeout: float = DEFAULT_TIMEOUT, predicate: Callable[[Exception], bool] = retryable_s3_errors) -> Iterator[ContextManager[None]]:
+def retry_s3(
+    delays: Iterable[float] = DEFAULT_DELAYS,
+    timeout: float = DEFAULT_TIMEOUT,
+    predicate: Callable[[Exception], bool] = retryable_s3_errors,
+) -> Iterator[ContextManager[None]]:
     """
     Retry iterator of context managers specifically for S3 operations.
     """
     return old_retry(delays=delays, timeout=timeout, predicate=predicate)
 
+
 @retry(errors=[AWSServerErrors])
 def delete_s3_bucket(
-    s3_resource: "S3ServiceResource",
-    bucket: str,
-    quiet: bool = True
+    s3_resource: "S3ServiceResource", bucket: str, quiet: bool = True
 ) -> None:
     """
     Delete the given S3 bucket.
     """
-    printq(f'Deleting s3 bucket: {bucket}', quiet)
+    printq(f"Deleting s3 bucket: {bucket}", quiet)
 
-    paginator = s3_resource.meta.client.get_paginator('list_object_versions')
+    paginator = s3_resource.meta.client.get_paginator("list_object_versions")
     try:
         for response in paginator.paginate(Bucket=bucket):
             # Versions and delete markers can both go in here to be deleted.
@@ -178,15 +145,20 @@ def delete_s3_bucket(
             # defined for them in the stubs to express that. See
             # <https://github.com/vemel/mypy_boto3_builder/issues/123>. So we
             # have to do gymnastics to get them into the same list.
-            to_delete: List[Dict[str, Any]] = cast(List[Dict[str, Any]], response.get('Versions', [])) + \
-                                              cast(List[Dict[str, Any]], response.get('DeleteMarkers', []))
+            to_delete: list[dict[str, Any]] = cast(
+                list[dict[str, Any]], response.get("Versions", [])
+            ) + cast(list[dict[str, Any]], response.get("DeleteMarkers", []))
             for entry in to_delete:
-                printq(f"    Deleting {entry['Key']} version {entry['VersionId']}", quiet)
-                s3_resource.meta.client.delete_object(Bucket=bucket, Key=entry['Key'], VersionId=entry['VersionId'])
+                printq(
+                    f"    Deleting {entry['Key']} version {entry['VersionId']}", quiet
+                )
+                s3_resource.meta.client.delete_object(
+                    Bucket=bucket, Key=entry["Key"], VersionId=entry["VersionId"]
+                )
         s3_resource.Bucket(bucket).delete()
-        printq(f'\n * Deleted s3 bucket successfully: {bucket}\n\n', quiet)
+        printq(f"\n * Deleted s3 bucket successfully: {bucket}\n\n", quiet)
     except s3_resource.meta.client.exceptions.NoSuchBucket:
-        printq(f'\n * S3 bucket no longer exists: {bucket}\n\n', quiet)
+        printq(f"\n * S3 bucket no longer exists: {bucket}\n\n", quiet)
 
 
 def create_s3_bucket(
@@ -202,7 +174,7 @@ def create_s3_bucket(
 
     *ALL* S3 bucket creation should use this function.
     """
-    logger.debug("Creating bucket '%s' in region %s.", bucket_name, region)
+    logger.info("Creating bucket '%s' in region %s.", bucket_name, region)
     if region == "us-east-1":  # see https://github.com/boto/boto3/issues/125
         bucket = s3_resource.create_bucket(Bucket=bucket_name)
     else:
@@ -212,6 +184,7 @@ def create_s3_bucket(
         )
     return bucket
 
+
 @retry(errors=[ClientError])
 def enable_public_objects(bucket_name: str) -> None:
     """
@@ -235,7 +208,7 @@ def enable_public_objects(bucket_name: str) -> None:
     would be a very awkward way to do it. So we restore the old behavior.
     """
 
-    s3_client = session.client('s3')
+    s3_client = session.client("s3")
 
     # Even though the new default is for public access to be prohibited, this
     # is implemented by adding new things attached to the bucket. If we remove
@@ -249,22 +222,36 @@ def enable_public_objects(bucket_name: str) -> None:
     s3_client.delete_bucket_ownership_controls(Bucket=bucket_name)
 
 
-def get_bucket_region(bucket_name: str, endpoint_url: Optional[str] = None, only_strategies: Optional[Set[int]] = None) -> str:
+class NoBucketLocationError(Exception):
+    """
+    Error to represent that we could not get a location for a bucket.
+    """
+
+
+def get_bucket_region(
+    bucket_name: str,
+    endpoint_url: Optional[str] = None,
+    only_strategies: Optional[set[int]] = None,
+) -> str:
     """
-    Get the AWS region name associated with the given S3 bucket.
+    Get the AWS region name associated with the given S3 bucket, or raise NoBucketLocationError.
+
+    Does not log at info level or above when this does not work; failures are expected in some contexts.
 
     Takes an optional S3 API URL override.
 
     :param only_strategies: For testing, use only strategies with 1-based numbers in this set.
     """
 
-    s3_client = session.client('s3', endpoint_url=endpoint_url)
+    s3_client = session.client("s3", endpoint_url=endpoint_url)
 
     def attempt_get_bucket_location() -> Optional[str]:
         """
         Try and get the bucket location from the normal API call.
         """
-        return s3_client.get_bucket_location(Bucket=bucket_name).get('LocationConstraint', None)
+        return s3_client.get_bucket_location(Bucket=bucket_name).get(
+            "LocationConstraint", None
+        )
 
     def attempt_get_bucket_location_from_us_east_1() -> Optional[str]:
         """
@@ -280,8 +267,10 @@ def get_bucket_region(bucket_name: str, endpoint_url: Optional[str] = None, only
         # It could also be because AWS open data buckets (which we tend to
         # encounter this problem for) tend to actually themselves be in
         # us-east-1.
-        backup_s3_client = session.client('s3', region_name='us-east-1')
-        return backup_s3_client.get_bucket_location(Bucket=bucket_name).get('LocationConstraint', None)
+        backup_s3_client = session.client("s3", region_name="us-east-1")
+        return backup_s3_client.get_bucket_location(Bucket=bucket_name).get(
+            "LocationConstraint", None
+        )
 
     def attempt_head_bucket() -> Optional[str]:
         """
@@ -293,11 +282,11 @@ def get_bucket_region(bucket_name: str, endpoint_url: Optional[str] = None, only
         # us where the bucket is. See
         # <https://github.com/aws/aws-sdk-cpp/issues/844#issuecomment-383747871>
         info = s3_client.head_bucket(Bucket=bucket_name)
-        return info['ResponseMetadata']['HTTPHeaders']['x-amz-bucket-region']
+        return info["ResponseMetadata"]["HTTPHeaders"]["x-amz-bucket-region"]
 
     # Compose a list of strategies we want to try in order, which may work.
     # None is an acceptable return type that actually means something.
-    strategies: List[Callable[[], Optional[str]]] = []
+    strategies: list[Callable[[], Optional[str]]] = []
     strategies.append(attempt_get_bucket_location)
     if not endpoint_url:
         # We should only try to talk to us-east-1 if we don't have a custom
@@ -305,17 +294,25 @@ def get_bucket_region(bucket_name: str, endpoint_url: Optional[str] = None, only
         strategies.append(attempt_get_bucket_location_from_us_east_1)
     strategies.append(attempt_head_bucket)
 
+    error_logs: list[tuple[int, str]] = []
     for attempt in retry_s3():
         with attempt:
             for i, strategy in enumerate(strategies):
-                if only_strategies is not None and i+1 not in only_strategies:
+                if only_strategies is not None and i + 1 not in only_strategies:
                     # We want to test running without this strategy.
                     continue
                 try:
-                    return bucket_location_to_region(strategy())
+                    location = bucket_location_to_region(strategy())
+                    logger.debug("Got bucket location from strategy %d", i + 1)
+                    return location
                 except ClientError as e:
-                    if get_error_code(e) == 'AccessDenied' and not endpoint_url:
-                        logger.warning('Strategy %d to get bucket location did not work: %s', i + 1, e)
+                    if get_error_code(e) == "AccessDenied" and not endpoint_url:
+                        logger.debug(
+                            "Strategy %d to get bucket location did not work: %s",
+                            i + 1,
+                            e,
+                        )
+                        error_logs.append((i + 1, str(e)))
                         last_error: Exception = e
                         # We were blocked with this strategy. Move on to the
                         # next strategy which might work.
@@ -324,127 +321,147 @@ def get_bucket_region(bucket_name: str, endpoint_url: Optional[str] = None, only
                         raise
                 except KeyError as e:
                     # If we get a weird head response we will have a KeyError
-                    logger.warning('Strategy %d to get bucket location did not work: %s', i + 1, e)
+                    logger.debug(
+                        "Strategy %d to get bucket location did not work: %s", i + 1, e
+                    )
+                    error_logs.append((i + 1, str(e)))
                     last_error = e
-    # If we get here we ran out of attempts. Raise whatever the last problem was.
-    raise last_error
+
+    error_messages = []
+    for rank, message in error_logs:
+        error_messages.append(
+            f"Strategy {rank} failed to get bucket location because: {message}"
+        )
+    # If we get here we ran out of attempts.
+    raise NoBucketLocationError(
+        "Could not get bucket location: " + "\n".join(error_messages)
+    ) from last_error
+
 
 def region_to_bucket_location(region: str) -> str:
-    return '' if region == 'us-east-1' else region
+    return "" if region == "us-east-1" else region
+
 
 def bucket_location_to_region(location: Optional[str]) -> str:
     return "us-east-1" if location == "" or location is None else location
 
-def get_object_for_url(url: ParseResult, existing: Optional[bool] = None) -> "Object":
-        """
-        Extracts a key (object) from a given parsed s3:// URL.
 
-        If existing is true and the object does not exist, raises FileNotFoundError.
+def get_object_for_url(url: ParseResult, existing: Optional[bool] = None) -> "S3Object":
+    """
+    Extracts a key (object) from a given parsed s3:// URL.
 
-        :param bool existing: If True, key is expected to exist. If False, key is expected not to
-                exists and it will be created. If None, the key will be created if it doesn't exist.
-        """
+    If existing is true and the object does not exist, raises FileNotFoundError.
+
+    :param bool existing: If True, key is expected to exist. If False, key is expected not to
+            exists and it will be created. If None, the key will be created if it doesn't exist.
+    """
+
+    key_name = url.path[1:]
+    bucket_name = url.netloc
+
+    # Decide if we need to override Boto's built-in URL here.
+    endpoint_url: Optional[str] = None
+    host = os.environ.get("TOIL_S3_HOST", None)
+    port = os.environ.get("TOIL_S3_PORT", None)
+    protocol = "https"
+    if strtobool(os.environ.get("TOIL_S3_USE_SSL", 'True')) is False:
+        protocol = "http"
+    if host:
+        endpoint_url = f"{protocol}://{host}" + f":{port}" if port else ""
+
+    # TODO: OrdinaryCallingFormat equivalent in boto3?
+    # if botoargs:
+    #     botoargs['calling_format'] = boto.s3.connection.OrdinaryCallingFormat()
+
+    try:
+        # Get the bucket's region to avoid a redirect per request
+        region = get_bucket_region(bucket_name, endpoint_url=endpoint_url)
+        s3 = session.resource("s3", region_name=region, endpoint_url=endpoint_url)
+    except NoBucketLocationError as e:
+        # Probably don't have permission.
+        # TODO: check if it is that
+        logger.debug("Couldn't get bucket location: %s", e)
+        logger.debug("Fall back to not specifying location")
+        s3 = session.resource("s3", endpoint_url=endpoint_url)
+
+    obj = s3.Object(bucket_name, key_name)
+    objExists = True
+
+    try:
+        obj.load()
+    except ClientError as e:
+        if get_error_status(e) == 404:
+            objExists = False
+        else:
+            raise
+    if existing is True and not objExists:
+        raise FileNotFoundError(
+            f"Key '{key_name}' does not exist in bucket '{bucket_name}'."
+        )
+    elif existing is False and objExists:
+        raise RuntimeError(f"Key '{key_name}' exists in bucket '{bucket_name}'.")
 
-        key_name = url.path[1:]
-        bucket_name = url.netloc
-
-        # Decide if we need to override Boto's built-in URL here.
-        endpoint_url: Optional[str] = None
-        host = os.environ.get('TOIL_S3_HOST', None)
-        port = os.environ.get('TOIL_S3_PORT', None)
-        protocol = 'https'
-        if os.environ.get('TOIL_S3_USE_SSL', True) == 'False':
-            protocol = 'http'
-        if host:
-            endpoint_url = f'{protocol}://{host}' + f':{port}' if port else ''
-
-        # TODO: OrdinaryCallingFormat equivalent in boto3?
-        # if botoargs:
-        #     botoargs['calling_format'] = boto.s3.connection.OrdinaryCallingFormat()
-
-        try:
-            # Get the bucket's region to avoid a redirect per request
-            region = get_bucket_region(bucket_name, endpoint_url=endpoint_url)
-            s3 = session.resource('s3', region_name=region, endpoint_url=endpoint_url)
-        except ClientError:
-            # Probably don't have permission.
-            # TODO: check if it is that
-            s3 = session.resource('s3', endpoint_url=endpoint_url)
-
-        obj = s3.Object(bucket_name, key_name)
-        objExists = True
-
-        try:
-            obj.load()
-        except ClientError as e:
-            if get_error_status(e) == 404:
-                objExists = False
-            else:
-                raise
-        if existing is True and not objExists:
-            raise FileNotFoundError(f"Key '{key_name}' does not exist in bucket '{bucket_name}'.")
-        elif existing is False and objExists:
-            raise RuntimeError(f"Key '{key_name}' exists in bucket '{bucket_name}'.")
-
-        if not objExists:
-            obj.put()  # write an empty file
-        return obj
+    if not objExists:
+        obj.put()  # write an empty file
+    return obj
 
 
 @retry(errors=[AWSServerErrors])
-def list_objects_for_url(url: ParseResult) -> List[str]:
-        """
-        Extracts a key (object) from a given parsed s3:// URL. The URL will be
-        supplemented with a trailing slash if it is missing.
-        """
-        key_name = url.path[1:]
-        bucket_name = url.netloc
-
-        if key_name != '' and not key_name.endswith('/'):
-            # Make sure to put the trailing slash on the key, or else we'll see
-            # a prefix of just it.
-            key_name = key_name + '/'
-
-        # Decide if we need to override Boto's built-in URL here.
-        # TODO: Deduplicate with get_object_for_url, or push down into session module
-        endpoint_url: Optional[str] = None
-        host = os.environ.get('TOIL_S3_HOST', None)
-        port = os.environ.get('TOIL_S3_PORT', None)
-        protocol = 'https'
-        if os.environ.get('TOIL_S3_USE_SSL', True) == 'False':
-            protocol = 'http'
-        if host:
-            endpoint_url = f'{protocol}://{host}' + f':{port}' if port else ''
-
-        client = session.client('s3', endpoint_url=endpoint_url)
-
-        listing = []
-
-        paginator = client.get_paginator('list_objects_v2')
-        result = paginator.paginate(Bucket=bucket_name, Prefix=key_name, Delimiter='/')
-        for page in result:
-            if 'CommonPrefixes' in page:
-                for prefix_item in page['CommonPrefixes']:
-                    listing.append(prefix_item['Prefix'][len(key_name):])
-            if 'Contents' in page:
-                for content_item in page['Contents']:
-                    if content_item['Key'] == key_name:
-                        # Ignore folder name itself
-                        continue
-                    listing.append(content_item['Key'][len(key_name):])
+def list_objects_for_url(url: ParseResult) -> list[str]:
+    """
+    Extracts a key (object) from a given parsed s3:// URL. The URL will be
+    supplemented with a trailing slash if it is missing.
+    """
+    key_name = url.path[1:]
+    bucket_name = url.netloc
+
+    if key_name != "" and not key_name.endswith("/"):
+        # Make sure to put the trailing slash on the key, or else we'll see
+        # a prefix of just it.
+        key_name = key_name + "/"
+
+    # Decide if we need to override Boto's built-in URL here.
+    # TODO: Deduplicate with get_object_for_url, or push down into session module
+    endpoint_url: Optional[str] = None
+    host = os.environ.get("TOIL_S3_HOST", None)
+    port = os.environ.get("TOIL_S3_PORT", None)
+    protocol = "https"
+    if strtobool(os.environ.get("TOIL_S3_USE_SSL", 'True')) is False:
+        protocol = "http"
+    if host:
+        endpoint_url = f"{protocol}://{host}" + f":{port}" if port else ""
+
+    client = session.client("s3", endpoint_url=endpoint_url)
+
+    listing = []
+
+    paginator = client.get_paginator("list_objects_v2")
+    result = paginator.paginate(Bucket=bucket_name, Prefix=key_name, Delimiter="/")
+    for page in result:
+        if "CommonPrefixes" in page:
+            for prefix_item in page["CommonPrefixes"]:
+                listing.append(prefix_item["Prefix"][len(key_name) :])
+        if "Contents" in page:
+            for content_item in page["Contents"]:
+                if content_item["Key"] == key_name:
+                    # Ignore folder name itself
+                    continue
+                listing.append(content_item["Key"][len(key_name) :])
+
+    logger.debug("Found in %s items: %s", url, listing)
+    return listing
 
-        logger.debug('Found in %s items: %s', url, listing)
-        return listing
 
-def flatten_tags(tags: Dict[str, str]) -> List[Dict[str, str]]:
+def flatten_tags(tags: dict[str, str]) -> list[dict[str, str]]:
     """
     Convert tags from a key to value dict into a list of 'Key': xxx, 'Value': xxx dicts.
     """
-    return [{'Key': k, 'Value': v} for k, v in tags.items()]
+    return [{"Key": k, "Value": v} for k, v in tags.items()]
 
 
-def boto3_pager(requestor_callable: Callable[..., Any], result_attribute_name: str,
-                **kwargs: Any) -> Iterable[Any]:
+def boto3_pager(
+    requestor_callable: Callable[..., Any], result_attribute_name: str, **kwargs: Any
+) -> Iterable[Any]:
     """
     Yield all the results from calling the given Boto 3 method with the
     given keyword arguments, paging through the results using the Marker or
@@ -465,7 +482,7 @@ def boto3_pager(requestor_callable: Callable[..., Any], result_attribute_name: s
         yield from page.get(result_attribute_name, [])
 
 
-def get_item_from_attributes(attributes: List[AttributeTypeDef], name: str) -> Any:
+def get_item_from_attributes(attributes: list["AttributeTypeDef"], name: str) -> Any:
     """
     Given a list of attributes, find the attribute associated with the name and return its corresponding value.
 
@@ -475,8 +492,11 @@ def get_item_from_attributes(attributes: List[AttributeTypeDef], name: str) -> A
 
     If the attribute with the name does not exist, the function will return None.
 
-    :param attributes: list of attributes as List[AttributeTypeDef]
+    :param attributes: list of attributes
     :param name: name of the attribute
     :return: value of the attribute
     """
-    return next((attribute["Value"] for attribute in attributes if attribute["Name"] == name), None)
+    return next(
+        (attribute["Value"] for attribute in attributes if attribute["Name"] == name),
+        None,
+    )