moto 5.0.13.dev5__tar.gz → 5.0.13.dev7__tar.gz

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

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

{moto-5.0.13.dev5 → moto-5.0.13.dev7}/moto/__init__.py

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

{moto-5.0.13.dev5 → moto-5.0.13.dev7}/moto/dynamodb/exceptions.py

@@ -327,6 +327,14 @@ class TableNotFoundException(JsonRESTError):
         super().__init__(err, f"Table not found: {name}")
 
 
+class PointInTimeRecoveryUnavailable(JsonRESTError):
+    def __init__(self, name: str):
+        err = ERROR_TYPE_PREFIX + "PointInTimeRecoveryUnavailableException"
+        super().__init__(
+            err, f"Point in time recovery is not enabled for table '{name}'"
+        )
+
+
 class SourceTableNotFoundException(JsonRESTError):
     def __init__(self, source_table_name: str):
         er = ERROR_TYPE_PREFIX + "SourceTableNotFoundException"

{moto-5.0.13.dev5 → moto-5.0.13.dev7}/moto/dynamodb/models/__init__.py

@@ -19,6 +19,7 @@ from moto.dynamodb.exceptions import (
     ItemSizeToUpdateTooLarge,
     MockValidationException,
     MultipleTransactionsException,
+    PointInTimeRecoveryUnavailable,
     ResourceInUseException,
     ResourceNotFoundException,
     SourceTableNotFoundException,
@@ -1014,12 +1015,24 @@ class DynamoDBBackend(BaseBackend):
         Only exports one file following DYNAMODB_JSON format to the s3 location. Other files aren't created.
         Incremental export is also not supported.
         """
+        table = next(
+            (t for t in self.tables.values() if t.table_arn == table_arn), None
+        )
+        if not table:
+            raise TableNotFoundException(name=table_arn)
+        if (
+            table.continuous_backups["PointInTimeRecoveryDescription"][
+                "PointInTimeRecoveryStatus"
+            ]
+            != "ENABLED"
+        ):
+            raise PointInTimeRecoveryUnavailable(name=table_arn.split("/")[-1])
         table_export = TableExport(
             s3_bucket=s3_bucket,
             s3_prefix=s3_prefix,
             region_name=self.region_name,
             account_id=s3_bucket_owner if s3_bucket_owner else self.account_id,
-            table_arn=table_arn,
+            table=table,
             export_format=export_format,
             export_type=export_type,
         )
@@ -1033,7 +1046,7 @@ class DynamoDBBackend(BaseBackend):
     def list_exports(self, table_arn: str) -> List[TableExport]:
         exports = []
         for export_arn in self.table_exports:
-            if self.table_exports[export_arn].table_arn == table_arn:
+            if self.table_exports[export_arn].table.table_arn == table_arn:
                 exports.append(self.table_exports[export_arn])
         return exports
 

{moto-5.0.13.dev5 → moto-5.0.13.dev7}/moto/dynamodb/models/dynamo_type.py

@@ -315,7 +315,7 @@ class Item(BaseModel):
     def size(self) -> int:
         return sum(bytesize(key) + value.size() for key, value in self.attrs.items())
 
-    def to_json(self) -> Dict[str, Any]:
+    def to_json(self, root_attr_name: str = "Attributes") -> Dict[str, Any]:
         attributes: Dict[str, Any] = {}
         for attribute_key, attribute in self.attrs.items():
             if isinstance(attribute.value, dict):
@@ -333,7 +333,7 @@ class Item(BaseModel):
             else:
                 attributes[attribute_key] = {attribute.type: attribute.value}
 
-        return {"Attributes": attributes}
+        return {root_attr_name: attributes}
 
     def to_regular_json(self) -> Dict[str, Any]:
         attributes = {}

{moto-5.0.13.dev5 → moto-5.0.13.dev7}/moto/dynamodb/models/table_export.py

@@ -18,14 +18,14 @@ class TableExport(Thread):
         s3_prefix: str,
         region_name: str,
         account_id: str,
-        table_arn: str,
+        table: "Table",
         export_format: str,
         export_type: str,
     ):
         super().__init__()
         self.partition = get_partition(region_name)
-        self.table_arn = table_arn
-        self.arn = f"arn:{self.partition}:dynamodb:{region_name}:{account_id}:table/{table_arn}/import/{str(uuid4()).replace('-', '')}"
+        self.table = table
+        self.arn = f"arn:{self.partition}:dynamodb:{region_name}:{account_id}:table/{table.table_arn}/import/{str(uuid4()).replace('-', '')}"
         self.s3_bucket = s3_bucket
         self.s3_prefix = s3_prefix
         self.status = "IN_PROGRESS"
@@ -36,15 +36,11 @@ class TableExport(Thread):
 
         self.failure_code: Optional[str] = None
         self.failure_message: Optional[str] = None
-        self.table_name: str = ""
         self.item_count = 0
         self.processed_bytes = 0
         self.error_count = 0
 
     def run(self) -> None:
-        from moto.dynamodb.models import dynamodb_backends
-
-        dynamodb_backend = dynamodb_backends[self.account_id][self.region_name]
         try:
             from moto.s3.models import s3_backends
 
@@ -57,40 +53,21 @@ class TableExport(Thread):
             self.failure_message = "The specified bucket does not exist"
             return
 
-        for key in dynamodb_backend.tables:
-            if dynamodb_backend.tables[key].table_arn == self.table_arn:
-                self.table_name = key
-        if not self.table_name:
-            self.status = "FAILED"
-            self.failure_code = "DynamoDBTableNotFound"
-            self.failure_message = "The specified table does not exist"
-            return
-        table = dynamodb_backend.tables[self.table_name]
-        if (
-            table.continuous_backups["PointInTimeRecoveryDescription"][
-                "PointInTimeRecoveryStatus"
-            ]
-            != "ENABLED"
-        ):
-            self.status = "FAILED"
-            self.failure_code = "PointInTimeRecoveryUnavailable"
-            self.failure_message = "Point in time recovery not enabled for table"
-            return
         try:
-            self._backup_to_s3_file(s3_backend, table)
+            self._backup_to_s3_file(s3_backend)
         except Exception as e:
             self.status = "FAILED"
             self.failure_code = "UNKNOWN"
             self.failure_message = str(e)
 
-    def _backup_to_s3_file(self, s3_backend: "S3Backend", table: "Table") -> None:
-        backup = []
-        for item in table.all_items():
-            json_item = item.to_json()
-            backup.append(json_item)
+    def _backup_to_s3_file(self, s3_backend: "S3Backend") -> None:
+        backup = ""
+        for item in self.table.all_items():
+            json_item = item.to_json(root_attr_name="Item")
+            backup += json.dumps(json_item) + "\n"
             self.processed_bytes += len(json_item)
-        self.item_count = len(backup)
-        content = gzip_compress(json.dumps(backup).encode("utf-8"))
+            self.item_count += 1
+        content = gzip_compress(backup.encode("utf-8"))
         s3_backend.put_object(
             bucket_name=self.s3_bucket,
             key_name=f"{self.s3_prefix}/AWSDynamoDB/{str(uuid4())}/data/{str(uuid4())}.gz",

{moto-5.0.13.dev5 → moto-5.0.13.dev7}/moto/ssm/resources/regions.json

@@ -1048,7 +1048,7 @@
                   "Value": "api.mediatailor.af-south-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "meteringmarketplace": {
@@ -1183,6 +1183,15 @@
               "privatelink": {
                 "Value": "privatelink"
               },
+              "quicksight": {
+                "Value": "quicksight",
+                "endpoint": {
+                  "Value": "quicksight.af-south-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "ram": {
                 "Value": "ram",
                 "endpoint": {
@@ -5078,7 +5087,7 @@
                   "Value": "api.mediatailor.ap-northeast-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "memorydb": {
@@ -5294,6 +5303,9 @@
                   "Value": "HTTPS"
                 }
               },
+              "payment-cryptography": {
+                "Value": "payment-cryptography"
+              },
               "pca-connector-ad": {
                 "Value": "pca-connector-ad",
                 "endpoint": {
@@ -7637,7 +7649,7 @@
                   "Value": "api.mediatailor.ap-northeast-2.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "memorydb": {
@@ -9494,7 +9506,7 @@
                   "Value": "api.mediatailor.ap-northeast-3.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "meteringmarketplace": {
@@ -11564,7 +11576,7 @@
                   "Value": "api.mediatailor.ap-south-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "memorydb": {
@@ -13224,7 +13236,7 @@
                   "Value": "api.mediatailor.ap-south-2.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "meteringmarketplace": {
@@ -15372,7 +15384,7 @@
                   "Value": "api.mediatailor.ap-southeast-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "memorydb": {
@@ -15573,6 +15585,9 @@
                   "Value": "HTTPS"
                 }
               },
+              "payment-cryptography": {
+                "Value": "payment-cryptography"
+              },
               "pca-connector-ad": {
                 "Value": "pca-connector-ad",
                 "endpoint": {
@@ -18075,7 +18090,7 @@
                   "Value": "api.mediatailor.ap-southeast-2.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "medical-imaging": {
@@ -20116,6 +20131,15 @@
               "privatelink": {
                 "Value": "privatelink"
               },
+              "quicksight": {
+                "Value": "quicksight",
+                "endpoint": {
+                  "Value": "quicksight.ap-southeast-3.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "ram": {
                 "Value": "ram",
                 "endpoint": {
@@ -21338,7 +21362,7 @@
                   "Value": "api.mediatailor.ap-southeast-4.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "meteringmarketplace": {
@@ -23295,7 +23319,7 @@
                   "Value": "api.mediatailor.ca-central-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "memorydb": {
@@ -24864,6 +24888,9 @@
                   "Value": "HTTPS"
                 }
               },
+              "notifications": {
+                "Value": "notifications"
+              },
               "oam": {
                 "Value": "oam",
                 "endpoint": {
@@ -29780,7 +29807,7 @@
                   "Value": "api.mediatailor.eu-central-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "memorydb": {
@@ -29999,6 +30026,9 @@
                   "Value": "HTTPS"
                 }
               },
+              "payment-cryptography": {
+                "Value": "payment-cryptography"
+              },
               "pca-connector-ad": {
                 "Value": "pca-connector-ad",
                 "endpoint": {
@@ -31733,6 +31763,15 @@
               "privatelink": {
                 "Value": "privatelink"
               },
+              "quicksight": {
+                "Value": "quicksight",
+                "endpoint": {
+                  "Value": "quicksight.eu-central-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "ram": {
                 "Value": "ram",
                 "endpoint": {
@@ -32667,6 +32706,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "dax": {
+                "Value": "dax",
+                "endpoint": {
+                  "Value": "dax.eu-north-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS, HTTP"
+                }
+              },
               "detective": {
                 "Value": "detective",
                 "endpoint": {
@@ -33411,7 +33459,7 @@
                   "Value": "api.mediatailor.eu-north-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "memorydb": {
@@ -35305,6 +35353,15 @@
               "privatelink": {
                 "Value": "privatelink"
               },
+              "quicksight": {
+                "Value": "quicksight",
+                "endpoint": {
+                  "Value": "quicksight.eu-south-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "ram": {
                 "Value": "ram",
                 "endpoint": {
@@ -36092,6 +36149,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "dax": {
+                "Value": "dax",
+                "endpoint": {
+                  "Value": "dax.eu-south-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS, HTTP"
+                }
+              },
               "directconnect": {
                 "Value": "directconnect",
                 "endpoint": {
@@ -38814,7 +38880,7 @@
                   "Value": "api.mediatailor.eu-west-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "medical-imaging": {
@@ -39060,6 +39126,9 @@
                   "Value": "HTTPS"
                 }
               },
+              "payment-cryptography": {
+                "Value": "payment-cryptography"
+              },
               "pca-connector-ad": {
                 "Value": "pca-connector-ad",
                 "endpoint": {
@@ -43687,7 +43756,7 @@
                   "Value": "api.mediatailor.eu-west-3.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "memorydb": {
@@ -46665,7 +46734,7 @@
                   "Value": "api.mediatailor.me-central-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "meteringmarketplace": {
@@ -50111,7 +50180,7 @@
                   "Value": "api.mediatailor.sa-east-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "memorydb": {
@@ -52925,7 +52994,7 @@
                   "Value": "api.mediatailor.us-east-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "medical-imaging": {
@@ -55733,7 +55802,7 @@
                   "Value": "api.mediatailor.us-east-2.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "memorydb": {
@@ -57666,6 +57735,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "oam": {
+                "Value": "oam",
+                "endpoint": {
+                  "Value": "oam.us-gov-east-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "organizations": {
                 "Value": "organizations",
                 "endpoint": {
@@ -58355,7 +58433,13 @@
                 }
               },
               "bedrock": {
-                "Value": "bedrock"
+                "Value": "bedrock",
+                "endpoint": {
+                  "Value": "bedrock.us-gov-west-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
               },
               "chime": {
                 "Value": "chime"
@@ -59296,6 +59380,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "oam": {
+                "Value": "oam",
+                "endpoint": {
+                  "Value": "oam.us-gov-west-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "organizations": {
                 "Value": "organizations",
                 "endpoint": {
@@ -63782,7 +63875,7 @@
                   "Value": "api.mediatailor.us-west-2.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "medical-imaging": {