moto 5.0.13.dev59__tar.gz → 5.0.14.dev5__tar.gz

{moto-5.0.13.dev59/moto.egg-info → moto-5.0.14.dev5}/PKG-INFO

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

{moto-5.0.13.dev59 → moto-5.0.14.dev5}/moto/__init__.py

@@ -1,4 +1,4 @@
 from moto.core.decorator import mock_aws as mock_aws
 
 __title__ = "moto"
-__version__ = "5.0.13.dev59"
+__version__ = "5.0.14.dev5"

{moto-5.0.13.dev59 → moto-5.0.14.dev5}/moto/cognitoidp/models.py

@@ -1,7 +1,5 @@
 import datetime
 import enum
-import json
-import os
 import re
 import time
 import typing
@@ -15,7 +13,7 @@ from moto.core.common_models import BaseModel
 from moto.core.utils import utcnow
 from moto.moto_api._internal import mock_random as random
 from moto.utilities.paginator import paginate
-from moto.utilities.utils import get_partition, md5_hash
+from moto.utilities.utils import get_partition, load_resource, md5_hash
 
 from ..settings import get_cognito_idp_user_pool_id_strategy
 from .exceptions import (
@@ -439,10 +437,8 @@ class CognitoIdpUserPool(BaseModel):
         self.access_tokens: Dict[str, Tuple[str, str]] = {}
         self.id_tokens: Dict[str, Tuple[str, str]] = {}
 
-        with open(
-            os.path.join(os.path.dirname(__file__), "resources/jwks-private.json")
-        ) as f:
-            self.json_web_key = jwk.RSAKey.import_key(json.loads(f.read()))
+        jwks_file = load_resource(__name__, "resources/jwks-private.json")
+        self.json_web_key = jwk.RSAKey.import_key(jwks_file)
 
     @property
     def backend(self) -> "CognitoIdpBackend":

{moto-5.0.13.dev59 → moto-5.0.14.dev5}/moto/ec2/models/instance_types.py

@@ -17,12 +17,15 @@ offerings_path = "../resources/instance_type_offerings"
 INSTANCE_TYPE_OFFERINGS: Dict[str, Any] = {}
 for _location_type in listdir(root / offerings_path):
     INSTANCE_TYPE_OFFERINGS[_location_type] = {}
-    for _region in listdir(root / offerings_path / _location_type):
-        full_path = offerings_path + "/" + _location_type + "/" + _region
+    for data_file in listdir(root / offerings_path / _location_type):
+        # data_file = {region}.{content_type}
+        # E.g.: us-east-1.json or eu-west-1.json.gz
+        full_path = offerings_path + "/" + _location_type + "/" + data_file
+        _region = data_file.split(".")[0]
         res = load_resource(__name__, full_path)
         for instance in res:
             instance["LocationType"] = _location_type
-        INSTANCE_TYPE_OFFERINGS[_location_type][_region.replace(".json", "")] = res
+        INSTANCE_TYPE_OFFERINGS[_location_type][_region] = res
 
 
 class InstanceType(Dict[str, Any]):

{moto-5.0.13.dev59 → moto-5.0.14.dev5}/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json

@@ -5947,6 +5947,26 @@
   "InstanceType": "i3en.xlarge",
   "Location": "ap-southeast-1c"
  },
+ {
+  "InstanceType": "i4g.16xlarge",
+  "Location": "ap-southeast-1c"
+ },
+ {
+  "InstanceType": "i4g.2xlarge",
+  "Location": "ap-southeast-1c"
+ },
+ {
+  "InstanceType": "i4g.4xlarge",
+  "Location": "ap-southeast-1c"
+ },
+ {
+  "InstanceType": "i4g.large",
+  "Location": "ap-southeast-1c"
+ },
+ {
+  "InstanceType": "i4g.xlarge",
+  "Location": "ap-southeast-1c"
+ },
  {
   "InstanceType": "i4i.12xlarge",
   "Location": "ap-southeast-1c"

{moto-5.0.13.dev59 → moto-5.0.14.dev5}/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json

@@ -927,6 +927,38 @@
   "InstanceType": "g6.xlarge",
   "Location": "us-east-1a"
  },
+ {
+  "InstanceType": "g6e.12xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6e.16xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6e.24xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6e.2xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6e.48xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6e.4xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6e.8xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6e.xlarge",
+  "Location": "us-east-1a"
+ },
  {
   "InstanceType": "gr6.4xlarge",
   "Location": "us-east-1a"
@@ -4027,6 +4059,38 @@
   "InstanceType": "g6.xlarge",
   "Location": "us-east-1b"
  },
+ {
+  "InstanceType": "g6e.12xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6e.16xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6e.24xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6e.2xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6e.48xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6e.4xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6e.8xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6e.xlarge",
+  "Location": "us-east-1b"
+ },
  {
   "InstanceType": "gr6.4xlarge",
   "Location": "us-east-1b"
@@ -6035,6 +6099,10 @@
   "InstanceType": "u7in-16tb.224xlarge",
   "Location": "us-east-1b"
  },
+ {
+  "InstanceType": "u7in-24tb.224xlarge",
+  "Location": "us-east-1b"
+ },
  {
   "InstanceType": "u7in-32tb.224xlarge",
   "Location": "us-east-1b"
@@ -10199,6 +10267,38 @@
   "InstanceType": "g6.xlarge",
   "Location": "us-east-1d"
  },
+ {
+  "InstanceType": "g6e.12xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6e.16xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6e.24xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6e.2xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6e.48xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6e.4xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6e.8xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6e.xlarge",
+  "Location": "us-east-1d"
+ },
  {
   "InstanceType": "gr6.4xlarge",
   "Location": "us-east-1d"
@@ -10283,10 +10383,18 @@
   "InstanceType": "i3en.xlarge",
   "Location": "us-east-1d"
  },
+ {
+  "InstanceType": "i4i.12xlarge",
+  "Location": "us-east-1d"
+ },
  {
   "InstanceType": "i4i.16xlarge",
   "Location": "us-east-1d"
  },
+ {
+  "InstanceType": "i4i.24xlarge",
+  "Location": "us-east-1d"
+ },
  {
   "InstanceType": "i4i.2xlarge",
   "Location": "us-east-1d"
@@ -10315,6 +10423,30 @@
   "InstanceType": "i4i.xlarge",
   "Location": "us-east-1d"
  },
+ {
+  "InstanceType": "im4gn.16xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "im4gn.2xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "im4gn.4xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "im4gn.8xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "im4gn.large",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "im4gn.xlarge",
+  "Location": "us-east-1d"
+ },
  {
   "InstanceType": "inf1.24xlarge",
   "Location": "us-east-1d"

{moto-5.0.13.dev59 → moto-5.0.14.dev5}/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json

@@ -3783,6 +3783,38 @@
   "InstanceType": "g6.xlarge",
   "Location": "us-east-2b"
  },
+ {
+  "InstanceType": "g6e.12xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6e.16xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6e.24xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6e.2xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6e.48xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6e.4xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6e.8xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6e.xlarge",
+  "Location": "us-east-2b"
+ },
  {
   "InstanceType": "gr6.4xlarge",
   "Location": "us-east-2b"
@@ -6711,6 +6743,38 @@
   "InstanceType": "g6.xlarge",
   "Location": "us-east-2c"
  },
+ {
+  "InstanceType": "g6e.12xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6e.16xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6e.24xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6e.2xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6e.48xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6e.4xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6e.8xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6e.xlarge",
+  "Location": "us-east-2c"
+ },
  {
   "InstanceType": "gr6.4xlarge",
   "Location": "us-east-2c"

{moto-5.0.13.dev59 → moto-5.0.14.dev5}/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json

@@ -891,6 +891,38 @@
   "InstanceType": "g5g.xlarge",
   "Location": "us-west-2a"
  },
+ {
+  "InstanceType": "g6e.12xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6e.16xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6e.24xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6e.2xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6e.48xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6e.4xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6e.8xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6e.xlarge",
+  "Location": "us-west-2a"
+ },
  {
   "InstanceType": "i2.2xlarge",
   "Location": "us-west-2a"
@@ -3919,6 +3951,38 @@
   "InstanceType": "g6.xlarge",
   "Location": "us-west-2b"
  },
+ {
+  "InstanceType": "g6e.12xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "g6e.16xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "g6e.24xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "g6e.2xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "g6e.48xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "g6e.4xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "g6e.8xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "g6e.xlarge",
+  "Location": "us-west-2b"
+ },
  {
   "InstanceType": "gr6.4xlarge",
   "Location": "us-west-2b"
@@ -6775,6 +6839,26 @@
   "InstanceType": "c7gn.xlarge",
   "Location": "us-west-2c"
  },
+ {
+  "InstanceType": "c7i-flex.2xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "c7i-flex.4xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "c7i-flex.8xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "c7i-flex.large",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "c7i-flex.xlarge",
+  "Location": "us-west-2c"
+ },
  {
   "InstanceType": "c7i.12xlarge",
   "Location": "us-west-2c"
@@ -7039,6 +7123,38 @@
   "InstanceType": "g6.xlarge",
   "Location": "us-west-2c"
  },
+ {
+  "InstanceType": "g6e.12xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6e.16xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6e.24xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6e.2xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6e.48xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6e.4xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6e.8xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6e.xlarge",
+  "Location": "us-west-2c"
+ },
  {
   "InstanceType": "gr6.4xlarge",
   "Location": "us-west-2c"
@@ -9907,6 +10023,38 @@
   "InstanceType": "g6.xlarge",
   "Location": "us-west-2d"
  },
+ {
+  "InstanceType": "g6e.12xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6e.16xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6e.24xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6e.2xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6e.48xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6e.4xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6e.8xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6e.xlarge",
+  "Location": "us-west-2d"
+ },
  {
   "InstanceType": "gr6.4xlarge",
   "Location": "us-west-2d"

{moto-5.0.13.dev59 → moto-5.0.14.dev5}/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json

@@ -5947,6 +5947,26 @@
   "InstanceType": "i3en.xlarge",
   "Location": "apse1-az3"
  },
+ {
+  "InstanceType": "i4g.16xlarge",
+  "Location": "apse1-az3"
+ },
+ {
+  "InstanceType": "i4g.2xlarge",
+  "Location": "apse1-az3"
+ },
+ {
+  "InstanceType": "i4g.4xlarge",
+  "Location": "apse1-az3"
+ },
+ {
+  "InstanceType": "i4g.large",
+  "Location": "apse1-az3"
+ },
+ {
+  "InstanceType": "i4g.xlarge",
+  "Location": "apse1-az3"
+ },
  {
   "InstanceType": "i4i.12xlarge",
   "Location": "apse1-az3"