Deprecate mock_dynamodb2 (#4919)

getmoto · Mar 9, 2022 · 07913cf · 07913cf
1 parent 9dccebc
commit 07913cf
Show file tree

Hide file tree

Showing 58 changed files with 10,076 additions and 9,867 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -6,7 +6,7 @@ include moto/ec2/resources/instance_types.json
 include moto/ec2/resources/instance_type_offerings/*/*.json
 include moto/ec2/resources/amis.json
 include moto/cognitoidp/resources/*.json
-include moto/dynamodb2/parsing/reserved_keywords.txt
+include moto/dynamodb/parsing/reserved_keywords.txt
 include moto/ssm/resources/*.json
 include moto/support/resources/*.json
 recursive-include moto/moto_server *

diff --git a/docs/docs/services/dynamodb.rst b/docs/docs/services/dynamodb.rst
@@ -16,8 +16,8 @@ dynamodb
 
 .. sourcecode:: python
 
-            @mock_dynamodb2
-            def test_dynamodb2_behaviour:
+            @mock_dynamodb
+            def test_dynamodb_behaviour:
                 boto3.client("dynamodb")
                 ...
 

diff --git a/moto/__init__.py b/moto/__init__.py
@@ -53,7 +53,7 @@ def f(*args, **kwargs):
 mock_budgets = lazy_load(".budgets", "mock_budgets")
 mock_cloudformation = lazy_load(".cloudformation", "mock_cloudformation")
 mock_cloudfront = lazy_load(".cloudfront", "mock_cloudfront")
-mock_cloudtrail = lazy_load(".cloudtrail", "mock_cloudtrail", boto3_name="cloudtrail")
+mock_cloudtrail = lazy_load(".cloudtrail", "mock_cloudtrail")
 mock_cloudwatch = lazy_load(".cloudwatch", "mock_cloudwatch")
 mock_codecommit = lazy_load(".codecommit", "mock_codecommit")
 mock_codepipeline = lazy_load(".codepipeline", "mock_codepipeline")
@@ -67,9 +67,11 @@ def f(*args, **kwargs):
 mock_datasync = lazy_load(".datasync", "mock_datasync")
 mock_dax = lazy_load(".dax", "mock_dax")
 mock_dms = lazy_load(".dms", "mock_dms")
-mock_ds = lazy_load(".ds", "mock_ds", boto3_name="ds")
-mock_dynamodb = lazy_load(".dynamodb", "mock_dynamodb", warn_repurpose=True)
-mock_dynamodb2 = lazy_load(".dynamodb2", "mock_dynamodb2", backend="dynamodb_backends2")
+mock_ds = lazy_load(".ds", "mock_ds")
+mock_dynamodb = lazy_load(".dynamodb", "mock_dynamodb")
+mock_dynamodb2 = lazy_load(
+    ".dynamodb", "mock_dynamodb", use_instead=("mock_dynamodb2", "mock_dynamodb")
+)
 mock_dynamodbstreams = lazy_load(".dynamodbstreams", "mock_dynamodbstreams")
 mock_elasticbeanstalk = lazy_load(
     ".elasticbeanstalk", "mock_elasticbeanstalk", backend="eb_backends"

diff --git a/moto/awslambda/models.py b/moto/awslambda/models.py
@@ -45,7 +45,7 @@
     split_layer_arn,
 )
 from moto.sqs import sqs_backends
-from moto.dynamodb2 import dynamodb_backends2
+from moto.dynamodb import dynamodb_backends
 from moto.dynamodbstreams import dynamodbstreams_backends
 from moto.core import ACCOUNT_ID
 from moto.utilities.docker_utilities import DockerModel, parse_image_ref
@@ -1259,7 +1259,7 @@ def create_event_source_mapping(self, spec):
                 esm = EventSourceMapping(spec)
                 self._event_source_mappings[esm.uuid] = esm
                 table_name = stream["TableName"]
-                table = dynamodb_backends2[self.region_name].get_table(table_name)
+                table = dynamodb_backends[self.region_name].get_table(table_name)
                 table.lambda_event_source_mappings[esm.function_arn] = esm
                 return esm
         raise RESTError("ResourceNotFoundException", "Invalid EventSourceArn")

diff --git a/moto/backends.py b/moto/backends.py
@@ -10,6 +10,7 @@
 ]
 decorator_functions = [getattr(moto, f) for f in decorators]
 BACKENDS = {f.boto3_name: (f.name, f.backend) for f in decorator_functions}
+BACKENDS["dynamodb_v20111205"] = ("dynamodb_v20111205", "dynamodb_backends")
 BACKENDS["moto_api"] = ("core", "moto_api_backends")
 BACKENDS["instance_metadata"] = ("instance_metadata", "instance_metadata_backends")
 BACKENDS["s3bucket_path"] = ("s3", "s3_backends")

diff --git a/moto/cloudformation/parsing.py b/moto/cloudformation/parsing.py
@@ -21,7 +21,7 @@
 from moto.cloudformation.custom_model import CustomModel
 from moto.cloudwatch import models  # noqa  # pylint: disable=all
 from moto.datapipeline import models  # noqa  # pylint: disable=all
-from moto.dynamodb2 import models  # noqa  # pylint: disable=all
+from moto.dynamodb import models  # noqa  # pylint: disable=all
 from moto.ec2 import models as ec2_models
 from moto.ecr import models  # noqa  # pylint: disable=all
 from moto.ecs import models  # noqa  # pylint: disable=all

diff --git a/moto/dynamodb/__init__.py b/moto/dynamodb/__init__.py
@@ -1,4 +1,5 @@
-from .models import dynamodb_backend
+from moto.dynamodb.models import dynamodb_backends
+from ..core.models import base_decorator
 
-dynamodb_backends = {"global": dynamodb_backend}
-mock_dynamodb = dynamodb_backend.decorator
+dynamodb_backend = dynamodb_backends["us-east-1"]
+mock_dynamodb = base_decorator(dynamodb_backends)