localstack-core 4.13.2.dev15__tar.gz → 4.13.2.dev16__tar.gz

{localstack_core-4.13.2.dev15/localstack-core/localstack_core.egg-info → localstack_core-4.13.2.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.13.2.dev15
+Version: 4.13.2.dev16
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0

{localstack_core-4.13.2.dev15 → localstack_core-4.13.2.dev16}/localstack-core/localstack/services/s3/models.py

@@ -102,11 +102,11 @@ class InternalObjectPart(Part):
     _position: int
 
 
-# note: not really a need to use a dataclass here, as it has a lot of fields, but only a few are set at creation
 class S3Bucket:
     name: BucketName
     bucket_account_id: AccountId
     bucket_region: BucketRegion
+    bucket_arn: str
     location_constraint: BucketLocationConstraint | Literal[""]
     creation_date: datetime
     multiparts: dict[MultipartUploadId, "S3Multipart"]
@@ -131,7 +131,7 @@ class S3Bucket:
     inventory_configurations: dict[InventoryId, InventoryConfiguration]
     metric_configurations: dict[MetricsId, MetricsConfiguration]
     object_lock_default_retention: DefaultRetention | None
-    replication: ReplicationConfiguration
+    replication: ReplicationConfiguration | None
     owner: Owner
 
     # set all buckets parameters here
@@ -149,6 +149,7 @@ class S3Bucket:
         self.name = name
         self.bucket_account_id = account_id
         self.bucket_region = bucket_region
+        self.bucket_arn = arns.s3_bucket_arn(self.name, region=bucket_region)
         self.location_constraint = location_constraint
         # If ObjectLock is enabled, it forces the bucket to be versioned as well
         self.versioning_status = None if not object_lock_enabled_for_bucket else "Enabled"
@@ -177,7 +178,6 @@ class S3Bucket:
         self.acl = acl
         # see https://docs.aws.amazon.com/AmazonS3/latest/API/API_Owner.html
         self.owner = owner
-        self.bucket_arn = arns.s3_bucket_arn(self.name, region=bucket_region)
 
     def get_object(
         self,
@@ -266,7 +266,6 @@ class S3Bucket:
 class S3Object:
     key: ObjectKey
     version_id: ObjectVersionId | None
-    bucket: BucketName
     owner: Owner | None
     size: Size | None
     etag: ETag | None
@@ -281,15 +280,15 @@ class S3Object:
     bucket_key_enabled: bool | None  # inherit bucket
     sse_key_hash: SSECustomerKeyMD5 | None
     checksum_algorithm: ChecksumAlgorithm
-    checksum_value: str
-    checksum_type: ChecksumType
+    checksum_value: str | None
+    checksum_type: ChecksumType | None
     lock_mode: ObjectLockMode | ObjectLockRetentionMode | None
     lock_legal_status: ObjectLockLegalHoldStatus | None
     lock_until: datetime | None
     website_redirect_location: WebsiteRedirectLocation | None
     acl: AccessControlPolicy | None
     is_current: bool
-    parts: dict[int, InternalObjectPart] | None
+    parts: dict[str, InternalObjectPart]
     restore: Restore | None
     internal_last_modified: int
 
@@ -392,7 +391,6 @@ class S3Object:
         return False
 
 
-# TODO: could use dataclass, validate after models are set
 class S3DeleteMarker:
     key: ObjectKey
     version_id: str
@@ -411,7 +409,6 @@ class S3DeleteMarker:
         return False
 
 
-# TODO: could use dataclass, validate after models are set
 class S3Part:
     part_number: PartNumber
     etag: ETag | None
@@ -441,14 +438,16 @@ class S3Part:
 
 
 class S3Multipart:
-    parts: dict[PartNumber, S3Part]
+    id: MultipartUploadId
+    parts: dict[str, S3Part]
     object: S3Object
-    upload_id: MultipartUploadId
     checksum_value: str | None
     checksum_type: ChecksumType | None
-    checksum_algorithm: ChecksumAlgorithm
+    checksum_algorithm: ChecksumAlgorithm | None
     initiated: datetime
-    precondition: bool
+    precondition: bool | None
+    initiator: Owner | None
+    tagging: dict[str, str] | None
 
     def __init__(
         self,
@@ -520,9 +519,9 @@ class S3Multipart:
                 checksum_hash = CombinedCrcHash(self.checksum_algorithm)
 
         pos = 0
-        parts_map: dict[int, InternalObjectPart] = {}
+        parts_map: dict[str, InternalObjectPart] = {}
         for index, part in enumerate(parts):
-            part_number = part["PartNumber"]
+            part_number = str(part["PartNumber"])
             part_etag = part["ETag"].strip('"')
 
             s3_part = self.parts.get(part_number)
@@ -632,6 +631,8 @@ class KeyStore:
     retrieve the object from that key.
     """
 
+    _store: dict[ObjectKey, S3Object | S3DeleteMarker]
+
     def __init__(self):
         self._store = {}
 
@@ -664,6 +665,8 @@ class VersionedKeyStore:
     See: https://docs.aws.amazon.com/AmazonS3/latest/userguide/versioning-workflows.html
     """
 
+    _store: dict[ObjectKey, dict[ObjectVersionId, S3Object | S3DeleteMarker]]
+
     def __init__(self):
         self._store = defaultdict(dict)
 

{localstack_core-4.13.2.dev15 → localstack_core-4.13.2.dev16}/localstack-core/localstack/services/s3/provider.py

@@ -722,17 +722,8 @@ class S3Provider(S3Api, ServiceLifecycleHook):
         """
         store, s3_bucket = self._get_cross_account_bucket(context, bucket)
 
-        # TODO: Remove usage of getattr once persistence mechanism is updated.
-        # If the stored constraint is None the bucket was made before the storage of location_constraint.
-        # The EU location constraint wasn't supported before this point so we can safely default to the region.
-        location_constraint = getattr(s3_bucket, "location_constraint", None)
-        if location_constraint is None:
-            location_constraint = (
-                s3_bucket.bucket_region if s3_bucket.bucket_region != "us-east-1" else ""
-            )
-
         return GetBucketLocationOutput(
-            LocationConstraint=get_bucket_location_xml(location_constraint)
+            LocationConstraint=get_bucket_location_xml(s3_bucket.location_constraint)
         )
 
     @handler("PutObject", expand=False)
@@ -932,7 +923,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
 
         if s3_object.checksum_algorithm:
             response[f"Checksum{s3_object.checksum_algorithm}"] = s3_object.checksum_value
-            response["ChecksumType"] = getattr(s3_object, "checksum_type", ChecksumType.FULL_OBJECT)
+            response["ChecksumType"] = s3_object.checksum_type
 
         if s3_bucket.lifecycle_rules:
             if expiration_header := self._get_expiration_header(
@@ -985,15 +976,13 @@ class S3Provider(S3Api, ServiceLifecycleHook):
             validate_kms_key_id(kms_key=s3_object.kms_key_id, bucket=s3_bucket)
 
         sse_c_key_md5 = request.get("SSECustomerKeyMD5")
-        # we're using getattr access because when restoring, the field might not exist
-        # TODO: cleanup at next major release
-        if sse_key_hash := getattr(s3_object, "sse_key_hash", None):
-            if sse_key_hash and not sse_c_key_md5:
+        if s3_object.sse_key_hash:
+            if s3_object.sse_key_hash and not sse_c_key_md5:
                 raise InvalidRequest(
                     "The object was stored using a form of Server Side Encryption. "
                     "The correct parameters must be provided to retrieve the object."
                 )
-            elif sse_key_hash != sse_c_key_md5:
+            elif s3_object.sse_key_hash != sse_c_key_md5:
                 raise AccessDenied(
                     "Requests specifying Server Side Encryption with Customer provided keys must provide the correct secret key."
                 )
@@ -1056,7 +1045,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
         if checksum_algorithm := s3_object.checksum_algorithm:
             if (request.get("ChecksumMode") or "").upper() == "ENABLED":
                 checksum_value = s3_object.checksum_value
-                checksum_type = getattr(s3_object, "checksum_type", ChecksumType.FULL_OBJECT)
+                checksum_type = s3_object.checksum_type
 
         if range_data:
             s3_stored_object.seek(range_data.begin)
@@ -1068,7 +1057,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
             response["StatusCode"] = 206
             if checksum_value:
                 if s3_object.parts and part_number and checksum_type == ChecksumType.COMPOSITE:
-                    part_data = s3_object.parts[part_number]
+                    part_data = s3_object.parts[str(part_number)]
                     checksum_key = f"Checksum{checksum_algorithm.upper()}"
                     response[checksum_key] = part_data.get(checksum_key)
                     response["ChecksumType"] = ChecksumType.COMPOSITE
@@ -1183,7 +1172,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
         if checksum_algorithm := s3_object.checksum_algorithm:
             if (request.get("ChecksumMode") or "").upper() == "ENABLED":
                 checksum_value = s3_object.checksum_value
-                checksum_type = getattr(s3_object, "checksum_type", ChecksumType.FULL_OBJECT)
+                checksum_type = s3_object.checksum_type
 
         if s3_object.parts and request.get("PartNumber"):
             response["PartsCount"] = len(s3_object.parts)
@@ -1213,7 +1202,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
             response["StatusCode"] = 206
             if checksum_value:
                 if s3_object.parts and part_number and checksum_type == ChecksumType.COMPOSITE:
-                    part_data = s3_object.parts[part_number]
+                    part_data = s3_object.parts[str(part_number)]
                     checksum_key = f"Checksum{checksum_algorithm.upper()}"
                     response[checksum_key] = part_data.get(checksum_key)
                     response["ChecksumType"] = ChecksumType.COMPOSITE
@@ -1788,9 +1777,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
 
                 if s3_object.checksum_algorithm:
                     object_data["ChecksumAlgorithm"] = [s3_object.checksum_algorithm]
-                    object_data["ChecksumType"] = getattr(
-                        s3_object, "checksum_type", ChecksumType.FULL_OBJECT
-                    )
+                    object_data["ChecksumType"] = s3_object.checksum_type
 
                 s3_objects.append(object_data)
 
@@ -1925,9 +1912,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
 
                 if s3_object.checksum_algorithm:
                     object_data["ChecksumAlgorithm"] = [s3_object.checksum_algorithm]
-                    object_data["ChecksumType"] = getattr(
-                        s3_object, "checksum_type", ChecksumType.FULL_OBJECT
-                    )
+                    object_data["ChecksumType"] = s3_object.checksum_type
 
                 s3_objects.append(object_data)
 
@@ -2077,9 +2062,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
 
                 if version.checksum_algorithm:
                     object_version["ChecksumAlgorithm"] = [version.checksum_algorithm]
-                    object_version["ChecksumType"] = getattr(
-                        version, "checksum_type", ChecksumType.FULL_OBJECT
-                    )
+                    object_version["ChecksumType"] = version.checksum_type
 
                 object_versions.append(object_version)
 
@@ -2156,7 +2139,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
 
         object_attrs = request.get("ObjectAttributes", [])
         response = GetObjectAttributesOutput()
-        object_checksum_type = getattr(s3_object, "checksum_type", ChecksumType.FULL_OBJECT)
+        object_checksum_type = s3_object.checksum_type
         if "ETag" in object_attrs:
             response["ETag"] = s3_object.etag
         if "StorageClass" in object_attrs:
@@ -2192,18 +2175,11 @@ class S3Provider(S3Api, ServiceLifecycleHook):
                 max_parts = request.get("MaxParts") or 1000
 
                 parts = []
-                all_parts = sorted(s3_object.parts.items())
+                all_parts = sorted(
+                    (int(part_number), part) for part_number, part in s3_object.parts.items()
+                )
                 last_part_number, last_part = all_parts[-1]
 
-                # TODO: remove this backward compatibility hack needed for state created with <= 4.5
-                #  the parts would only be a tuple and would not store the proper state for 4.5 and earlier, so we need
-                #  to return early
-                if isinstance(last_part, tuple):
-                    response["ObjectParts"] = GetObjectAttributesParts(
-                        TotalPartsCount=len(s3_object.parts)
-                    )
-                    return response
-
                 for part_number, part in all_parts:
                     if part_number <= part_number_marker:
                         continue
@@ -2551,7 +2527,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
                         CalculatedDigest=calculated_md5,
                     )
 
-            s3_multipart.parts[part_number] = s3_part
+            s3_multipart.parts[str(part_number)] = s3_part
 
         response = UploadPartOutput(
             ETag=s3_part.quoted_etag,
@@ -2652,7 +2628,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
         stored_multipart = self._storage_backend.get_multipart(dest_bucket, s3_multipart)
         stored_multipart.copy_from_object(s3_part, src_bucket, src_s3_object, range_data)
 
-        s3_multipart.parts[part_number] = s3_part
+        s3_multipart.parts[str(part_number)] = s3_part
 
         # TODO: return those fields
         #     RequestCharged: Optional[RequestCharged]
@@ -2763,7 +2739,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
             )
 
         mpu_checksum_algorithm = s3_multipart.checksum_algorithm
-        mpu_checksum_type = getattr(s3_multipart, "checksum_type", None)
+        mpu_checksum_type = s3_multipart.checksum_type
 
         if checksum_type and checksum_type != mpu_checksum_type:
             raise InvalidRequest(
@@ -2814,7 +2790,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
 
         stored_multipart = self._storage_backend.get_multipart(bucket, s3_multipart)
         stored_multipart.complete_multipart(
-            [s3_multipart.parts.get(part_number) for part_number in parts_numbers]
+            [s3_multipart.parts.get(str(part_number)) for part_number in parts_numbers]
         )
         if not s3_multipart.checksum_algorithm and s3_multipart.object.checksum_algorithm:
             with self._storage_backend.open(
@@ -2925,7 +2901,9 @@ class S3Provider(S3Api, ServiceLifecycleHook):
         max_parts = max_parts or 1000
 
         parts = []
-        all_parts = sorted(s3_multipart.parts.items())
+        all_parts = sorted(
+            (int(part_number), part) for part_number, part in s3_multipart.parts.items()
+        )
         last_part_number = all_parts[-1][0] if all_parts else None
         for part_number, part in all_parts:
             if part_number <= part_number_marker:
@@ -2967,7 +2945,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
             response["PartNumberMarker"] = part_number_marker
         if s3_multipart.checksum_algorithm:
             response["ChecksumAlgorithm"] = s3_multipart.object.checksum_algorithm
-            response["ChecksumType"] = getattr(s3_multipart, "checksum_type", None)
+            response["ChecksumType"] = s3_multipart.checksum_type
 
         #     AbortDate: Optional[AbortDate] TODO: lifecycle
         #     AbortRuleId: Optional[AbortRuleId] TODO: lifecycle
@@ -3071,7 +3049,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
                 )
                 if multipart.checksum_algorithm:
                     multipart_upload["ChecksumAlgorithm"] = multipart.checksum_algorithm
-                    multipart_upload["ChecksumType"] = getattr(multipart, "checksum_type", None)
+                    multipart_upload["ChecksumType"] = multipart.checksum_type
 
                 uploads.append(multipart_upload)
 
@@ -3472,12 +3450,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
 
         return GetBucketLifecycleConfigurationOutput(
             Rules=s3_bucket.lifecycle_rules,
-            # TODO: remove for next major version, safe access to new attribute
-            TransitionDefaultMinimumObjectSize=getattr(
-                s3_bucket,
-                "transition_default_minimum_object_size",
-                TransitionDefaultMinimumObjectSize.all_storage_classes_128K,
-            ),
+            TransitionDefaultMinimumObjectSize=s3_bucket.transition_default_minimum_object_size,
         )
 
     def put_bucket_lifecycle_configuration(
@@ -4911,7 +4884,7 @@ def get_part_range(s3_object: S3Object, part_number: PartNumber) -> ObjectRange:
             content_length=s3_object.size,
             content_range=f"bytes 0-{s3_object.size - 1}/{s3_object.size}",
         )
-    elif not (part_data := s3_object.parts.get(part_number)):
+    elif not (part_data := s3_object.parts.get(str(part_number))):
         raise InvalidPartNumber(
             "The requested partnumber is not satisfiable",
             PartNumberRequested=part_number,

{localstack_core-4.13.2.dev15 → localstack_core-4.13.2.dev16}/localstack-core/localstack/services/s3/storage/core.py

@@ -3,7 +3,7 @@ from collections.abc import Iterable, Iterator
 from io import RawIOBase
 from typing import IO, Literal
 
-from localstack.aws.api.s3 import BucketName, PartNumber
+from localstack.aws.api.s3 import BucketName, PartNumber, Parts
 from localstack.services.s3.models import S3Multipart, S3Object, S3Part
 from localstack.services.s3.utils import ObjectRange
 
@@ -158,7 +158,7 @@ class S3StoredMultipart(abc.ABC):
         pass
 
     @abc.abstractmethod
-    def complete_multipart(self, parts: list[PartNumber]) -> None:
+    def complete_multipart(self, parts: list[Parts]) -> None:
         pass
 
     @abc.abstractmethod

{localstack_core-4.13.2.dev15 → localstack_core-4.13.2.dev16}/localstack-core/localstack/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.13.2.dev15'
-__version_tuple__ = version_tuple = (4, 13, 2, 'dev15')
+__version__ = version = '4.13.2.dev16'
+__version_tuple__ = version_tuple = (4, 13, 2, 'dev16')
 
-__commit_id__ = commit_id = 'g0edbd81db'
+__commit_id__ = commit_id = 'gd2b4bb752'

{localstack_core-4.13.2.dev15 → localstack_core-4.13.2.dev16/localstack-core/localstack_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.13.2.dev15
+Version: 4.13.2.dev16
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0