moto 5.0.15.dev10__tar.gz → 5.0.15.dev16__tar.gz

{moto-5.0.15.dev10/moto.egg-info → moto-5.0.15.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moto
-Version: 5.0.15.dev10
+Version: 5.0.15.dev16
 Home-page: https://github.com/getmoto/moto
 Author: Steve Pulec
 Author-email: spulec@gmail.com

{moto-5.0.15.dev10 → moto-5.0.15.dev16}/moto/__init__.py

@@ -1,4 +1,4 @@
 from moto.core.decorator import mock_aws as mock_aws
 
 __title__ = "moto"
-__version__ = "5.0.15.dev10"
+__version__ = "5.0.15.dev16"

{moto-5.0.15.dev10 → moto-5.0.15.dev16}/moto/apigateway/models.py

@@ -71,6 +71,7 @@ from .exceptions import (
 from .utils import create_id, to_path
 
 STAGE_URL = "https://{api_id}.execute-api.{region_name}.amazonaws.com/{stage_name}"
+PATCH_OPERATIONS = ["add", "remove", "replace", "move", "copy", "test"]
 
 
 class Deployment(CloudFormationModel):
@@ -1020,6 +1021,7 @@ class RestAPI(CloudFormationModel):
     PROP_POLICY = "policy"
     PROP_DISABLE_EXECUTE_API_ENDPOINT = "disableExecuteApiEndpoint"
     PROP_MINIMUM_COMPRESSION_SIZE = "minimumCompressionSize"
+    PROP_ROOT_RESOURCE_ID = "rootResourceId"
 
     # operations
     OPERATION_ADD = "add"
@@ -1064,6 +1066,7 @@ class RestAPI(CloudFormationModel):
         self.models: Dict[str, Model] = {}
         self.request_validators: Dict[str, RequestValidator] = {}
         self.default = self.add_child("/")  # Add default child
+        self.root_resource_id = self.default.id
 
     def __repr__(self) -> str:
         return str(self.id)
@@ -1082,6 +1085,7 @@ class RestAPI(CloudFormationModel):
             self.PROP_POLICY: self.policy,
             self.PROP_DISABLE_EXECUTE_API_ENDPOINT: self.disableExecuteApiEndpoint,
             self.PROP_MINIMUM_COMPRESSION_SIZE: self.minimum_compression_size,
+            self.PROP_ROOT_RESOURCE_ID: self.root_resource_id,
         }
 
     def apply_patch_operations(self, patch_operations: List[Dict[str, Any]]) -> None:
@@ -1529,6 +1533,54 @@ class GatewayResponse(BaseModel):
         return dct
 
 
+class Account(BaseModel):
+    def __init__(self) -> None:
+        self.cloudwatch_role_arn: Optional[str] = None
+        self.throttle_settings: Dict[str, Any] = {
+            "burstLimit": 5000,
+            "rateLimit": 10000.0,
+        }
+        self.features: Optional[List[str]] = None
+        self.api_key_version: str = "1"
+
+    def apply_patch_operations(
+        self, patch_operations: List[Dict[str, Any]]
+    ) -> "Account":
+        for op in patch_operations:
+            if "/cloudwatchRoleArn" in op["path"]:
+                self.cloudwatch_role_arn = op["value"]
+            elif "/features" in op["path"]:
+                if op["op"] == "add":
+                    if self.features is None:
+                        self.features = [op["value"]]
+                    else:
+                        self.features.append(op["value"])
+                elif op["op"] == "remove":
+                    if op["value"] == "UsagePlans":
+                        raise BadRequestException(
+                            "Usage Plans cannot be disabled once enabled"
+                        )
+                    if self.features is not None:
+                        self.features.remove(op["value"])
+                else:
+                    raise NotImplementedError(
+                        f'Patch operation "{op["op"]}" for "/features" not implemented'
+                    )
+            else:
+                raise NotImplementedError(
+                    f'Patch operation "{op["op"]}" for "{op["path"]}" not implemented'
+                )
+        return self
+
+    def to_json(self) -> Dict[str, Any]:
+        return {
+            "cloudwatchRoleArn": self.cloudwatch_role_arn,
+            "throttleSettings": self.throttle_settings,
+            "features": self.features,
+            "apiKeyVersion": self.api_key_version,
+        }
+
+
 class APIGatewayBackend(BaseBackend):
     """
     API Gateway mock.
@@ -1558,6 +1610,7 @@ class APIGatewayBackend(BaseBackend):
 
     def __init__(self, region_name: str, account_id: str):
         super().__init__(region_name, account_id)
+        self.account: Account = Account()
         self.apis: Dict[str, RestAPI] = {}
         self.keys: Dict[str, ApiKey] = {}
         self.usage_plans: Dict[str, UsagePlan] = {}
@@ -2485,5 +2538,12 @@ class APIGatewayBackend(BaseBackend):
         api = self.get_rest_api(rest_api_id)
         api.delete_gateway_response(response_type)
 
+    def update_account(self, patch_operations: List[Dict[str, Any]]) -> Account:
+        account = self.account.apply_patch_operations(patch_operations)
+        return account
+
+    def get_account(self) -> Account:
+        return self.account
+
 
 apigateway_backends = BackendDict(APIGatewayBackend, "apigateway")

{moto-5.0.15.dev10 → moto-5.0.15.dev16}/moto/apigateway/responses.py

@@ -851,3 +851,12 @@ class APIGatewayResponse(BaseResponse):
             rest_api_id=rest_api_id, response_type=response_type
         )
         return 202, {}, json.dumps(dict())
+
+    def update_account(self) -> str:
+        patch_operations = self._get_param("patchOperations")
+        account = self.backend.update_account(patch_operations)
+        return json.dumps(account.to_json())
+
+    def get_account(self) -> str:
+        account = self.backend.get_account()
+        return json.dumps(account.to_json())

{moto-5.0.15.dev10 → moto-5.0.15.dev16}/moto/apigateway/urls.py

@@ -41,6 +41,7 @@ url_paths = {
     "{0}/restapis/(?P<api_id>[^/]+)/gatewayresponses/(?P<response_type>[^/]+)/?$": APIGatewayResponse.dispatch,
     "{0}/vpclinks$": APIGatewayResponse.dispatch,
     "{0}/vpclinks/(?P<vpclink_id>[^/]+)": APIGatewayResponse.dispatch,
+    "{0}/account$": APIGatewayResponse.dispatch,
 }
 
 # Also manages the APIGatewayV2

{moto-5.0.15.dev10 → moto-5.0.15.dev16}/moto/backend_index.py

@@ -116,6 +116,7 @@ backend_url_patterns = [
     ("mediapackage", re.compile("https?://mediapackage\\.(.+)\\.amazonaws.com")),
     ("mediastore", re.compile("https?://mediastore\\.(.+)\\.amazonaws\\.com")),
     ("mediastoredata", re.compile("https?://data\\.mediastore\\.(.+)\\.amazonaws.com")),
+    ("memorydb", re.compile("https?://memory-db\\.(.+)\\.amazonaws\\.com")),
     (
         "meteringmarketplace",
         re.compile("https?://metering.marketplace.(.+).amazonaws.com"),

{moto-5.0.15.dev10 → moto-5.0.15.dev16}/moto/backends.py

@@ -92,6 +92,7 @@ if TYPE_CHECKING:
     from moto.mediapackage.models import MediaPackageBackend
     from moto.mediastore.models import MediaStoreBackend
     from moto.mediastoredata.models import MediaStoreDataBackend
+    from moto.memorydb.models import MemoryDBBackend
     from moto.meteringmarketplace.models import MeteringMarketplaceBackend
     from moto.moto_api._internal.models import MotoAPIBackend
     from moto.mq.models import MQBackend
@@ -268,6 +269,7 @@ SERVICE_NAMES = Union[
     "Literal['medialive']",
     "Literal['mediapackage']",
     "Literal['mediastore']",
+    "Literal['memorydb']",
     "Literal['mediastore-data']",
     "Literal['meteringmarketplace']",
     "Literal['moto_api']",
@@ -564,6 +566,8 @@ def get_backend(
     name: "Literal['mediastore-data']",
 ) -> "BackendDict[MediaStoreDataBackend]": ...
 @overload
+def get_backend(name: "Literal['memorydb']") -> "BackendDict[MemoryDBBackend]": ...
+@overload
 def get_backend(
     name: "Literal['meteringmarketplace']",
 ) -> "BackendDict[MeteringMarketplaceBackend]": ...

{moto-5.0.15.dev10 → moto-5.0.15.dev16}/moto/ec2/models/availability_zones_and_regions.py

@@ -70,12 +70,16 @@ class RegionsAndZonesBackend:
             Region(region, f"ec2.{region}.amazonaws.com.cn", "opt-in-not-required")
         )
 
+    # Regions where the regions and zones are different from the norm
+    # Potential reasons:
+    #  - More or less zones than usual (!= 3)
+    #  - More zone id's then zones, resulting in a third zone with id '-az4'
+    #  - Unusual mapping, resulting in zone id's that are not numerically ordered, i.e. a=1, b=3, c=2
+    #
+    # The exact mapping is different from account to account
+    # The mapping defined here will be an amalgamation of different contributors/accounts
+    # We're keeping it as is for legacy/compatibility reasons
     zones = {
-        "af-south-1": [
-            Zone(region_name="af-south-1", name="af-south-1a", zone_id="afs1-az1"),
-            Zone(region_name="af-south-1", name="af-south-1b", zone_id="afs1-az2"),
-            Zone(region_name="af-south-1", name="af-south-1c", zone_id="afs1-az3"),
-        ],
         "ap-south-1": [
             Zone(region_name="ap-south-1", name="ap-south-1a", zone_id="aps1-az1"),
             Zone(region_name="ap-south-1", name="ap-south-1b", zone_id="aps1-az3"),
@@ -86,11 +90,6 @@ class RegionsAndZonesBackend:
             Zone(region_name="eu-west-3", name="eu-west-3b", zone_id="euw3-az2"),
             Zone(region_name="eu-west-3", name="eu-west-3c", zone_id="euw3-az3"),
         ],
-        "eu-north-1": [
-            Zone(region_name="eu-north-1", name="eu-north-1a", zone_id="eun1-az1"),
-            Zone(region_name="eu-north-1", name="eu-north-1b", zone_id="eun1-az2"),
-            Zone(region_name="eu-north-1", name="eu-north-1c", zone_id="eun1-az3"),
-        ],
         "eu-west-2": [
             Zone(region_name="eu-west-2", name="eu-west-2a", zone_id="euw2-az2"),
             Zone(region_name="eu-west-2", name="eu-west-2b", zone_id="euw2-az3"),
@@ -101,23 +100,6 @@ class RegionsAndZonesBackend:
             Zone(region_name="eu-west-1", name="eu-west-1b", zone_id="euw1-az1"),
             Zone(region_name="eu-west-1", name="eu-west-1c", zone_id="euw1-az2"),
         ],
-        "ap-northeast-3": [
-            Zone(
-                region_name="ap-northeast-3",
-                name="ap-northeast-3a",
-                zone_id="apne3-az1",
-            ),
-            Zone(
-                region_name="ap-northeast-3",
-                name="ap-northeast-3b",
-                zone_id="apne3-az2",
-            ),
-            Zone(
-                region_name="ap-northeast-3",
-                name="ap-northeast-3c",
-                zone_id="apne3-az3",
-            ),
-        ],
         "ap-northeast-2": [
             Zone(
                 region_name="ap-northeast-2",
@@ -157,38 +139,11 @@ class RegionsAndZonesBackend:
                 zone_id="apne1-az2",
             ),
         ],
-        "ap-east-1": [
-            Zone(region_name="ap-east-1", name="ap-east-1a", zone_id="ape1-az1"),
-            Zone(region_name="ap-east-1", name="ap-east-1b", zone_id="ape1-az2"),
-            Zone(region_name="ap-east-1", name="ap-east-1c", zone_id="ape1-az3"),
-        ],
-        "sa-east-1": [
-            Zone(region_name="sa-east-1", name="sa-east-1a", zone_id="sae1-az1"),
-            Zone(region_name="sa-east-1", name="sa-east-1b", zone_id="sae1-az2"),
-            Zone(region_name="sa-east-1", name="sa-east-1c", zone_id="sae1-az3"),
-        ],
         "ca-central-1": [
             Zone(region_name="ca-central-1", name="ca-central-1a", zone_id="cac1-az1"),
             Zone(region_name="ca-central-1", name="ca-central-1b", zone_id="cac1-az2"),
             Zone(region_name="ca-central-1", name="ca-central-1d", zone_id="cac1-az4"),
         ],
-        "ap-southeast-1": [
-            Zone(
-                region_name="ap-southeast-1",
-                name="ap-southeast-1a",
-                zone_id="apse1-az1",
-            ),
-            Zone(
-                region_name="ap-southeast-1",
-                name="ap-southeast-1b",
-                zone_id="apse1-az2",
-            ),
-            Zone(
-                region_name="ap-southeast-1",
-                name="ap-southeast-1c",
-                zone_id="apse1-az3",
-            ),
-        ],
         "ap-southeast-2": [
             Zone(
                 region_name="ap-southeast-2",
@@ -206,38 +161,6 @@ class RegionsAndZonesBackend:
                 zone_id="apse2-az2",
             ),
         ],
-        "ap-southeast-3": [
-            Zone(
-                region_name="ap-southeast-3",
-                name="ap-southeast-3a",
-                zone_id="apse3-az1",
-            ),
-            Zone(
-                region_name="ap-southeast-3",
-                name="ap-southeast-3b",
-                zone_id="apse3-az2",
-            ),
-            Zone(
-                region_name="ap-southeast-3",
-                name="ap-southeast-3c",
-                zone_id="apse3-az3",
-            ),
-        ],
-        "eu-central-1": [
-            Zone(region_name="eu-central-1", name="eu-central-1a", zone_id="euc1-az2"),
-            Zone(region_name="eu-central-1", name="eu-central-1b", zone_id="euc1-az3"),
-            Zone(region_name="eu-central-1", name="eu-central-1c", zone_id="euc1-az1"),
-        ],
-        "eu-central-2": [
-            Zone(region_name="eu-central-2", name="eu-central-2a", zone_id="euc2-az1"),
-            Zone(region_name="eu-central-2", name="eu-central-2b", zone_id="euc2-az2"),
-            Zone(region_name="eu-central-2", name="eu-central-2c", zone_id="euc2-az3"),
-        ],
-        "eu-south-1": [
-            Zone(region_name="eu-south-1", name="eu-south-1a", zone_id="eus1-az1"),
-            Zone(region_name="eu-south-1", name="eu-south-1b", zone_id="eus1-az2"),
-            Zone(region_name="eu-south-1", name="eu-south-1c", zone_id="eus1-az3"),
-        ],
         "us-east-1": [
             Zone(region_name="us-east-1", name="us-east-1a", zone_id="use1-az6"),
             Zone(region_name="us-east-1", name="us-east-1b", zone_id="use1-az1"),
@@ -246,11 +169,6 @@ class RegionsAndZonesBackend:
             Zone(region_name="us-east-1", name="us-east-1e", zone_id="use1-az3"),
             Zone(region_name="us-east-1", name="us-east-1f", zone_id="use1-az5"),
         ],
-        "us-east-2": [
-            Zone(region_name="us-east-2", name="us-east-2a", zone_id="use2-az1"),
-            Zone(region_name="us-east-2", name="us-east-2b", zone_id="use2-az2"),
-            Zone(region_name="us-east-2", name="us-east-2c", zone_id="use2-az3"),
-        ],
         "us-west-1": [
             Zone(region_name="us-west-1", name="us-west-1a", zone_id="usw1-az3"),
             Zone(region_name="us-west-1", name="us-west-1b", zone_id="usw1-az1"),
@@ -261,55 +179,27 @@ class RegionsAndZonesBackend:
             Zone(region_name="us-west-2", name="us-west-2c", zone_id="usw2-az3"),
             Zone(region_name="us-west-2", name="us-west-2d", zone_id="usw2-az4"),
         ],
-        "me-south-1": [
-            Zone(region_name="me-south-1", name="me-south-1a", zone_id="mes1-az1"),
-            Zone(region_name="me-south-1", name="me-south-1b", zone_id="mes1-az2"),
-            Zone(region_name="me-south-1", name="me-south-1c", zone_id="mes1-az3"),
-        ],
         "cn-north-1": [
             Zone(region_name="cn-north-1", name="cn-north-1a", zone_id="cnn1-az1"),
             Zone(region_name="cn-north-1", name="cn-north-1b", zone_id="cnn1-az2"),
         ],
-        "cn-northwest-1": [
-            Zone(
-                region_name="cn-northwest-1",
-                name="cn-northwest-1a",
-                zone_id="cnnw1-az1",
-            ),
-            Zone(
-                region_name="cn-northwest-1",
-                name="cn-northwest-1b",
-                zone_id="cnnw1-az2",
-            ),
-            Zone(
-                region_name="cn-northwest-1",
-                name="cn-northwest-1c",
-                zone_id="cnnw1-az3",
-            ),
-        ],
-        "us-gov-west-1": [
-            Zone(
-                region_name="us-gov-west-1", name="us-gov-west-1a", zone_id="usgw1-az1"
-            ),
-            Zone(
-                region_name="us-gov-west-1", name="us-gov-west-1b", zone_id="usgw1-az2"
-            ),
-            Zone(
-                region_name="us-gov-west-1", name="us-gov-west-1c", zone_id="usgw1-az3"
-            ),
-        ],
-        "us-gov-east-1": [
-            Zone(
-                region_name="us-gov-east-1", name="us-gov-east-1a", zone_id="usge1-az1"
-            ),
-            Zone(
-                region_name="us-gov-east-1", name="us-gov-east-1b", zone_id="usge1-az2"
-            ),
-            Zone(
-                region_name="us-gov-east-1", name="us-gov-east-1c", zone_id="usge1-az3"
-            ),
-        ],
     }
+    # Regularized region->zone mapping for all regions not defined above
+    for region in regions:
+        if region.name not in zones:
+            name = region.name
+            region_parts = name.split("-")
+            shorthand = "usg" if name.startswith("us-gov") else region_parts[0]
+            # North and south first - this also handles combinations like northeast -> ne
+            for cardinal in ["north", "south", "central", "east", "west"]:
+                if cardinal in name:
+                    shorthand += cardinal[0]
+            shorthand += region_parts[-1]
+            zones[region.name] = [
+                Zone(region_name=name, name=f"{name}a", zone_id=f"{shorthand}-az1"),
+                Zone(region_name=name, name=f"{name}b", zone_id=f"{shorthand}-az2"),
+                Zone(region_name=name, name=f"{name}c", zone_id=f"{shorthand}-az3"),
+            ]
 
     def describe_regions(
         self, region_names: Optional[List[str]] = None

{moto-5.0.15.dev10 → moto-5.0.15.dev16}/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json

@@ -1999,6 +1999,86 @@
   "InstanceType": "r6id.xlarge",
   "Location": "ap-southeast-2a"
  },
+ {
+  "InstanceType": "r6idn.12xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6idn.16xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6idn.24xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6idn.2xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6idn.32xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6idn.4xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6idn.8xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6idn.large",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6idn.metal",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6idn.xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6in.12xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6in.16xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6in.24xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6in.2xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6in.32xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6in.4xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6in.8xlarge",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6in.large",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6in.metal",
+  "Location": "ap-southeast-2a"
+ },
+ {
+  "InstanceType": "r6in.xlarge",
+  "Location": "ap-southeast-2a"
+ },
  {
   "InstanceType": "r7g.12xlarge",
   "Location": "ap-southeast-2a"
@@ -4451,6 +4531,86 @@
   "InstanceType": "r6id.xlarge",
   "Location": "ap-southeast-2b"
  },
+ {
+  "InstanceType": "r6idn.12xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6idn.16xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6idn.24xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6idn.2xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6idn.32xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6idn.4xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6idn.8xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6idn.large",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6idn.metal",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6idn.xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6in.12xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6in.16xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6in.24xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6in.2xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6in.32xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6in.4xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6in.8xlarge",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6in.large",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6in.metal",
+  "Location": "ap-southeast-2b"
+ },
+ {
+  "InstanceType": "r6in.xlarge",
+  "Location": "ap-southeast-2b"
+ },
  {
   "InstanceType": "r7g.12xlarge",
   "Location": "ap-southeast-2b"
@@ -6827,6 +6987,86 @@
   "InstanceType": "r6id.xlarge",
   "Location": "ap-southeast-2c"
  },
+ {
+  "InstanceType": "r6idn.12xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6idn.16xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6idn.24xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6idn.2xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6idn.32xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6idn.4xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6idn.8xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6idn.large",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6idn.metal",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6idn.xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6in.12xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6in.16xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6in.24xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6in.2xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6in.32xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6in.4xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6in.8xlarge",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6in.large",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6in.metal",
+  "Location": "ap-southeast-2c"
+ },
+ {
+  "InstanceType": "r6in.xlarge",
+  "Location": "ap-southeast-2c"
+ },
  {
   "InstanceType": "r7g.12xlarge",
   "Location": "ap-southeast-2c"

{moto-5.0.15.dev10 → moto-5.0.15.dev16}/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json

@@ -7767,6 +7767,10 @@
   "InstanceType": "p2.xlarge",
   "Location": "us-east-2c"
  },
+ {
+  "InstanceType": "p5e.48xlarge",
+  "Location": "us-east-2c"
+ },
  {
   "InstanceType": "r3.2xlarge",
   "Location": "us-east-2c"