moto 4.2.12.dev11__tar.gz → 4.2.12.dev14__tar.gz

{moto-4.2.12.dev11/moto.egg-info → moto-4.2.12.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moto
-Version: 4.2.12.dev11
+Version: 4.2.12.dev14
 Home-page: https://github.com/getmoto/moto
 Author: Steve Pulec
 Author-email: "spulec@gmail.com"

{moto-4.2.12.dev11 → moto-4.2.12.dev14}/moto/__init__.py

@@ -258,7 +258,7 @@ mock_all = MockAll
 # logging.getLogger('boto').setLevel(logging.CRITICAL)
 
 __title__ = "moto"
-__version__ = "4.2.12.dev11"
+__version__ = "4.2.12.dev14"
 
 
 try:

{moto-4.2.12.dev11 → moto-4.2.12.dev14}/moto/awslambda/models.py

@@ -620,7 +620,7 @@ class LambdaFunction(CloudFormationModel, DockerModel):
 
         self.description = spec.get("Description", "")
         self.memory_size = spec.get("MemorySize", 128)
-        self.package_type = spec.get("PackageType", None)
+        self.package_type = spec.get("PackageType", "Zip")
         self.publish = spec.get("Publish", False)  # this is ignored currently
         self.timeout = spec.get("Timeout", 3)
         self.layers: List[Dict[str, str]] = self._get_layers_data(

{moto-4.2.12.dev11 → moto-4.2.12.dev14}/moto/s3/models.py

@@ -73,6 +73,7 @@ from .utils import (
     STORAGE_CLASS,
     CaseInsensitiveDict,
     _VersionedKeyStore,
+    compute_checksum,
 )
 
 MAX_BUCKET_NAME_LENGTH = 63
@@ -399,10 +400,14 @@ class FakeMultipart(BaseModel):
         self.sse_encryption = sse_encryption
         self.kms_key_id = kms_key_id
 
-    def complete(self, body: Iterator[Tuple[int, str]]) -> Tuple[bytes, str]:
+    def complete(
+        self, body: Iterator[Tuple[int, str]]
+    ) -> Tuple[bytes, str, Optional[str]]:
+        checksum_algo = self.metadata.get("x-amz-checksum-algorithm")
         decode_hex = codecs.getdecoder("hex_codec")
         total = bytearray()
         md5s = bytearray()
+        checksum = bytearray()
 
         last = None
         count = 0
@@ -418,6 +423,10 @@ class FakeMultipart(BaseModel):
                 raise EntityTooSmall()
             md5s.extend(decode_hex(part_etag)[0])  # type: ignore
             total.extend(part.value)
+            if checksum_algo:
+                checksum.extend(
+                    compute_checksum(part.value, checksum_algo, encode_base64=False)
+                )
             last = part
             count += 1
 
@@ -426,7 +435,11 @@ class FakeMultipart(BaseModel):
 
         full_etag = md5_hash()
         full_etag.update(bytes(md5s))
-        return total, f"{full_etag.hexdigest()}-{count}"
+        if checksum_algo:
+            encoded_checksum = compute_checksum(checksum, checksum_algo).decode("utf-8")
+        else:
+            encoded_checksum = None
+        return total, f"{full_etag.hexdigest()}-{count}", encoded_checksum
 
     def set_part(self, part_id: int, value: bytes) -> FakeKey:
         if part_id < 1:
@@ -2319,13 +2332,13 @@ class S3Backend(BaseBackend, CloudWatchMetricProvider):
 
     def complete_multipart_upload(
         self, bucket_name: str, multipart_id: str, body: Iterator[Tuple[int, str]]
-    ) -> Tuple[FakeMultipart, bytes, str]:
+    ) -> Tuple[FakeMultipart, bytes, str, Optional[str]]:
         bucket = self.get_bucket(bucket_name)
         multipart = bucket.multiparts[multipart_id]
-        value, etag = multipart.complete(body)
+        value, etag, checksum = multipart.complete(body)
         if value is not None:
             del bucket.multiparts[multipart_id]
-        return multipart, value, etag
+        return multipart, value, etag, checksum
 
     def get_all_multiparts(self, bucket_name: str) -> Dict[str, FakeMultipart]:
         bucket = self.get_bucket(bucket_name)
@@ -2338,7 +2351,7 @@ class S3Backend(BaseBackend, CloudWatchMetricProvider):
         multipart = bucket.multiparts[multipart_id]
         return multipart.set_part(part_id, value)
 
-    def copy_part(
+    def upload_part_copy(
         self,
         dest_bucket_name: str,
         multipart_id: str,

{moto-4.2.12.dev11 → moto-4.2.12.dev14}/moto/s3/responses.py

@@ -1507,7 +1507,7 @@ class S3Response(BaseResponse):
                 if self.backend.get_object(
                     src_bucket, src_key, version_id=src_version_id
                 ):
-                    key = self.backend.copy_part(
+                    key = self.backend.upload_part_copy(
                         bucket_name,
                         upload_id,
                         part_number,
@@ -1707,6 +1707,8 @@ class S3Response(BaseResponse):
                 response_headers.update(
                     {"Checksum": {f"Checksum{checksum_algorithm}": checksum_value}}
                 )
+                # By default, the checksum-details for the copy will be the same as the original
+                # But if another algorithm is provided during the copy-operation, we override the values
                 new_key.checksum_algorithm = checksum_algorithm
                 new_key.checksum_value = checksum_value
 
@@ -2252,12 +2254,13 @@ class S3Response(BaseResponse):
         if query.get("uploadId"):
             multipart_id = query["uploadId"][0]
 
-            multipart, value, etag = self.backend.complete_multipart_upload(
+            multipart, value, etag, checksum = self.backend.complete_multipart_upload(
                 bucket_name, multipart_id, self._complete_multipart_body(body)
             )
             if value is None:
                 return 400, {}, ""
 
+            headers: Dict[str, Any] = {}
             key = self.backend.put_object(
                 bucket_name,
                 multipart.key_name,
@@ -2269,6 +2272,13 @@ class S3Response(BaseResponse):
                 kms_key_id=multipart.kms_key_id,
             )
             key.set_metadata(multipart.metadata)
+
+            if checksum:
+                key.checksum_algorithm = multipart.metadata.get(
+                    "x-amz-checksum-algorithm"
+                )
+                key.checksum_value = checksum
+
             self.backend.set_key_tags(key, multipart.tags)
             self.backend.put_object_acl(
                 bucket_name=bucket_name,
@@ -2277,7 +2287,6 @@ class S3Response(BaseResponse):
             )
 
             template = self.response_template(S3_MULTIPART_COMPLETE_RESPONSE)
-            headers: Dict[str, Any] = {}
             if key.version_id:
                 headers["x-amz-version-id"] = key.version_id
 

{moto-4.2.12.dev11 → moto-4.2.12.dev14}/moto/s3/utils.py

@@ -24,6 +24,12 @@ user_settable_fields = {
     "expires",
     "content-disposition",
     "x-robots-tag",
+    "x-amz-checksum-algorithm",
+    "x-amz-content-sha256",
+    "x-amz-content-crc32",
+    "x-amz-content-crc32c",
+    "x-amz-content-sha1",
+    "x-amz-website-redirect-location",
 }
 ARCHIVE_STORAGE_CLASSES = [
     "GLACIER",
@@ -190,7 +196,7 @@ class _VersionedKeyStore(dict):  # type: ignore
     values = itervalues = _itervalues  # type: ignore
 
 
-def compute_checksum(body: bytes, algorithm: str) -> bytes:
+def compute_checksum(body: bytes, algorithm: str, encode_base64: bool = True) -> bytes:
     if algorithm == "SHA1":
         hashed_body = _hash(hashlib.sha1, (body,))
     elif algorithm == "CRC32C":
@@ -205,7 +211,10 @@ def compute_checksum(body: bytes, algorithm: str) -> bytes:
         hashed_body = binascii.crc32(body).to_bytes(4, "big")
     else:
         hashed_body = _hash(hashlib.sha256, (body,))
-    return base64.b64encode(hashed_body)
+    if encode_base64:
+        return base64.b64encode(hashed_body)
+    else:
+        return hashed_body
 
 
 def _hash(fn: Any, args: Any) -> bytes:

{moto-4.2.12.dev11 → moto-4.2.12.dev14}/moto/ssm/resources/regions.json

@@ -391,6 +391,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "connect": {
+                "Value": "connect",
+                "endpoint": {
+                  "Value": "connect.af-south-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "connectparticipant": {
                 "Value": "connectparticipant",
                 "endpoint": {
@@ -8103,6 +8112,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "tnb": {
+                "Value": "tnb",
+                "endpoint": {
+                  "Value": "tnb.ap-northeast-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "transcribe": {
                 "Value": "transcribe",
                 "endpoint": {
@@ -12382,7 +12400,7 @@
                   "Value": "ec2.ap-south-2.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "ecr": {
@@ -18839,7 +18857,7 @@
                   "Value": "ec2.ap-southeast-3.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "ecr": {
@@ -20106,7 +20124,7 @@
                   "Value": "ec2.ap-southeast-4.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "ecr": {
@@ -29048,7 +29066,7 @@
                   "Value": "ec2.eu-central-2.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "ecr": {
@@ -31716,6 +31734,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "tnb": {
+                "Value": "tnb",
+                "endpoint": {
+                  "Value": "tnb.eu-north-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "transcribe": {
                 "Value": "transcribe",
                 "endpoint": {
@@ -33722,7 +33749,7 @@
                   "Value": "ec2.eu-south-2.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "ecr": {
@@ -34406,6 +34433,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "tnb": {
+                "Value": "tnb",
+                "endpoint": {
+                  "Value": "tnb.eu-south-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "transfer": {
                 "Value": "transfer",
                 "endpoint": {
@@ -41810,6 +41846,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "cloud9": {
+                "Value": "cloud9",
+                "endpoint": {
+                  "Value": "cloud9.il-central-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "cloudcontrolapi": {
                 "Value": "cloudcontrolapi",
                 "endpoint": {
@@ -42032,7 +42077,7 @@
                   "Value": "ec2.il-central-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "ecr": {
@@ -43227,7 +43272,7 @@
                   "Value": "ec2.me-central-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "ecr": {
@@ -47519,6 +47564,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "tnb": {
+                "Value": "tnb",
+                "endpoint": {
+                  "Value": "tnb.sa-east-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "transcribe": {
                 "Value": "transcribe",
                 "endpoint": {
@@ -47978,6 +48032,12 @@
                   "Value": "HTTPS, HTTP"
                 }
               },
+              "b2bi": {
+                "Value": "b2bi",
+                "endpoint": {
+                  "Value": "b2bi.us-east-1.amazonaws.com"
+                }
+              },
               "backup": {
                 "Value": "backup",
                 "endpoint": {
@@ -51092,6 +51152,12 @@
                   "Value": "HTTPS, HTTP"
                 }
               },
+              "b2bi": {
+                "Value": "b2bi",
+                "endpoint": {
+                  "Value": "b2bi.us-east-2.amazonaws.com"
+                }
+              },
               "backup": {
                 "Value": "backup",
                 "endpoint": {
@@ -54336,6 +54402,9 @@
                   "Value": "HTTPS"
                 }
               },
+              "route53-application-recovery-controller": {
+                "Value": "route53-application-recovery-controller"
+              },
               "route53resolver": {
                 "Value": "route53resolver",
                 "endpoint": {
@@ -55921,6 +55990,9 @@
                   "Value": "HTTPS"
                 }
               },
+              "route53-application-recovery-controller": {
+                "Value": "route53-application-recovery-controller"
+              },
               "route53resolver": {
                 "Value": "route53resolver",
                 "endpoint": {
@@ -58613,6 +58685,12 @@
                   "Value": "HTTPS, HTTP"
                 }
               },
+              "b2bi": {
+                "Value": "b2bi",
+                "endpoint": {
+                  "Value": "b2bi.us-west-2.amazonaws.com"
+                }
+              },
               "backup": {
                 "Value": "backup",
                 "endpoint": {

{moto-4.2.12.dev11 → moto-4.2.12.dev14}/moto/ssm/resources/services.json

@@ -6521,6 +6521,31 @@
               }
             }
           },
+          "b2bi": {
+            "longName": {
+              "Value": "AWS B2B Data Interchange"
+            },
+            "regions": {
+              "us-east-1": {
+                "Value": "us-east-1",
+                "endpoint": {
+                  "Value": "b2bi.us-east-1.amazonaws.com"
+                }
+              },
+              "us-east-2": {
+                "Value": "us-east-2",
+                "endpoint": {
+                  "Value": "b2bi.us-east-2.amazonaws.com"
+                }
+              },
+              "us-west-2": {
+                "Value": "us-west-2",
+                "endpoint": {
+                  "Value": "b2bi.us-west-2.amazonaws.com"
+                }
+              }
+            }
+          },
           "backup": {
             "Value": "backup",
             "longName": {
@@ -8676,6 +8701,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "il-central-1": {
+                "Value": "il-central-1",
+                "endpoint": {
+                  "Value": "cloud9.il-central-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "me-south-1": {
                 "Value": "me-south-1",
                 "endpoint": {
@@ -14388,6 +14422,15 @@
               "Value": "https://aws.amazon.com/connect/"
             },
             "regions": {
+              "af-south-1": {
+                "Value": "af-south-1",
+                "endpoint": {
+                  "Value": "connect.af-south-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "ap-northeast-1": {
                 "Value": "ap-northeast-1",
                 "endpoint": {
@@ -19351,7 +19394,7 @@
                   "Value": "ec2.ap-south-2.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "ap-southeast-1": {
@@ -19378,7 +19421,7 @@
                   "Value": "ec2.ap-southeast-3.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "ap-southeast-4": {
@@ -19387,7 +19430,7 @@
                   "Value": "ec2.ap-southeast-4.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "ca-central-1": {
@@ -19432,7 +19475,7 @@
                   "Value": "ec2.eu-central-2.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "eu-north-1": {
@@ -19459,7 +19502,7 @@
                   "Value": "ec2.eu-south-2.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "eu-west-1": {
@@ -19495,7 +19538,7 @@
                   "Value": "ec2.il-central-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "me-central-1": {
@@ -19504,7 +19547,7 @@
                   "Value": "ec2.me-central-1.amazonaws.com"
                 },
                 "protocols": {
-                  "Value": "HTTPS, HTTP"
+                  "Value": "HTTPS"
                 }
               },
               "me-south-1": {
@@ -24492,7 +24535,7 @@
           "fis": {
             "Value": "fis",
             "longName": {
-              "Value": "AWS Fault Injection Simulator"
+              "Value": "AWS Fault Injection Service"
             },
             "marketingHomeURL": {
               "Value": "https://aws.amazon.com/fis/"
@@ -47952,6 +47995,9 @@
             "longName": {
               "Value": "AWS Resource Explorer"
             },
+            "marketingHomeURL": {
+              "Value": "https://aws.amazon.com/resourceexplorer/"
+            },
             "regions": {
               "ap-northeast-1": {
                 "Value": "ap-northeast-1",
@@ -49509,6 +49555,12 @@
               "us-east-2": {
                 "Value": "us-east-2"
               },
+              "us-gov-east-1": {
+                "Value": "us-gov-east-1"
+              },
+              "us-gov-west-1": {
+                "Value": "us-gov-west-1"
+              },
               "us-west-1": {
                 "Value": "us-west-1"
               },
@@ -60017,7 +60069,19 @@
             "longName": {
               "Value": "AWS Telco Network Builder"
             },
+            "marketingHomeURL": {
+              "Value": "https://aws.amazon.com/tnb/"
+            },
             "regions": {
+              "ap-northeast-2": {
+                "Value": "ap-northeast-2",
+                "endpoint": {
+                  "Value": "tnb.ap-northeast-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "ap-southeast-2": {
                 "Value": "ap-southeast-2",
                 "endpoint": {
@@ -60045,6 +60109,24 @@
                   "Value": "HTTPS"
                 }
               },
+              "eu-north-1": {
+                "Value": "eu-north-1",
+                "endpoint": {
+                  "Value": "tnb.eu-north-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
+              "eu-south-2": {
+                "Value": "eu-south-2",
+                "endpoint": {
+                  "Value": "tnb.eu-south-2.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "eu-west-3": {
                 "Value": "eu-west-3",
                 "endpoint": {
@@ -60054,6 +60136,15 @@
                   "Value": "HTTPS"
                 }
               },
+              "sa-east-1": {
+                "Value": "sa-east-1",
+                "endpoint": {
+                  "Value": "tnb.sa-east-1.amazonaws.com"
+                },
+                "protocols": {
+                  "Value": "HTTPS"
+                }
+              },
               "us-east-1": {
                 "Value": "us-east-1",
                 "endpoint": {

{moto-4.2.12.dev11 → moto-4.2.12.dev14/moto.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moto
-Version: 4.2.12.dev11
+Version: 4.2.12.dev14
 Home-page: https://github.com/getmoto/moto
 Author: Steve Pulec
 Author-email: "spulec@gmail.com"

{moto-4.2.12.dev11 → moto-4.2.12.dev14}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = moto
-version = 4.2.12.dev11
+version = 4.2.12.dev14
 long_description = file:README.md
 long_description_content_type = text/markdown
 author = Steve Pulec