From cb47a38e957fac83b2bf6aa82dba0f7bd0e6adfd Mon Sep 17 00:00:00 2001 From: Mathieu Cloutier Date: Mon, 14 Oct 2024 20:52:02 -0600 Subject: [PATCH] fixed typing for conditional expression --- moto/ec2/models/iam_instance_profile.py | 2 +- moto/ec2/responses/vpcs.py | 5 ++++- moto/packages/boto/ec2/instance.py | 6 +++--- moto/s3/models.py | 3 +++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/moto/ec2/models/iam_instance_profile.py b/moto/ec2/models/iam_instance_profile.py index 4ced625bfb19..199e98bc9ac7 100644 --- a/moto/ec2/models/iam_instance_profile.py +++ b/moto/ec2/models/iam_instance_profile.py @@ -62,7 +62,7 @@ def associate_iam_instance_profile( iam_instance_profile_association = IamInstanceProfileAssociation( self, iam_association_id, - self.get_instance(instance_id) if instance_id else None, # type: ignore[attr-defined] + self.get_instance(instance_id) if instance_id else None, # type: ignore[attr-defined, arg-type] instance_profile, ) # Regarding to AWS there can be only one association with ec2. diff --git a/moto/ec2/responses/vpcs.py b/moto/ec2/responses/vpcs.py index 19de3cc2bc4e..c5dc708e4220 100644 --- a/moto/ec2/responses/vpcs.py +++ b/moto/ec2/responses/vpcs.py @@ -1,6 +1,9 @@ +from typing import List + from moto.core.utils import camelcase_to_underscores from moto.ec2.utils import add_tag_specification +from ..models.managed_prefixes import ManagedPrefixList from ._base_response import EC2BaseResponse @@ -294,7 +297,7 @@ def get_managed_prefix_list_entries(self) -> str: managed_prefix_list = self.ec2_backend.get_managed_prefix_list_entries( prefix_list_id=prefix_list_id ) - entries = [] + entries: List[ManagedPrefixList] = [] if managed_prefix_list: entries = ( list(managed_prefix_list.entries.values())[-1] diff --git a/moto/packages/boto/ec2/instance.py b/moto/packages/boto/ec2/instance.py index 2ab190770f9c..9c4707d975cc 100644 --- a/moto/packages/boto/ec2/instance.py +++ b/moto/packages/boto/ec2/instance.py @@ -25,7 +25,7 @@ Represents an EC2 Instance """ -from typing import Any +from typing import Any, Optional from moto.packages.boto.ec2.ec2object import EC2Object, TaggedEC2Object from moto.packages.boto.ec2.image import ProductCodes @@ -159,8 +159,8 @@ def __init__(self, connection: Any = None): self.platform = None self.interfaces: Any = [] self.hypervisor = None - self.virtualization_type = None - self.architecture = None + self.virtualization_type: Optional[str] = None + self.architecture: Optional[str] = None self.instance_profile = None self._previous_state = None self._placement = InstancePlacement() diff --git a/moto/s3/models.py b/moto/s3/models.py index 5ae966e9dc24..79a33340f0bf 100644 --- a/moto/s3/models.py +++ b/moto/s3/models.py @@ -658,6 +658,9 @@ def get_canned_acl(acl: str) -> FakeAcl: class LifecycleFilter(BaseModel): + tag_key: Optional[str] + tag_value: Optional[str] + def __init__( self, prefix: Optional[str] = None,