localstack-core 4.6.1.dev60__py3-none-any.whl → 4.10.1.dev12__py3-none-any.whl

localstack/services/dynamodbstreams/models.py

@@ -1,11 +1,9 @@
-from typing import Dict
-
 from localstack.services.stores import AccountRegionBundle, BaseStore, LocalAttribute
 
 
 class DynamoDbStreamsStore(BaseStore):
     # maps table names to DynamoDB stream descriptions
-    ddb_streams: Dict[str, dict] = LocalAttribute(default=dict)
+    ddb_streams: dict[str, dict] = LocalAttribute(default=dict)
 
 
 dynamodbstreams_stores = AccountRegionBundle("dynamodbstreams", DynamoDbStreamsStore)

localstack/services/ec2/patches.py

@@ -1,7 +1,7 @@
 import logging
-from typing import Optional
 
 from moto.ec2 import models as ec2_models
+from moto.ec2.models.vpcs import VPCEndPoint
 from moto.utilities.id_generator import Tags
 
 from localstack.services.ec2.exceptions import (
@@ -15,6 +15,8 @@ from localstack.utils.id_generator import (
     localstack_id,
 )
 from localstack.utils.patch import patch
+from localstack.utils.strings import short_uid
+from localstack.utils.urls import localstack_host
 
 LOG = logging.getLogger(__name__)
 
@@ -93,12 +95,31 @@ class SubnetIdentifier(ResourceIdentifier):
 
 
 def apply_patches():
+    @patch(ec2_models.vpcs.VPCBackend.create_vpc_endpoint)
+    def ec2_create_vpc_endpoint(
+        fn: ec2_models.VPCBackend.create_vpc_endpoint, self: ec2_models.VPCBackend, **kwargs
+    ) -> VPCEndPoint:
+        vpc_endpoint: VPCEndPoint = fn(self=self, **kwargs)
+
+        # moto returns the dns entries as `<vpc-id>.com.amazonaws.<region>.<service>`
+        # to keep the aws style `<vpc-id>.<service>.<region>.vpce.amazonaws.com` and ensure it can be routed
+        # by the individual services in LocalStack we will be creating the following entries:
+        # `<vpc-id>.<service>.<region>.vpce.<localstack host and port>`
+        if service_name := kwargs.get("service_name"):
+            ls_service_name = ".".join(service_name.split(".")[::-1]).replace(
+                "amazonaws.com", f"vpce.{localstack_host()}"
+            )
+            for dns_entry in vpc_endpoint.dns_entries or []:
+                dns_entry["dns_name"] = f"{vpc_endpoint.id}-{short_uid()}.{ls_service_name}"
+
+        return vpc_endpoint
+
     @patch(ec2_models.subnets.SubnetBackend.create_subnet)
     def ec2_create_subnet(
         fn: ec2_models.subnets.SubnetBackend.create_subnet,
         self: ec2_models.subnets.SubnetBackend,
         *args,
-        tags: Optional[dict[str, str]] = None,
+        tags: dict[str, str] | None = None,
         **kwargs,
     ):
         # Patch this method so that we can create a subnet with a specific "custom"
@@ -151,8 +172,8 @@ def apply_patches():
         self: ec2_models.security_groups.SecurityGroupBackend,
         name: str,
         *args,
-        vpc_id: Optional[str] = None,
-        tags: Optional[dict[str, str]] = None,
+        vpc_id: str | None = None,
+        tags: dict[str, str] | None = None,
         force: bool = False,
         **kwargs,
     ):
@@ -191,7 +212,7 @@ def apply_patches():
         self: ec2_models.vpcs.VPCBackend,
         cidr_block: str,
         *args,
-        tags: Optional[list[dict[str, str]]] = None,
+        tags: list[dict[str, str]] | None = None,
         is_default: bool = False,
         **kwargs,
     ):

localstack/services/ec2/provider.py

@@ -3,7 +3,7 @@ import json
 import logging
 import re
 from abc import ABC
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 from botocore.parsers import ResponseParserError
 from moto.core.utils import camelcase_to_underscores, underscores_to_camelcase
@@ -173,13 +173,13 @@ class Ec2Provider(Ec2Api, ABC, ServiceLifecycleHook):
                 ReservedInstances(
                     AvailabilityZone="eu-central-1a",
                     Duration=2628000,
-                    End=datetime(2016, 6, 30, tzinfo=timezone.utc),
+                    End=datetime(2016, 6, 30, tzinfo=UTC),
                     FixedPrice=0.0,
                     InstanceCount=2,
                     InstanceType=InstanceType.t2_small,
                     ProductDescription=RIProductDescription.Linux_UNIX,
                     ReservedInstancesId=long_uid(),
-                    Start=datetime(2016, 1, 1, tzinfo=timezone.utc),
+                    Start=datetime(2016, 1, 1, tzinfo=UTC),
                     State=ReservedInstanceState.active,
                     UsagePrice=0.05,
                     CurrencyCode=CurrencyCodeValues.USD,

localstack/services/ec2/resource_providers/aws_ec2_dhcpoptions.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -14,18 +14,18 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class EC2DHCPOptionsProperties(TypedDict):
-    DhcpOptionsId: Optional[str]
-    DomainName: Optional[str]
-    DomainNameServers: Optional[list[str]]
-    NetbiosNameServers: Optional[list[str]]
-    NetbiosNodeType: Optional[int]
-    NtpServers: Optional[list[str]]
-    Tags: Optional[list[Tag]]
+    DhcpOptionsId: str | None
+    DomainName: str | None
+    DomainNameServers: list[str] | None
+    NetbiosNameServers: list[str] | None
+    NetbiosNodeType: int | None
+    NtpServers: list[str] | None
+    Tags: list[Tag] | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/ec2/resource_providers/aws_ec2_dhcpoptions_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class EC2DHCPOptionsProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::EC2::DHCPOptions"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ec2.resource_providers.aws_ec2_dhcpoptions import (

localstack/services/ec2/resource_providers/aws_ec2_instance.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import base64
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -16,155 +16,155 @@ from localstack.utils.strings import to_str
 
 
 class EC2InstanceProperties(TypedDict):
-    AdditionalInfo: Optional[str]
-    Affinity: Optional[str]
-    AvailabilityZone: Optional[str]
-    BlockDeviceMappings: Optional[list[BlockDeviceMapping]]
-    CpuOptions: Optional[CpuOptions]
-    CreditSpecification: Optional[CreditSpecification]
-    DisableApiTermination: Optional[bool]
-    EbsOptimized: Optional[bool]
-    ElasticGpuSpecifications: Optional[list[ElasticGpuSpecification]]
-    ElasticInferenceAccelerators: Optional[list[ElasticInferenceAccelerator]]
-    EnclaveOptions: Optional[EnclaveOptions]
-    HibernationOptions: Optional[HibernationOptions]
-    HostId: Optional[str]
-    HostResourceGroupArn: Optional[str]
-    IamInstanceProfile: Optional[str]
-    Id: Optional[str]
-    ImageId: Optional[str]
-    InstanceInitiatedShutdownBehavior: Optional[str]
-    InstanceType: Optional[str]
-    Ipv6AddressCount: Optional[int]
-    Ipv6Addresses: Optional[list[InstanceIpv6Address]]
-    KernelId: Optional[str]
-    KeyName: Optional[str]
-    LaunchTemplate: Optional[LaunchTemplateSpecification]
-    LicenseSpecifications: Optional[list[LicenseSpecification]]
-    Monitoring: Optional[bool]
-    NetworkInterfaces: Optional[list[NetworkInterface]]
-    PlacementGroupName: Optional[str]
-    PrivateDnsName: Optional[str]
-    PrivateDnsNameOptions: Optional[PrivateDnsNameOptions]
-    PrivateIp: Optional[str]
-    PrivateIpAddress: Optional[str]
-    PropagateTagsToVolumeOnCreation: Optional[bool]
-    PublicDnsName: Optional[str]
-    PublicIp: Optional[str]
-    RamdiskId: Optional[str]
-    SecurityGroupIds: Optional[list[str]]
-    SecurityGroups: Optional[list[str]]
-    SourceDestCheck: Optional[bool]
-    SsmAssociations: Optional[list[SsmAssociation]]
-    SubnetId: Optional[str]
-    Tags: Optional[list[Tag]]
-    Tenancy: Optional[str]
-    UserData: Optional[str]
-    Volumes: Optional[list[Volume]]
+    AdditionalInfo: str | None
+    Affinity: str | None
+    AvailabilityZone: str | None
+    BlockDeviceMappings: list[BlockDeviceMapping] | None
+    CpuOptions: CpuOptions | None
+    CreditSpecification: CreditSpecification | None
+    DisableApiTermination: bool | None
+    EbsOptimized: bool | None
+    ElasticGpuSpecifications: list[ElasticGpuSpecification] | None
+    ElasticInferenceAccelerators: list[ElasticInferenceAccelerator] | None
+    EnclaveOptions: EnclaveOptions | None
+    HibernationOptions: HibernationOptions | None
+    HostId: str | None
+    HostResourceGroupArn: str | None
+    IamInstanceProfile: str | None
+    Id: str | None
+    ImageId: str | None
+    InstanceInitiatedShutdownBehavior: str | None
+    InstanceType: str | None
+    Ipv6AddressCount: int | None
+    Ipv6Addresses: list[InstanceIpv6Address] | None
+    KernelId: str | None
+    KeyName: str | None
+    LaunchTemplate: LaunchTemplateSpecification | None
+    LicenseSpecifications: list[LicenseSpecification] | None
+    Monitoring: bool | None
+    NetworkInterfaces: list[NetworkInterface] | None
+    PlacementGroupName: str | None
+    PrivateDnsName: str | None
+    PrivateDnsNameOptions: PrivateDnsNameOptions | None
+    PrivateIp: str | None
+    PrivateIpAddress: str | None
+    PropagateTagsToVolumeOnCreation: bool | None
+    PublicDnsName: str | None
+    PublicIp: str | None
+    RamdiskId: str | None
+    SecurityGroupIds: list[str] | None
+    SecurityGroups: list[str] | None
+    SourceDestCheck: bool | None
+    SsmAssociations: list[SsmAssociation] | None
+    SubnetId: str | None
+    Tags: list[Tag] | None
+    Tenancy: str | None
+    UserData: str | None
+    Volumes: list[Volume] | None
 
 
 class Ebs(TypedDict):
-    DeleteOnTermination: Optional[bool]
-    Encrypted: Optional[bool]
-    Iops: Optional[int]
-    KmsKeyId: Optional[str]
-    SnapshotId: Optional[str]
-    VolumeSize: Optional[int]
-    VolumeType: Optional[str]
+    DeleteOnTermination: bool | None
+    Encrypted: bool | None
+    Iops: int | None
+    KmsKeyId: str | None
+    SnapshotId: str | None
+    VolumeSize: int | None
+    VolumeType: str | None
 
 
 class BlockDeviceMapping(TypedDict):
-    DeviceName: Optional[str]
-    Ebs: Optional[Ebs]
-    NoDevice: Optional[dict]
-    VirtualName: Optional[str]
+    DeviceName: str | None
+    Ebs: Ebs | None
+    NoDevice: dict | None
+    VirtualName: str | None
 
 
 class InstanceIpv6Address(TypedDict):
-    Ipv6Address: Optional[str]
+    Ipv6Address: str | None
 
 
 class ElasticGpuSpecification(TypedDict):
-    Type: Optional[str]
+    Type: str | None
 
 
 class ElasticInferenceAccelerator(TypedDict):
-    Type: Optional[str]
-    Count: Optional[int]
+    Type: str | None
+    Count: int | None
 
 
 class Volume(TypedDict):
-    Device: Optional[str]
-    VolumeId: Optional[str]
+    Device: str | None
+    VolumeId: str | None
 
 
 class LaunchTemplateSpecification(TypedDict):
-    Version: Optional[str]
-    LaunchTemplateId: Optional[str]
-    LaunchTemplateName: Optional[str]
+    Version: str | None
+    LaunchTemplateId: str | None
+    LaunchTemplateName: str | None
 
 
 class EnclaveOptions(TypedDict):
-    Enabled: Optional[bool]
+    Enabled: bool | None
 
 
 class PrivateIpAddressSpecification(TypedDict):
-    Primary: Optional[bool]
-    PrivateIpAddress: Optional[str]
+    Primary: bool | None
+    PrivateIpAddress: str | None
 
 
 class NetworkInterface(TypedDict):
-    DeviceIndex: Optional[str]
-    AssociateCarrierIpAddress: Optional[bool]
-    AssociatePublicIpAddress: Optional[bool]
-    DeleteOnTermination: Optional[bool]
-    Description: Optional[str]
-    GroupSet: Optional[list[str]]
-    Ipv6AddressCount: Optional[int]
-    Ipv6Addresses: Optional[list[InstanceIpv6Address]]
-    NetworkInterfaceId: Optional[str]
-    PrivateIpAddress: Optional[str]
-    PrivateIpAddresses: Optional[list[PrivateIpAddressSpecification]]
-    SecondaryPrivateIpAddressCount: Optional[int]
-    SubnetId: Optional[str]
+    DeviceIndex: str | None
+    AssociateCarrierIpAddress: bool | None
+    AssociatePublicIpAddress: bool | None
+    DeleteOnTermination: bool | None
+    Description: str | None
+    GroupSet: list[str] | None
+    Ipv6AddressCount: int | None
+    Ipv6Addresses: list[InstanceIpv6Address] | None
+    NetworkInterfaceId: str | None
+    PrivateIpAddress: str | None
+    PrivateIpAddresses: list[PrivateIpAddressSpecification] | None
+    SecondaryPrivateIpAddressCount: int | None
+    SubnetId: str | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 class HibernationOptions(TypedDict):
-    Configured: Optional[bool]
+    Configured: bool | None
 
 
 class LicenseSpecification(TypedDict):
-    LicenseConfigurationArn: Optional[str]
+    LicenseConfigurationArn: str | None
 
 
 class CpuOptions(TypedDict):
-    CoreCount: Optional[int]
-    ThreadsPerCore: Optional[int]
+    CoreCount: int | None
+    ThreadsPerCore: int | None
 
 
 class PrivateDnsNameOptions(TypedDict):
-    EnableResourceNameDnsAAAARecord: Optional[bool]
-    EnableResourceNameDnsARecord: Optional[bool]
-    HostnameType: Optional[str]
+    EnableResourceNameDnsAAAARecord: bool | None
+    EnableResourceNameDnsARecord: bool | None
+    HostnameType: str | None
 
 
 class AssociationParameter(TypedDict):
-    Key: Optional[str]
-    Value: Optional[list[str]]
+    Key: str | None
+    Value: list[str] | None
 
 
 class SsmAssociation(TypedDict):
-    DocumentName: Optional[str]
-    AssociationParameters: Optional[list[AssociationParameter]]
+    DocumentName: str | None
+    AssociationParameters: list[AssociationParameter] | None
 
 
 class CreditSpecification(TypedDict):
-    CPUCredits: Optional[str]
+    CPUCredits: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/ec2/resource_providers/aws_ec2_instance_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class EC2InstanceProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::EC2::Instance"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ec2.resource_providers.aws_ec2_instance import EC2InstanceProvider

localstack/services/ec2/resource_providers/aws_ec2_internetgateway.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -14,13 +14,13 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class EC2InternetGatewayProperties(TypedDict):
-    InternetGatewayId: Optional[str]
-    Tags: Optional[list[Tag]]
+    InternetGatewayId: str | None
+    Tags: list[Tag] | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/ec2/resource_providers/aws_ec2_internetgateway_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class EC2InternetGatewayProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::EC2::InternetGateway"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ec2.resource_providers.aws_ec2_internetgateway import (

localstack/services/ec2/resource_providers/aws_ec2_keypair.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -14,18 +14,18 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class EC2KeyPairProperties(TypedDict):
-    KeyName: Optional[str]
-    KeyFingerprint: Optional[str]
-    KeyFormat: Optional[str]
-    KeyPairId: Optional[str]
-    KeyType: Optional[str]
-    PublicKeyMaterial: Optional[str]
-    Tags: Optional[list[Tag]]
+    KeyName: str | None
+    KeyFingerprint: str | None
+    KeyFormat: str | None
+    KeyPairId: str | None
+    KeyType: str | None
+    PublicKeyMaterial: str | None
+    Tags: list[Tag] | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/ec2/resource_providers/aws_ec2_keypair_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class EC2KeyPairProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::EC2::KeyPair"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ec2.resource_providers.aws_ec2_keypair import EC2KeyPairProvider

localstack/services/ec2/resource_providers/aws_ec2_natgateway.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -14,21 +14,21 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class EC2NatGatewayProperties(TypedDict):
-    SubnetId: Optional[str]
-    AllocationId: Optional[str]
-    ConnectivityType: Optional[str]
-    MaxDrainDurationSeconds: Optional[int]
-    NatGatewayId: Optional[str]
-    PrivateIpAddress: Optional[str]
-    SecondaryAllocationIds: Optional[list[str]]
-    SecondaryPrivateIpAddressCount: Optional[int]
-    SecondaryPrivateIpAddresses: Optional[list[str]]
-    Tags: Optional[list[Tag]]
+    SubnetId: str | None
+    AllocationId: str | None
+    ConnectivityType: str | None
+    MaxDrainDurationSeconds: int | None
+    NatGatewayId: str | None
+    PrivateIpAddress: str | None
+    SecondaryAllocationIds: list[str] | None
+    SecondaryPrivateIpAddressCount: int | None
+    SecondaryPrivateIpAddresses: list[str] | None
+    Tags: list[Tag] | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/ec2/resource_providers/aws_ec2_natgateway_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class EC2NatGatewayProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::EC2::NatGateway"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ec2.resource_providers.aws_ec2_natgateway import (

localstack/services/ec2/resource_providers/aws_ec2_networkacl.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 import localstack.services.cloudformation.provider_utils as util
 from localstack.services.cloudformation.resource_provider import (
@@ -14,14 +14,14 @@ from localstack.services.cloudformation.resource_provider import (
 
 
 class EC2NetworkAclProperties(TypedDict):
-    VpcId: Optional[str]
-    Id: Optional[str]
-    Tags: Optional[list[Tag]]
+    VpcId: str | None
+    Id: str | None
+    Tags: list[Tag] | None
 
 
 class Tag(TypedDict):
-    Key: Optional[str]
-    Value: Optional[str]
+    Key: str | None
+    Value: str | None
 
 
 REPEATED_INVOCATION = "repeated_invocation"

localstack/services/ec2/resource_providers/aws_ec2_networkacl_plugin.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from localstack.services.cloudformation.resource_provider import (
     CloudFormationResourceProviderPlugin,
     ResourceProvider,
@@ -10,7 +8,7 @@ class EC2NetworkAclProviderPlugin(CloudFormationResourceProviderPlugin):
     name = "AWS::EC2::NetworkAcl"
 
     def __init__(self):
-        self.factory: Optional[Type[ResourceProvider]] = None
+        self.factory: type[ResourceProvider] | None = None
 
     def load(self):
         from localstack.services.ec2.resource_providers.aws_ec2_networkacl import (