moto 5.0.3.dev60__tar.gz → 5.0.4.dev5__tar.gz

{moto-5.0.3.dev60/moto.egg-info → moto-5.0.4.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moto
-Version: 5.0.3.dev60
+Version: 5.0.4.dev5
 Home-page: https://github.com/getmoto/moto
 Author: Steve Pulec
 Author-email: spulec@gmail.com

{moto-5.0.3.dev60 → moto-5.0.4.dev5}/moto/__init__.py

@@ -1,4 +1,4 @@
 from moto.core.decorator import mock_aws as mock_aws
 
 __title__ = "moto"
-__version__ = "5.0.3.dev60"
+__version__ = "5.0.4.dev5"

{moto-5.0.3.dev60 → moto-5.0.4.dev5}/moto/ec2/models/vpcs.py

@@ -1,5 +1,6 @@
 import ipaddress
 import json
+import threading
 import weakref
 from collections import defaultdict
 from operator import itemgetter
@@ -82,6 +83,7 @@ IMPLEMENTED_ENDPOINT_SERVICES = [
 ]
 MAX_NUMBER_OF_ENDPOINT_SERVICES_RESULTS = 1000
 DEFAULT_VPC_ENDPOINT_SERVICES: List[Dict[str, str]] = []
+ENDPOINT_SERVICE_COLLECTION_LOCK = threading.Lock()
 
 
 class VPCEndPoint(TaggedEC2Resource, CloudFormationModel):
@@ -773,35 +775,37 @@ class VPCBackend:
         account_id: str, region: str
     ) -> List[Dict[str, str]]:
         """Return list of default services using list of backends."""
-        if DEFAULT_VPC_ENDPOINT_SERVICES:
-            return DEFAULT_VPC_ENDPOINT_SERVICES
+        with ENDPOINT_SERVICE_COLLECTION_LOCK:
 
-        zones = [
-            zone.name
-            for zones in RegionsAndZonesBackend.zones.values()
-            for zone in zones
-            if zone.name.startswith(region)
-        ]
+            if DEFAULT_VPC_ENDPOINT_SERVICES:
+                return DEFAULT_VPC_ENDPOINT_SERVICES
 
-        from moto import backends  # pylint: disable=import-outside-toplevel
+            zones = [
+                zone.name
+                for zones in RegionsAndZonesBackend.zones.values()
+                for zone in zones
+                if zone.name.startswith(region)
+            ]
 
-        for implemented_service in IMPLEMENTED_ENDPOINT_SERVICES:
-            _backends = backends.get_backend(implemented_service)  # type: ignore[call-overload]
-            account_backend = _backends[account_id]
-            if region in account_backend:
-                service = account_backend[region].default_vpc_endpoint_service(
-                    region, zones
-                )
-                if service:
-                    DEFAULT_VPC_ENDPOINT_SERVICES.extend(service)
+            from moto import backends  # pylint: disable=import-outside-toplevel
 
-            if "global" in account_backend:
-                service = account_backend["global"].default_vpc_endpoint_service(
-                    region, zones
-                )
-                if service:
-                    DEFAULT_VPC_ENDPOINT_SERVICES.extend(service)
-        return DEFAULT_VPC_ENDPOINT_SERVICES
+            for implemented_service in IMPLEMENTED_ENDPOINT_SERVICES:
+                _backends = backends.get_backend(implemented_service)  # type: ignore[call-overload]
+                account_backend = _backends[account_id]
+                if region in account_backend:
+                    service = account_backend[region].default_vpc_endpoint_service(
+                        region, zones
+                    )
+                    if service:
+                        DEFAULT_VPC_ENDPOINT_SERVICES.extend(service)
+
+                if "global" in account_backend:
+                    service = account_backend["global"].default_vpc_endpoint_service(
+                        region, zones
+                    )
+                    if service:
+                        DEFAULT_VPC_ENDPOINT_SERVICES.extend(service)
+            return DEFAULT_VPC_ENDPOINT_SERVICES
 
     @staticmethod
     def _matches_service_by_tags(service: Dict[str, Any], filter_item: Dict[str, Any]) -> bool:  # type: ignore[misc]

{moto-5.0.3.dev60 → moto-5.0.4.dev5}/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json

@@ -583,6 +583,10 @@
   "InstanceType": "c7gd.medium",
   "Location": "ap-northeast-1a"
  },
+ {
+  "InstanceType": "c7gd.metal",
+  "Location": "ap-northeast-1a"
+ },
  {
   "InstanceType": "c7gd.xlarge",
   "Location": "ap-northeast-1a"
@@ -1715,6 +1719,10 @@
   "InstanceType": "m7gd.medium",
   "Location": "ap-northeast-1a"
  },
+ {
+  "InstanceType": "m7gd.metal",
+  "Location": "ap-northeast-1a"
+ },
  {
   "InstanceType": "m7gd.xlarge",
   "Location": "ap-northeast-1a"
@@ -2495,6 +2503,10 @@
   "InstanceType": "r7gd.medium",
   "Location": "ap-northeast-1a"
  },
+ {
+  "InstanceType": "r7gd.metal",
+  "Location": "ap-northeast-1a"
+ },
  {
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-northeast-1a"
@@ -3423,6 +3435,10 @@
   "InstanceType": "c7gd.medium",
   "Location": "ap-northeast-1c"
  },
+ {
+  "InstanceType": "c7gd.metal",
+  "Location": "ap-northeast-1c"
+ },
  {
   "InstanceType": "c7gd.xlarge",
   "Location": "ap-northeast-1c"
@@ -4563,6 +4579,10 @@
   "InstanceType": "m7gd.medium",
   "Location": "ap-northeast-1c"
  },
+ {
+  "InstanceType": "m7gd.metal",
+  "Location": "ap-northeast-1c"
+ },
  {
   "InstanceType": "m7gd.xlarge",
   "Location": "ap-northeast-1c"
@@ -5303,6 +5323,10 @@
   "InstanceType": "r7gd.medium",
   "Location": "ap-northeast-1c"
  },
+ {
+  "InstanceType": "r7gd.metal",
+  "Location": "ap-northeast-1c"
+ },
  {
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-northeast-1c"
@@ -6155,6 +6179,10 @@
   "InstanceType": "c7gd.medium",
   "Location": "ap-northeast-1d"
  },
+ {
+  "InstanceType": "c7gd.metal",
+  "Location": "ap-northeast-1d"
+ },
  {
   "InstanceType": "c7gd.xlarge",
   "Location": "ap-northeast-1d"
@@ -7151,6 +7179,10 @@
   "InstanceType": "m7gd.medium",
   "Location": "ap-northeast-1d"
  },
+ {
+  "InstanceType": "m7gd.metal",
+  "Location": "ap-northeast-1d"
+ },
  {
   "InstanceType": "m7gd.xlarge",
   "Location": "ap-northeast-1d"
@@ -7811,6 +7843,10 @@
   "InstanceType": "r7gd.medium",
   "Location": "ap-northeast-1d"
  },
+ {
+  "InstanceType": "r7gd.metal",
+  "Location": "ap-northeast-1d"
+ },
  {
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-northeast-1d"

{moto-5.0.3.dev60 → moto-5.0.4.dev5}/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json

@@ -4967,6 +4967,10 @@
   "InstanceType": "t4g.xlarge",
   "Location": "ap-northeast-2c"
  },
+ {
+  "InstanceType": "u-12tb1.112xlarge",
+  "Location": "ap-northeast-2c"
+ },
  {
   "InstanceType": "u-24tb1.112xlarge",
   "Location": "ap-northeast-2c"

{moto-5.0.3.dev60 → moto-5.0.4.dev5}/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json

@@ -443,6 +443,10 @@
   "InstanceType": "c7gd.medium",
   "Location": "ap-south-1a"
  },
+ {
+  "InstanceType": "c7gd.metal",
+  "Location": "ap-south-1a"
+ },
  {
   "InstanceType": "c7gd.xlarge",
   "Location": "ap-south-1a"
@@ -1175,6 +1179,10 @@
   "InstanceType": "m7gd.medium",
   "Location": "ap-south-1a"
  },
+ {
+  "InstanceType": "m7gd.metal",
+  "Location": "ap-south-1a"
+ },
  {
   "InstanceType": "m7gd.xlarge",
   "Location": "ap-south-1a"
@@ -1735,6 +1743,10 @@
   "InstanceType": "r7gd.medium",
   "Location": "ap-south-1a"
  },
+ {
+  "InstanceType": "r7gd.metal",
+  "Location": "ap-south-1a"
+ },
  {
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-south-1a"
@@ -2479,6 +2491,10 @@
   "InstanceType": "c7gd.medium",
   "Location": "ap-south-1b"
  },
+ {
+  "InstanceType": "c7gd.metal",
+  "Location": "ap-south-1b"
+ },
  {
   "InstanceType": "c7gd.xlarge",
   "Location": "ap-south-1b"
@@ -3187,6 +3203,10 @@
   "InstanceType": "m7gd.medium",
   "Location": "ap-south-1b"
  },
+ {
+  "InstanceType": "m7gd.metal",
+  "Location": "ap-south-1b"
+ },
  {
   "InstanceType": "m7gd.xlarge",
   "Location": "ap-south-1b"
@@ -3743,6 +3763,10 @@
   "InstanceType": "r7gd.medium",
   "Location": "ap-south-1b"
  },
+ {
+  "InstanceType": "r7gd.metal",
+  "Location": "ap-south-1b"
+ },
  {
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-south-1b"
@@ -4471,6 +4495,10 @@
   "InstanceType": "c7gd.medium",
   "Location": "ap-south-1c"
  },
+ {
+  "InstanceType": "c7gd.metal",
+  "Location": "ap-south-1c"
+ },
  {
   "InstanceType": "c7gd.xlarge",
   "Location": "ap-south-1c"
@@ -5115,6 +5143,10 @@
   "InstanceType": "m7gd.medium",
   "Location": "ap-south-1c"
  },
+ {
+  "InstanceType": "m7gd.metal",
+  "Location": "ap-south-1c"
+ },
  {
   "InstanceType": "m7gd.xlarge",
   "Location": "ap-south-1c"
@@ -5619,6 +5651,10 @@
   "InstanceType": "r7gd.medium",
   "Location": "ap-south-1c"
  },
+ {
+  "InstanceType": "r7gd.metal",
+  "Location": "ap-south-1c"
+ },
  {
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-south-1c"

{moto-5.0.3.dev60 → moto-5.0.4.dev5}/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-2.json

@@ -147,6 +147,46 @@
   "InstanceType": "c6i.xlarge",
   "Location": "ap-south-2a"
  },
+ {
+  "InstanceType": "c6in.12xlarge",
+  "Location": "ap-south-2a"
+ },
+ {
+  "InstanceType": "c6in.16xlarge",
+  "Location": "ap-south-2a"
+ },
+ {
+  "InstanceType": "c6in.24xlarge",
+  "Location": "ap-south-2a"
+ },
+ {
+  "InstanceType": "c6in.2xlarge",
+  "Location": "ap-south-2a"
+ },
+ {
+  "InstanceType": "c6in.32xlarge",
+  "Location": "ap-south-2a"
+ },
+ {
+  "InstanceType": "c6in.4xlarge",
+  "Location": "ap-south-2a"
+ },
+ {
+  "InstanceType": "c6in.8xlarge",
+  "Location": "ap-south-2a"
+ },
+ {
+  "InstanceType": "c6in.large",
+  "Location": "ap-south-2a"
+ },
+ {
+  "InstanceType": "c6in.metal",
+  "Location": "ap-south-2a"
+ },
+ {
+  "InstanceType": "c6in.xlarge",
+  "Location": "ap-south-2a"
+ },
  {
   "InstanceType": "c7g.12xlarge",
   "Location": "ap-south-2a"
@@ -983,6 +1023,46 @@
   "InstanceType": "c6i.xlarge",
   "Location": "ap-south-2b"
  },
+ {
+  "InstanceType": "c6in.12xlarge",
+  "Location": "ap-south-2b"
+ },
+ {
+  "InstanceType": "c6in.16xlarge",
+  "Location": "ap-south-2b"
+ },
+ {
+  "InstanceType": "c6in.24xlarge",
+  "Location": "ap-south-2b"
+ },
+ {
+  "InstanceType": "c6in.2xlarge",
+  "Location": "ap-south-2b"
+ },
+ {
+  "InstanceType": "c6in.32xlarge",
+  "Location": "ap-south-2b"
+ },
+ {
+  "InstanceType": "c6in.4xlarge",
+  "Location": "ap-south-2b"
+ },
+ {
+  "InstanceType": "c6in.8xlarge",
+  "Location": "ap-south-2b"
+ },
+ {
+  "InstanceType": "c6in.large",
+  "Location": "ap-south-2b"
+ },
+ {
+  "InstanceType": "c6in.metal",
+  "Location": "ap-south-2b"
+ },
+ {
+  "InstanceType": "c6in.xlarge",
+  "Location": "ap-south-2b"
+ },
  {
   "InstanceType": "c7g.12xlarge",
   "Location": "ap-south-2b"
@@ -1815,6 +1895,46 @@
   "InstanceType": "c6i.xlarge",
   "Location": "ap-south-2c"
  },
+ {
+  "InstanceType": "c6in.12xlarge",
+  "Location": "ap-south-2c"
+ },
+ {
+  "InstanceType": "c6in.16xlarge",
+  "Location": "ap-south-2c"
+ },
+ {
+  "InstanceType": "c6in.24xlarge",
+  "Location": "ap-south-2c"
+ },
+ {
+  "InstanceType": "c6in.2xlarge",
+  "Location": "ap-south-2c"
+ },
+ {
+  "InstanceType": "c6in.32xlarge",
+  "Location": "ap-south-2c"
+ },
+ {
+  "InstanceType": "c6in.4xlarge",
+  "Location": "ap-south-2c"
+ },
+ {
+  "InstanceType": "c6in.8xlarge",
+  "Location": "ap-south-2c"
+ },
+ {
+  "InstanceType": "c6in.large",
+  "Location": "ap-south-2c"
+ },
+ {
+  "InstanceType": "c6in.metal",
+  "Location": "ap-south-2c"
+ },
+ {
+  "InstanceType": "c6in.xlarge",
+  "Location": "ap-south-2c"
+ },
  {
   "InstanceType": "c7g.12xlarge",
   "Location": "ap-south-2c"

{moto-5.0.3.dev60 → moto-5.0.4.dev5}/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json

@@ -567,6 +567,10 @@
   "InstanceType": "c7gd.medium",
   "Location": "ap-southeast-1a"
  },
+ {
+  "InstanceType": "c7gd.metal",
+  "Location": "ap-southeast-1a"
+ },
  {
   "InstanceType": "c7gd.xlarge",
   "Location": "ap-southeast-1a"
@@ -1583,6 +1587,10 @@
   "InstanceType": "m7gd.medium",
   "Location": "ap-southeast-1a"
  },
+ {
+  "InstanceType": "m7gd.metal",
+  "Location": "ap-southeast-1a"
+ },
  {
   "InstanceType": "m7gd.xlarge",
   "Location": "ap-southeast-1a"
@@ -2311,6 +2319,10 @@
   "InstanceType": "r7gd.medium",
   "Location": "ap-southeast-1a"
  },
+ {
+  "InstanceType": "r7gd.metal",
+  "Location": "ap-southeast-1a"
+ },
  {
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-southeast-1a"
@@ -3139,6 +3151,10 @@
   "InstanceType": "c7gd.medium",
   "Location": "ap-southeast-1b"
  },
+ {
+  "InstanceType": "c7gd.metal",
+  "Location": "ap-southeast-1b"
+ },
  {
   "InstanceType": "c7gd.xlarge",
   "Location": "ap-southeast-1b"
@@ -4159,6 +4175,10 @@
   "InstanceType": "m7gd.medium",
   "Location": "ap-southeast-1b"
  },
+ {
+  "InstanceType": "m7gd.metal",
+  "Location": "ap-southeast-1b"
+ },
  {
   "InstanceType": "m7gd.xlarge",
   "Location": "ap-southeast-1b"
@@ -4887,6 +4907,10 @@
   "InstanceType": "r7gd.medium",
   "Location": "ap-southeast-1b"
  },
+ {
+  "InstanceType": "r7gd.metal",
+  "Location": "ap-southeast-1b"
+ },
  {
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-southeast-1b"
@@ -5695,6 +5719,10 @@
   "InstanceType": "c7gd.medium",
   "Location": "ap-southeast-1c"
  },
+ {
+  "InstanceType": "c7gd.metal",
+  "Location": "ap-southeast-1c"
+ },
  {
   "InstanceType": "c7gd.xlarge",
   "Location": "ap-southeast-1c"
@@ -6555,6 +6583,10 @@
   "InstanceType": "m7gd.medium",
   "Location": "ap-southeast-1c"
  },
+ {
+  "InstanceType": "m7gd.metal",
+  "Location": "ap-southeast-1c"
+ },
  {
   "InstanceType": "m7gd.xlarge",
   "Location": "ap-southeast-1c"
@@ -7187,6 +7219,10 @@
   "InstanceType": "r7gd.medium",
   "Location": "ap-southeast-1c"
  },
+ {
+  "InstanceType": "r7gd.metal",
+  "Location": "ap-southeast-1c"
+ },
  {
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-southeast-1c"

{moto-5.0.3.dev60 → moto-5.0.4.dev5}/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json

@@ -543,6 +543,10 @@
   "InstanceType": "c7gd.medium",
   "Location": "ap-southeast-2a"
  },
+ {
+  "InstanceType": "c7gd.metal",
+  "Location": "ap-southeast-2a"
+ },
  {
   "InstanceType": "c7gd.xlarge",
   "Location": "ap-southeast-2a"
@@ -1391,6 +1395,10 @@
   "InstanceType": "m7gd.medium",
   "Location": "ap-southeast-2a"
  },
+ {
+  "InstanceType": "m7gd.metal",
+  "Location": "ap-southeast-2a"
+ },
  {
   "InstanceType": "m7gd.xlarge",
   "Location": "ap-southeast-2a"
@@ -2019,6 +2027,10 @@
   "InstanceType": "r7gd.medium",
   "Location": "ap-southeast-2a"
  },
+ {
+  "InstanceType": "r7gd.metal",
+  "Location": "ap-southeast-2a"
+ },
  {
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-southeast-2a"
@@ -2843,6 +2855,10 @@
   "InstanceType": "c7gd.medium",
   "Location": "ap-southeast-2b"
  },
+ {
+  "InstanceType": "c7gd.metal",
+  "Location": "ap-southeast-2b"
+ },
  {
   "InstanceType": "c7gd.xlarge",
   "Location": "ap-southeast-2b"
@@ -3767,6 +3783,10 @@
   "InstanceType": "m7gd.medium",
   "Location": "ap-southeast-2b"
  },
+ {
+  "InstanceType": "m7gd.metal",
+  "Location": "ap-southeast-2b"
+ },
  {
   "InstanceType": "m7gd.xlarge",
   "Location": "ap-southeast-2b"
@@ -4419,6 +4439,10 @@
   "InstanceType": "r7gd.medium",
   "Location": "ap-southeast-2b"
  },
+ {
+  "InstanceType": "r7gd.metal",
+  "Location": "ap-southeast-2b"
+ },
  {
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-southeast-2b"
@@ -5267,6 +5291,10 @@
   "InstanceType": "c7gd.medium",
   "Location": "ap-southeast-2c"
  },
+ {
+  "InstanceType": "c7gd.metal",
+  "Location": "ap-southeast-2c"
+ },
  {
   "InstanceType": "c7gd.xlarge",
   "Location": "ap-southeast-2c"
@@ -6131,6 +6159,10 @@
   "InstanceType": "m7gd.medium",
   "Location": "ap-southeast-2c"
  },
+ {
+  "InstanceType": "m7gd.metal",
+  "Location": "ap-southeast-2c"
+ },
  {
   "InstanceType": "m7gd.xlarge",
   "Location": "ap-southeast-2c"
@@ -6759,6 +6791,10 @@
   "InstanceType": "r7gd.medium",
   "Location": "ap-southeast-2c"
  },
+ {
+  "InstanceType": "r7gd.metal",
+  "Location": "ap-southeast-2c"
+ },
  {
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-southeast-2c"