moto 4.2.13.dev15__tar.gz → 4.2.13.dev17__tar.gz

{moto-4.2.13.dev15/moto.egg-info → moto-4.2.13.dev17}/PKG-INFO

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

{moto-4.2.13.dev15 → moto-4.2.13.dev17}/moto/__init__.py

@@ -254,11 +254,8 @@ class MockAll(ContextDecorator):
 
 mock_all = MockAll
 
-# import logging
-# logging.getLogger('boto').setLevel(logging.CRITICAL)
-
 __title__ = "moto"
-__version__ = "4.2.13.dev15"
+__version__ = "4.2.13.dev17"
 
 
 try:

{moto-4.2.13.dev15 → moto-4.2.13.dev17}/moto/batch/models.py

@@ -22,7 +22,6 @@ from moto.ecs.models import EC2ContainerServiceBackend, ecs_backends
 from moto.iam.exceptions import IAMNotFoundException
 from moto.iam.models import IAMBackend, iam_backends
 from moto.logs.models import LogsBackend, logs_backends
-from moto.moto_api import state_manager
 from moto.moto_api._internal import mock_random
 from moto.moto_api._internal.managed_state_model import ManagedState
 from moto.utilities.docker_utilities import DockerModel
@@ -1014,10 +1013,6 @@ class BatchBackend(BaseBackend):
         self._jobs: Dict[str, Job] = {}
         self._scheduling_policies: Dict[str, SchedulingPolicy] = {}
 
-        state_manager.register_default_transition(
-            "batch::job", transition={"progression": "manual", "times": 1}
-        )
-
     @property
     def iam_backend(self) -> IAMBackend:
         """

{moto-4.2.13.dev15 → moto-4.2.13.dev17}/moto/cloudfront/models.py

@@ -3,7 +3,6 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple
 
 from moto.core import BackendDict, BaseBackend, BaseModel
 from moto.core.utils import iso_8601_datetime_with_milliseconds
-from moto.moto_api import state_manager
 from moto.moto_api._internal import mock_random as random
 from moto.moto_api._internal.managed_state_model import ManagedState
 from moto.utilities.tagging_service import TaggingService
@@ -271,10 +270,6 @@ class CloudFrontBackend(BaseBackend):
         self.origin_access_controls: Dict[str, OriginAccessControl] = dict()
         self.tagger = TaggingService()
 
-        state_manager.register_default_transition(
-            "cloudfront::distribution", transition={"progression": "manual", "times": 1}
-        )
-
     def create_distribution(
         self, distribution_config: Dict[str, Any], tags: List[Dict[str, str]]
     ) -> Tuple[Distribution, str, str]:

{moto-4.2.13.dev15 → moto-4.2.13.dev17}/moto/cognitoidp/models.py

@@ -2162,6 +2162,10 @@ class RegionAgnosticBackend:
     # Without authentication-header, we lose the context of which region the request was send to
     # This backend will cycle through all backends as a workaround
 
+    def __init__(self, account_id: str, region_name: str):
+        self.account_id = account_id
+        self.region_name = region_name
+
     def _find_backend_by_access_token(self, access_token: str) -> CognitoIdpBackend:
         for account_specific_backends in cognitoidp_backends.values():
             for region, backend in account_specific_backends.items():
@@ -2170,7 +2174,7 @@ class RegionAgnosticBackend:
                 for p in backend.user_pools.values():
                     if access_token in p.access_tokens:
                         return backend
-        return backend
+        return cognitoidp_backends[self.account_id][self.region_name]
 
     def _find_backend_for_clientid(self, client_id: str) -> CognitoIdpBackend:
         for account_specific_backends in cognitoidp_backends.values():
@@ -2180,7 +2184,7 @@ class RegionAgnosticBackend:
                 for p in backend.user_pools.values():
                     if client_id in p.clients:
                         return backend
-        return backend
+        return cognitoidp_backends[self.account_id][self.region_name]
 
     def sign_up(
         self,
@@ -2237,7 +2241,9 @@ cognitoidp_backends = BackendDict(CognitoIdpBackend, "cognito-idp")
 # Hack to help moto-server process requests on localhost, where the region isn't
 # specified in the host header. Some endpoints (change password, confirm forgot
 # password) have no authorization header from which to extract the region.
-def find_account_region_by_value(key: str, value: str) -> Tuple[str, str]:
+def find_account_region_by_value(
+    key: str, value: str, fallback: Tuple[str, str]
+) -> Tuple[str, str]:
     for account_id, account_specific_backend in cognitoidp_backends.items():
         for region, backend in account_specific_backend.items():
             for user_pool in backend.user_pools.values():
@@ -2249,4 +2255,4 @@ def find_account_region_by_value(key: str, value: str) -> Tuple[str, str]:
     # If we can't find the `client_id` or `access_token`, we just pass
     # back a default backend region, which will raise the appropriate
     # error message (e.g. NotAuthorized or NotFound).
-    return account_id, region
+    return fallback

{moto-4.2.13.dev15 → moto-4.2.13.dev17}/moto/cognitoidp/responses.py

@@ -14,13 +14,14 @@ from .models import (
     find_account_region_by_value,
 )
 
-region_agnostic_backend = RegionAgnosticBackend()
-
 
 class CognitoIdpResponse(BaseResponse):
     def __init__(self) -> None:
         super().__init__(service_name="cognito-idp")
 
+    def _get_region_agnostic_backend(self) -> RegionAgnosticBackend:
+        return RegionAgnosticBackend(self.current_account, self.region)
+
     @property
     def parameters(self) -> Dict[str, Any]:  # type: ignore[misc]
         return json.loads(self.body)
@@ -353,7 +354,7 @@ class CognitoIdpResponse(BaseResponse):
 
     def get_user(self) -> str:
         access_token = self._get_param("AccessToken")
-        user = region_agnostic_backend.get_user(access_token=access_token)
+        user = self._get_region_agnostic_backend().get_user(access_token=access_token)
         return json.dumps(user.to_json(extended=True, attributes_key="UserAttributes"))
 
     def list_users(self) -> str:
@@ -454,7 +455,8 @@ class CognitoIdpResponse(BaseResponse):
         client_id = self._get_param("ClientId")
         challenge_name = self._get_param("ChallengeName")
         challenge_responses = self._get_param("ChallengeResponses")
-        auth_result = region_agnostic_backend.admin_respond_to_auth_challenge(
+        backend = self._get_region_agnostic_backend()
+        auth_result = backend.admin_respond_to_auth_challenge(
             session, client_id, challenge_name, challenge_responses
         )
 
@@ -465,7 +467,7 @@ class CognitoIdpResponse(BaseResponse):
         client_id = self._get_param("ClientId")
         challenge_name = self._get_param("ChallengeName")
         challenge_responses = self._get_param("ChallengeResponses")
-        auth_result = region_agnostic_backend.respond_to_auth_challenge(
+        auth_result = self._get_region_agnostic_backend().respond_to_auth_challenge(
             session, client_id, challenge_name, challenge_responses
         )
 
@@ -474,7 +476,9 @@ class CognitoIdpResponse(BaseResponse):
     def forgot_password(self) -> str:
         client_id = self._get_param("ClientId")
         username = self._get_param("Username")
-        account, region = find_account_region_by_value("client_id", client_id)
+        account, region = find_account_region_by_value(
+            "client_id", client_id, fallback=(self.current_account, self.region)
+        )
         confirmation_code, response = cognitoidp_backends[account][
             region
         ].forgot_password(client_id, username)
@@ -492,7 +496,9 @@ class CognitoIdpResponse(BaseResponse):
         username = self._get_param("Username")
         password = self._get_param("Password")
         confirmation_code = self._get_param("ConfirmationCode")
-        account, region = find_account_region_by_value("client_id", client_id)
+        account, region = find_account_region_by_value(
+            "client_id", client_id, fallback=(self.current_account, self.region)
+        )
         cognitoidp_backends[account][region].confirm_forgot_password(
             client_id, username, password, confirmation_code
         )
@@ -503,7 +509,9 @@ class CognitoIdpResponse(BaseResponse):
         access_token = self._get_param("AccessToken")
         previous_password = self._get_param("PreviousPassword")
         proposed_password = self._get_param("ProposedPassword")
-        account, region = find_account_region_by_value("access_token", access_token)
+        account, region = find_account_region_by_value(
+            "access_token", access_token, fallback=(self.current_account, self.region)
+        )
         cognitoidp_backends[account][region].change_password(
             access_token, previous_password, proposed_password
         )
@@ -573,7 +581,7 @@ class CognitoIdpResponse(BaseResponse):
         client_id = self._get_param("ClientId")
         username = self._get_param("Username")
         password = self._get_param("Password")
-        user = region_agnostic_backend.sign_up(
+        user = self._get_region_agnostic_backend().sign_up(
             client_id=client_id,
             username=username,
             password=password,
@@ -589,7 +597,9 @@ class CognitoIdpResponse(BaseResponse):
     def confirm_sign_up(self) -> str:
         client_id = self._get_param("ClientId")
         username = self._get_param("Username")
-        region_agnostic_backend.confirm_sign_up(client_id=client_id, username=username)
+        self._get_region_agnostic_backend().confirm_sign_up(
+            client_id=client_id, username=username
+        )
         return ""
 
     def initiate_auth(self) -> str:
@@ -597,7 +607,7 @@ class CognitoIdpResponse(BaseResponse):
         auth_flow = self._get_param("AuthFlow")
         auth_parameters = self._get_param("AuthParameters")
 
-        auth_result = region_agnostic_backend.initiate_auth(
+        auth_result = self._get_region_agnostic_backend().initiate_auth(
             client_id, auth_flow, auth_parameters
         )
 

{moto-4.2.13.dev15 → moto-4.2.13.dev17}/moto/dax/models.py

@@ -3,7 +3,6 @@ from typing import Any, Dict, Iterable, List
 
 from moto.core import BackendDict, BaseBackend, BaseModel
 from moto.core.utils import unix_time
-from moto.moto_api import state_manager
 from moto.moto_api._internal import mock_random as random
 from moto.moto_api._internal.managed_state_model import ManagedState
 from moto.utilities.paginator import paginate
@@ -167,10 +166,6 @@ class DAXBackend(BaseBackend):
         self._clusters: Dict[str, DaxCluster] = dict()
         self._tagger = TaggingService()
 
-        state_manager.register_default_transition(
-            model_name="dax::cluster", transition={"progression": "manual", "times": 4}
-        )
-
     @property
     def clusters(self) -> Dict[str, DaxCluster]:
         self._clusters = {

{moto-4.2.13.dev15 → moto-4.2.13.dev17}/moto/ec2/models/vpcs.py

@@ -36,6 +36,50 @@ from ..utils import (
 from .availability_zones_and_regions import RegionsAndZonesBackend
 from .core import TaggedEC2Resource
 
+# We used to load the entirety of Moto into memory, and check every module if it's supported
+# But having a fixed list is much more performant
+# Maintaining it is more difficult, but the contents of this list does not change very often
+IMPLEMENTED_ENDPOINT_SERVICES = [
+    "acm",
+    "applicationautoscaling",
+    "athena",
+    "autoscaling",
+    "lambda",
+    "cloudformation",
+    "cloudwatch",
+    "codecommit",
+    "codepipeline",
+    "config",
+    "datasync",
+    "dms",
+    "ds",
+    "dynamodb",
+    "ec2",
+    "ecr",
+    "ecs",
+    "elasticbeanstalk",
+    "elbv2",
+    "emr",
+    "events",
+    "firehose",
+    "glue",
+    "iot",
+    "kinesis",
+    "kms",
+    "logs",
+    "rds",
+    "redshift",
+    "route53resolver",
+    "s3",
+    "sagemaker",
+    "secretsmanager",
+    "sns",
+    "sqs",
+    "ssm",
+    "sts",
+    "transcribe",
+    "xray",
+]
 MAX_NUMBER_OF_ENDPOINT_SERVICES_RESULTS = 1000
 DEFAULT_VPC_ENDPOINT_SERVICES: List[Dict[str, str]] = []
 
@@ -725,7 +769,8 @@ class VPCBackend:
 
         from moto import backends  # pylint: disable=import-outside-toplevel
 
-        for _backends in backends.service_backends():
+        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(

{moto-4.2.13.dev15 → moto-4.2.13.dev17}/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json

@@ -227,6 +227,46 @@
   "InstanceType": "c6i.xlarge",
   "Location": "ap-east-1a"
  },
+ {
+  "InstanceType": "c6in.12xlarge",
+  "Location": "ap-east-1a"
+ },
+ {
+  "InstanceType": "c6in.16xlarge",
+  "Location": "ap-east-1a"
+ },
+ {
+  "InstanceType": "c6in.24xlarge",
+  "Location": "ap-east-1a"
+ },
+ {
+  "InstanceType": "c6in.2xlarge",
+  "Location": "ap-east-1a"
+ },
+ {
+  "InstanceType": "c6in.32xlarge",
+  "Location": "ap-east-1a"
+ },
+ {
+  "InstanceType": "c6in.4xlarge",
+  "Location": "ap-east-1a"
+ },
+ {
+  "InstanceType": "c6in.8xlarge",
+  "Location": "ap-east-1a"
+ },
+ {
+  "InstanceType": "c6in.large",
+  "Location": "ap-east-1a"
+ },
+ {
+  "InstanceType": "c6in.metal",
+  "Location": "ap-east-1a"
+ },
+ {
+  "InstanceType": "c6in.xlarge",
+  "Location": "ap-east-1a"
+ },
  {
   "InstanceType": "d2.2xlarge",
   "Location": "ap-east-1a"
@@ -995,6 +1035,46 @@
   "InstanceType": "c6i.xlarge",
   "Location": "ap-east-1b"
  },
+ {
+  "InstanceType": "c6in.12xlarge",
+  "Location": "ap-east-1b"
+ },
+ {
+  "InstanceType": "c6in.16xlarge",
+  "Location": "ap-east-1b"
+ },
+ {
+  "InstanceType": "c6in.24xlarge",
+  "Location": "ap-east-1b"
+ },
+ {
+  "InstanceType": "c6in.2xlarge",
+  "Location": "ap-east-1b"
+ },
+ {
+  "InstanceType": "c6in.32xlarge",
+  "Location": "ap-east-1b"
+ },
+ {
+  "InstanceType": "c6in.4xlarge",
+  "Location": "ap-east-1b"
+ },
+ {
+  "InstanceType": "c6in.8xlarge",
+  "Location": "ap-east-1b"
+ },
+ {
+  "InstanceType": "c6in.large",
+  "Location": "ap-east-1b"
+ },
+ {
+  "InstanceType": "c6in.metal",
+  "Location": "ap-east-1b"
+ },
+ {
+  "InstanceType": "c6in.xlarge",
+  "Location": "ap-east-1b"
+ },
  {
   "InstanceType": "d2.2xlarge",
   "Location": "ap-east-1b"
@@ -1779,6 +1859,46 @@
   "InstanceType": "c6i.xlarge",
   "Location": "ap-east-1c"
  },
+ {
+  "InstanceType": "c6in.12xlarge",
+  "Location": "ap-east-1c"
+ },
+ {
+  "InstanceType": "c6in.16xlarge",
+  "Location": "ap-east-1c"
+ },
+ {
+  "InstanceType": "c6in.24xlarge",
+  "Location": "ap-east-1c"
+ },
+ {
+  "InstanceType": "c6in.2xlarge",
+  "Location": "ap-east-1c"
+ },
+ {
+  "InstanceType": "c6in.32xlarge",
+  "Location": "ap-east-1c"
+ },
+ {
+  "InstanceType": "c6in.4xlarge",
+  "Location": "ap-east-1c"
+ },
+ {
+  "InstanceType": "c6in.8xlarge",
+  "Location": "ap-east-1c"
+ },
+ {
+  "InstanceType": "c6in.large",
+  "Location": "ap-east-1c"
+ },
+ {
+  "InstanceType": "c6in.metal",
+  "Location": "ap-east-1c"
+ },
+ {
+  "InstanceType": "c6in.xlarge",
+  "Location": "ap-east-1c"
+ },
  {
   "InstanceType": "d2.2xlarge",
   "Location": "ap-east-1c"

{moto-4.2.13.dev15 → moto-4.2.13.dev17}/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json

@@ -2247,6 +2247,46 @@
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-northeast-1a"
  },
+ {
+  "InstanceType": "r7iz.12xlarge",
+  "Location": "ap-northeast-1a"
+ },
+ {
+  "InstanceType": "r7iz.16xlarge",
+  "Location": "ap-northeast-1a"
+ },
+ {
+  "InstanceType": "r7iz.2xlarge",
+  "Location": "ap-northeast-1a"
+ },
+ {
+  "InstanceType": "r7iz.32xlarge",
+  "Location": "ap-northeast-1a"
+ },
+ {
+  "InstanceType": "r7iz.4xlarge",
+  "Location": "ap-northeast-1a"
+ },
+ {
+  "InstanceType": "r7iz.8xlarge",
+  "Location": "ap-northeast-1a"
+ },
+ {
+  "InstanceType": "r7iz.large",
+  "Location": "ap-northeast-1a"
+ },
+ {
+  "InstanceType": "r7iz.metal-16xl",
+  "Location": "ap-northeast-1a"
+ },
+ {
+  "InstanceType": "r7iz.metal-32xl",
+  "Location": "ap-northeast-1a"
+ },
+ {
+  "InstanceType": "r7iz.xlarge",
+  "Location": "ap-northeast-1a"
+ },
  {
   "InstanceType": "t1.micro",
   "Location": "ap-northeast-1a"
@@ -4719,6 +4759,46 @@
   "InstanceType": "r7gd.xlarge",
   "Location": "ap-northeast-1c"
  },
+ {
+  "InstanceType": "r7iz.12xlarge",
+  "Location": "ap-northeast-1c"
+ },
+ {
+  "InstanceType": "r7iz.16xlarge",
+  "Location": "ap-northeast-1c"
+ },
+ {
+  "InstanceType": "r7iz.2xlarge",
+  "Location": "ap-northeast-1c"
+ },
+ {
+  "InstanceType": "r7iz.32xlarge",
+  "Location": "ap-northeast-1c"
+ },
+ {
+  "InstanceType": "r7iz.4xlarge",
+  "Location": "ap-northeast-1c"
+ },
+ {
+  "InstanceType": "r7iz.8xlarge",
+  "Location": "ap-northeast-1c"
+ },
+ {
+  "InstanceType": "r7iz.large",
+  "Location": "ap-northeast-1c"
+ },
+ {
+  "InstanceType": "r7iz.metal-16xl",
+  "Location": "ap-northeast-1c"
+ },
+ {
+  "InstanceType": "r7iz.metal-32xl",
+  "Location": "ap-northeast-1c"
+ },
+ {
+  "InstanceType": "r7iz.xlarge",
+  "Location": "ap-northeast-1c"
+ },
  {
   "InstanceType": "t1.micro",
   "Location": "ap-northeast-1c"