toil 9.1.1__py3-none-any.whl → 9.2.0__py3-none-any.whl

toil/lib/aws/ami.py

@@ -14,10 +14,13 @@ from toil.lib.retry import retry
 
 logger = logging.getLogger(__name__)
 
+
 class ReleaseFeedUnavailableError(RuntimeError):
     """Raised when a Flatcar releases can't be located."""
+
     pass
 
+
 @retry(errors=[ReleaseFeedUnavailableError])
 def get_flatcar_ami(ec2_client: BaseClient, architecture: str = "amd64") -> str:
     """
@@ -92,14 +95,14 @@ def _fetch_flatcar_feed(architecture: str = "amd64", source: str = "stable") ->
         "stable": f"https://stable.release.flatcar-linux.net/{architecture}-usr/current/flatcar_production_ami_all.json",
         "beta": f"https://beta.release.flatcar-linux.net/{architecture}-usr/current/flatcar_production_ami_all.json",
         # "alpha": f"https://alpha.release.flatcar-linux.net/{architecture}-usr/current/flatcar_production_ami_all.json",
-        "archive": f"https://web.archive.org/web/20220625112618if_/https://stable.release.flatcar-linux.net/{architecture}-usr/current/flatcar_production_ami_all.json"
+        "archive": f"https://web.archive.org/web/20220625112618if_/https://stable.release.flatcar-linux.net/{architecture}-usr/current/flatcar_production_ami_all.json",
     }[source]
     return cast(bytes, urllib.request.urlopen(JSON_FEED_URL).read())
 
 
 def flatcar_release_feed_ami(
     region: str, architecture: str = "amd64", source: str = "stable"
-) -> Optional[str]:
+) -> str | None:
     """
     Yield AMI IDs for the given architecture from the Flatcar release feed.
 
@@ -150,12 +153,14 @@ def flatcar_release_feed_ami(
         if ami_record.get("name") == region:
             return str(ami_record.get("hvm")) if ami_record.get("hvm") else None
     # We didn't find our region
-    logger.warning(f"Flatcar {source} release feed does not have an image for region {region}")
+    logger.warning(
+        f"Flatcar {source} release feed does not have an image for region {region}"
+    )
 
 
 def feed_flatcar_ami_release(
     ec2_client: BaseClient, architecture: str = "amd64", source: str = "stable"
-) -> Optional[str]:
+) -> str | None:
     """
     Check a Flatcar release feed for the latest flatcar AMI.
 
@@ -175,27 +180,36 @@ def feed_flatcar_ami_release(
 
     region = ec2_client._client_config.region_name  # type: ignore
 
-    ami = flatcar_release_feed_ami(region, architecture, source)
-    # verify it exists on AWS
-    try:
-        response = ec2_client.describe_images(Filters=[{"Name": "image-id", "Values": [ami]}])  # type: ignore
-        if (len(response["Images"]) == 1 and response["Images"][0]["State"] == "available"):
+    if ami := flatcar_release_feed_ami(region, architecture, source):
+        # verify it exists on AWS
+        try:
+            response = ec2_client.describe_images(Filters=[{"Name": "image-id", "Values": [ami]}])  # type: ignore
+            if (
+                len(response["Images"]) == 1
+                and response["Images"][0]["State"] == "available"
+            ):
+                return ami
+            else:
+                logger.warning(
+                    f"Flatcar release feed suggests image {ami} which does not exist on AWS in {region}"
+                )
+        except (ClientError, EndpointConnectionError):
+            # Sometimes we get back nonsense like:
+            # botocore.exceptions.ClientError: An error occurred (AuthFailure) when calling the DescribeImages operation: AWS was not able to validate the provided access credentials
+            # Don't hold that against the AMI.
+            logger.exception(
+                f"Unable to check if AMI {ami} exists on AWS in {region}; assuming it does"
+            )
             return ami
-        else:
-            logger.warning(f"Flatcar release feed suggests image {ami} which does not exist on AWS in {region}")
-    except (ClientError, EndpointConnectionError):
-        # Sometimes we get back nonsense like:
-        # botocore.exceptions.ClientError: An error occurred (AuthFailure) when calling the DescribeImages operation: AWS was not able to validate the provided access credentials
-        # Don't hold that against the AMI.
-        logger.exception(f"Unable to check if AMI {ami} exists on AWS in {region}; assuming it does")
-        return ami
     # We didn't find it
-    logger.warning(f"Flatcar release feed does not have an image for region {region} that exists on AWS")
+    logger.warning(
+        f"Flatcar release feed does not have an image for region {region} that exists on AWS"
+    )
 
 
 def aws_marketplace_flatcar_ami_search(
     ec2_client: BaseClient, architecture: str = "amd64"
-) -> Optional[str]:
+) -> str | None:
     """
     Query AWS for all AMI names matching ``Flatcar-stable-*`` and return the most recent one.
 

toil/lib/aws/iam.py

@@ -3,7 +3,7 @@ import json
 import logging
 from collections import defaultdict
 from functools import lru_cache
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any, Union
 
 import boto3
 from botocore.exceptions import ClientError
@@ -64,7 +64,7 @@ AllowedActionCollection = dict[str, dict[str, list[str]]]
 
 @retry(errors=[AWSServerErrors])
 def delete_iam_instance_profile(
-    instance_profile_name: str, region: Optional[str] = None, quiet: bool = True
+    instance_profile_name: str, region: str | None = None, quiet: bool = True
 ) -> None:
     iam_resource = session.resource("iam", region_name=region)
     instance_profile = iam_resource.InstanceProfile(instance_profile_name)
@@ -81,7 +81,7 @@ def delete_iam_instance_profile(
 
 @retry(errors=[AWSServerErrors])
 def delete_iam_role(
-    role_name: str, region: Optional[str] = None, quiet: bool = True
+    role_name: str, region: str | None = None, quiet: bool = True
 ) -> None:
     """
     Deletes an AWS IAM role. Any separate policies are detached from the role, and any inline policies are deleted.
@@ -119,7 +119,7 @@ def create_iam_role(
     role_name: str,
     assume_role_policy_document: str,
     policies: dict[str, Any],
-    region: Optional[str] = None,
+    region: str | None = None,
 ) -> str:
     """
     Creates an AWS IAM role. Any separate policies are detached from the role, and any inline policies are deleted.
@@ -336,7 +336,7 @@ def allowed_actions_roles(
 
 
 def collect_policy_actions(
-    policy_documents: list[Union[str, "PolicyDocumentDictTypeDef"]]
+    policy_documents: list[Union[str, "PolicyDocumentDictTypeDef"]],
 ) -> AllowedActionCollection:
     """
     Collect all of the actions allowed by the given policy documents into one AllowedActionCollection.
@@ -478,7 +478,7 @@ def get_policy_permissions(region: str) -> AllowedActionCollection:
 
 
 @lru_cache
-def get_aws_account_num() -> Optional[str]:
+def get_aws_account_num() -> str | None:
     """
     Returns AWS account num
     """