localstack-core 4.7.1.dev139__py3-none-any.whl → 4.10.1.dev7__py3-none-any.whl

localstack/services/kinesis/provider.py

@@ -1,5 +1,7 @@
+import json
 import logging
 import os
+import re
 import time
 from random import random
 
@@ -8,14 +10,18 @@ from localstack.aws.api import RequestContext
 from localstack.aws.api.kinesis import (
     ConsumerARN,
     Data,
+    GetResourcePolicyOutput,
     HashKey,
     KinesisApi,
     PartitionKey,
+    Policy,
     ProvisionedThroughputExceededException,
     PutRecordOutput,
     PutRecordsOutput,
     PutRecordsRequestEntryList,
     PutRecordsResultEntry,
+    ResourceARN,
+    ResourceNotFoundException,
     SequenceNumber,
     ShardId,
     StartingPosition,
@@ -24,6 +30,7 @@ from localstack.aws.api.kinesis import (
     SubscribeToShardEvent,
     SubscribeToShardEventStream,
     SubscribeToShardOutput,
+    ValidationException,
 )
 from localstack.aws.connect import connect_to
 from localstack.constants import LOCALHOST
@@ -39,6 +46,13 @@ LOG = logging.getLogger(__name__)
 MAX_SUBSCRIPTION_SECONDS = 300
 SERVER_STARTUP_TIMEOUT = 120
 
+DATA_STREAM_ARN_REGEX = re.compile(
+    r"^arn:aws(?:-[a-z]+)*:kinesis:[a-z0-9-]+:\d{12}:stream\/[a-zA-Z0-9_.\-]+$"
+)
+CONSUMER_ARN_REGEX = re.compile(
+    r"^arn:aws(?:-[a-z]+)*:kinesis:[a-z0-9-]+:\d{12}:stream\/[a-zA-Z0-9_.\-]+\/consumer\/[a-zA-Z0-9_.\-]+:\d+$"
+)
+
 
 def find_stream_for_consumer(consumer_arn):
     account_id = extract_account_id_from_arn(consumer_arn)
@@ -52,6 +66,11 @@ def find_stream_for_consumer(consumer_arn):
     raise Exception(f"Unable to find stream for stream consumer {consumer_arn}")
 
 
+def is_valid_kinesis_arn(resource_arn: ResourceARN) -> bool:
+    """Check if the provided ARN is a valid Kinesis ARN."""
+    return bool(CONSUMER_ARN_REGEX.match(resource_arn) or DATA_STREAM_ARN_REGEX.match(resource_arn))
+
+
 class KinesisProvider(KinesisApi, ServiceLifecycleHook):
     server_manager: KinesisServerManager
 
@@ -81,6 +100,64 @@ class KinesisProvider(KinesisApi, ServiceLifecycleHook):
     def get_store(account_id: str, region_name: str) -> KinesisStore:
         return kinesis_stores[account_id][region_name]
 
+    def put_resource_policy(
+        self,
+        context: RequestContext,
+        resource_arn: ResourceARN,
+        policy: Policy,
+        **kwargs,
+    ) -> None:
+        if not is_valid_kinesis_arn(resource_arn):
+            raise ValidationException(f"invalid kinesis arn {resource_arn}")
+
+        kinesis = connect_to(
+            aws_access_key_id=context.account_id, region_name=context.region
+        ).kinesis
+        try:
+            kinesis.describe_stream_summary(StreamARN=resource_arn)
+        except kinesis.exceptions.ResourceNotFoundException:
+            raise ResourceNotFoundException(f"Stream with ARN {resource_arn} not found")
+
+        store = self.get_store(context.account_id, context.region)
+        store.resource_policies[resource_arn] = policy
+
+    def get_resource_policy(
+        self,
+        context: RequestContext,
+        resource_arn: ResourceARN,
+        **kwargs,
+    ) -> GetResourcePolicyOutput:
+        if not is_valid_kinesis_arn(resource_arn):
+            raise ValidationException(f"invalid kinesis arn {resource_arn}")
+
+        kinesis = connect_to(
+            aws_access_key_id=context.account_id, region_name=context.region
+        ).kinesis
+        try:
+            kinesis.describe_stream_summary(StreamARN=resource_arn)
+        except kinesis.exceptions.ResourceNotFoundException:
+            raise ResourceNotFoundException(f"Stream with ARN {resource_arn} not found")
+
+        store = self.get_store(context.account_id, context.region)
+        policy = store.resource_policies.get(resource_arn, json.dumps({}))
+        return GetResourcePolicyOutput(Policy=policy)
+
+    def delete_resource_policy(
+        self,
+        context: RequestContext,
+        resource_arn: ResourceARN,
+        **kwargs,
+    ) -> None:
+        if not is_valid_kinesis_arn(resource_arn):
+            raise ValidationException(f"invalid kinesis arn {resource_arn}")
+
+        store = self.get_store(context.account_id, context.region)
+        if resource_arn not in store.resource_policies:
+            raise ResourceNotFoundException(
+                f"No resource policy found for resource ARN {resource_arn}"
+            )
+        del store.resource_policies[resource_arn]
+
     def subscribe_to_shard(
         self,
         context: RequestContext,

localstack/services/kms/provider.py

@@ -85,6 +85,7 @@ from localstack.aws.api.kms import (
     MacAlgorithmSpec,
     MarkerType,
     MultiRegionKey,
+    MultiRegionKeyType,
     NotFoundException,
     NullableBooleanType,
     OriginType,
@@ -490,24 +491,32 @@ class KmsProvider(KmsApi, ServiceLifecycleHook):
         self, context: RequestContext, request: ReplicateKeyRequest
     ) -> ReplicateKeyResponse:
         account_id = context.account_id
-        key = self._get_kms_key(account_id, context.region, request.get("KeyId"))
-        key_id = key.metadata.get("KeyId")
-        if not key.metadata.get("MultiRegion"):
+        primary_key = self._get_kms_key(account_id, context.region, request.get("KeyId"))
+        key_id = primary_key.metadata.get("KeyId")
+        key_arn = primary_key.metadata.get("Arn")
+        if not primary_key.metadata.get("MultiRegion"):
             raise UnsupportedOperationException(
                 f"Unable to replicate a non-MultiRegion key {key_id}"
             )
         replica_region = request.get("ReplicaRegion")
         replicate_to_store = kms_stores[account_id][replica_region]
+
+        if (
+            primary_key.metadata.get("MultiRegionConfiguration", {}).get("MultiRegionKeyType")
+            != MultiRegionKeyType.PRIMARY
+        ):
+            raise UnsupportedOperationException(f"{key_arn} is not a multi-region primary key.")
+
         if key_id in replicate_to_store.keys:
             raise AlreadyExistsException(
                 f"Unable to replicate key {key_id} to region {replica_region}, as the key "
                 f"already exist there"
             )
-        replica_key = copy.deepcopy(key)
+        replica_key = copy.deepcopy(primary_key)
         replica_key.replicate_metadata(request, account_id, replica_region)
         replicate_to_store.keys[key_id] = replica_key
 
-        self.update_primary_key_with_replica_keys(key, replica_key, replica_region)
+        self.update_primary_key_with_replica_keys(primary_key, replica_key, replica_region)
 
         return ReplicateKeyResponse(ReplicaKeyMetadata=replica_key.metadata)
 

localstack/services/lambda_/invocation/internal_sqs_queue.py

@@ -19,13 +19,9 @@ from localstack.aws.api.sqs import (
     String,
     TagMap,
 )
-from localstack.services.sqs.models import SqsQueue, StandardQueue
-from localstack.services.sqs.provider import (
-    QueueUpdateWorker,
-    _create_message_attribute_hash,
-    to_sqs_api_message,
-)
-from localstack.services.sqs.utils import generate_message_id
+from localstack.services.sqs.models import SqsQueue, StandardQueue, to_sqs_api_message
+from localstack.services.sqs.provider import QueueUpdateWorker
+from localstack.services.sqs.utils import create_message_attribute_hash, generate_message_id
 from localstack.utils.objects import singleton_factory
 from localstack.utils.strings import md5
 from localstack.utils.time import now
@@ -189,7 +185,7 @@ class FakeSqsClient:
             MD5OfBody=md5(MessageBody),
             Body=MessageBody,
             Attributes=self._create_message_attributes(MessageSystemAttributes),
-            MD5OfMessageAttributes=_create_message_attribute_hash(MessageAttributes),
+            MD5OfMessageAttributes=create_message_attribute_hash(MessageAttributes),
             MessageAttributes=MessageAttributes,
         )
         queue_item = queue.put(
@@ -204,7 +200,7 @@ class FakeSqsClient:
             "MD5OfMessageBody": message["MD5OfBody"],
             "MD5OfMessageAttributes": message.get("MD5OfMessageAttributes"),
             "SequenceNumber": queue_item.sequence_number,
-            "MD5OfMessageSystemAttributes": _create_message_attribute_hash(MessageSystemAttributes),
+            "MD5OfMessageSystemAttributes": create_message_attribute_hash(MessageSystemAttributes),
         }
 
 

localstack/services/lambda_/packages.py

@@ -12,7 +12,7 @@ from localstack.utils.platform import get_arch
 """Customized LocalStack version of the AWS Lambda Runtime Interface Emulator (RIE).
 https://github.com/localstack/lambda-runtime-init/blob/localstack/README-LOCALSTACK.md
 """
-LAMBDA_RUNTIME_DEFAULT_VERSION = "v0.1.35-pre"
+LAMBDA_RUNTIME_DEFAULT_VERSION = "v0.1.36-pre"
 LAMBDA_RUNTIME_VERSION = config.LAMBDA_INIT_RELEASE_VERSION or LAMBDA_RUNTIME_DEFAULT_VERSION
 LAMBDA_RUNTIME_INIT_URL = "https://github.com/localstack/lambda-runtime-init/releases/download/{version}/aws-lambda-rie-{arch}"
 

localstack/services/logs/provider.py

@@ -105,7 +105,7 @@ class LogsProvider(LogsApi, ServiceLifecycleHook):
                 "LogGroup name prefix and LogGroup name pattern are mutually exclusive parameters."
             )
 
-        copy_groups = copy.deepcopy(region_backend.groups)
+        copy_groups = copy.deepcopy(dict(region_backend.groups))
 
         groups = [
             group.to_describe_dict()

localstack/services/moto.py

@@ -1,5 +1,5 @@
 """
-This module provides tools to call moto using moto and botocore internals without going through the moto HTTP server.
+This module provides tools to call Moto service implementations.
 """
 
 import copy
@@ -65,6 +65,7 @@ def call_moto_with_request(
         action=context.operation.name,
         parameters=service_request,
         region=context.region,
+        protocol=context.protocol,
     )
     # we keep the headers from the original request, but override them with the ones created from the `service_request`
     headers = copy.deepcopy(context.request.headers)

localstack/services/opensearch/cluster.py

@@ -18,7 +18,12 @@ from localstack.http.client import SimpleRequestsClient
 from localstack.http.proxy import ProxyHandler
 from localstack.services.edge import ROUTER
 from localstack.services.opensearch import versions
-from localstack.services.opensearch.packages import elasticsearch_package, opensearch_package
+from localstack.services.opensearch.packages import (
+    ELASTICSEARCH_DEFAULT_VERSION,
+    OPENSEARCH_DEFAULT_VERSION,
+    elasticsearch_package,
+    opensearch_package,
+)
 from localstack.utils.aws.arns import parse_arn
 from localstack.utils.common import (
     ShellCommandThread,
@@ -37,6 +42,9 @@ LOG = logging.getLogger(__name__)
 INTERNAL_USER_AUTH = ("localstack-internal", "localstack-internal")
 DEFAULT_BACKEND_HOST = "127.0.0.1"
 
+# user that starts the opensearch process if the current user is root
+OS_USER_OPENSEARCH = "localstack"
+
 CommandSettings = dict[str, str]
 
 
@@ -314,7 +322,7 @@ class OpensearchCluster(Server):
 
     @property
     def default_version(self) -> str:
-        return constants.OPENSEARCH_DEFAULT_VERSION
+        return OPENSEARCH_DEFAULT_VERSION
 
     @property
     def version(self) -> str:
@@ -336,7 +344,7 @@ class OpensearchCluster(Server):
 
     @property
     def os_user(self):
-        return constants.OS_USER_OPENSEARCH
+        return OS_USER_OPENSEARCH
 
     def health(self) -> str | None:
         return get_cluster_health_status(self.url, auth=self.auth)
@@ -580,7 +588,7 @@ class EdgeProxiedOpensearchCluster(Server):
 
     @property
     def default_version(self):
-        return constants.OPENSEARCH_DEFAULT_VERSION
+        return OPENSEARCH_DEFAULT_VERSION
 
     @property
     def url(self) -> str:
@@ -658,7 +666,7 @@ class ElasticsearchCluster(OpensearchCluster):
 
     @property
     def default_version(self) -> str:
-        return constants.ELASTICSEARCH_DEFAULT_VERSION
+        return ELASTICSEARCH_DEFAULT_VERSION
 
     @property
     def bin_name(self) -> str:
@@ -666,7 +674,7 @@ class ElasticsearchCluster(OpensearchCluster):
 
     @property
     def os_user(self):
-        return constants.OS_USER_OPENSEARCH
+        return OS_USER_OPENSEARCH
 
     def _ensure_installed(self):
         elasticsearch_package.install(self.version)
@@ -710,7 +718,7 @@ class ElasticsearchCluster(OpensearchCluster):
 class EdgeProxiedElasticsearchCluster(EdgeProxiedOpensearchCluster):
     @property
     def default_version(self):
-        return constants.ELASTICSEARCH_DEFAULT_VERSION
+        return ELASTICSEARCH_DEFAULT_VERSION
 
     def _backend_cluster(self) -> OpensearchCluster:
         return ElasticsearchCluster(

localstack/services/opensearch/packages.py

@@ -9,13 +9,6 @@ import threading
 import semver
 
 from localstack import config
-from localstack.constants import (
-    ELASTICSEARCH_DEFAULT_VERSION,
-    ELASTICSEARCH_DELETE_MODULES,
-    ELASTICSEARCH_PLUGIN_LIST,
-    OPENSEARCH_DEFAULT_VERSION,
-    OPENSEARCH_PLUGIN_LIST,
-)
 from localstack.packages import InstallTarget, Package, PackageInstaller
 from localstack.packages.java import java_package
 from localstack.services.opensearch import versions
@@ -32,6 +25,32 @@ from localstack.utils.sync import SynchronizedDefaultDict, retry
 
 LOG = logging.getLogger(__name__)
 
+# the version of opensearch which is used by default
+OPENSEARCH_DEFAULT_VERSION = "OpenSearch_3.1"
+
+# See https://docs.aws.amazon.com/opensearch-service/latest/developerguide/supported-plugins.html
+OPENSEARCH_PLUGIN_LIST = [
+    "ingest-attachment",
+    "analysis-kuromoji",
+]
+
+# the version of elasticsearch that is pre-seeded into the base image (sync with Dockerfile.base)
+ELASTICSEARCH_DEFAULT_VERSION = "Elasticsearch_7.10"
+
+# See https://docs.aws.amazon.com/ja_jp/elasticsearch-service/latest/developerguide/aes-supported-plugins.html
+ELASTICSEARCH_PLUGIN_LIST = [
+    "analysis-icu",
+    "ingest-attachment",
+    "analysis-kuromoji",
+    "mapper-murmur3",
+    "mapper-size",
+    "analysis-phonetic",
+    "analysis-smartcn",
+    "analysis-stempel",
+    "analysis-ukrainian",
+]
+# Default ES modules to exclude (save apprx 66MB in the final image)
+ELASTICSEARCH_DELETE_MODULES = ["ingest-geoip"]
 
 _OPENSEARCH_INSTALL_LOCKS = SynchronizedDefaultDict(threading.RLock)
 

localstack/services/opensearch/provider.py

@@ -26,6 +26,7 @@ from localstack.aws.api.opensearch import (
     CognitoOptions,
     CognitoOptionsStatus,
     ColdStorageOptions,
+    CompatibleVersionsMap,
     CreateDomainRequest,
     CreateDomainResponse,
     DeleteDomainResponse,
@@ -75,7 +76,6 @@ from localstack.aws.api.opensearch import (
     VolumeType,
     VPCDerivedInfoStatus,
 )
-from localstack.constants import OPENSEARCH_DEFAULT_VERSION
 from localstack.services.opensearch import versions
 from localstack.services.opensearch.cluster import SecurityOptions
 from localstack.services.opensearch.cluster_manager import (
@@ -84,6 +84,7 @@ from localstack.services.opensearch.cluster_manager import (
     create_cluster_manager,
 )
 from localstack.services.opensearch.models import OpenSearchStore, opensearch_stores
+from localstack.services.opensearch.packages import OPENSEARCH_DEFAULT_VERSION
 from localstack.services.plugins import ServiceLifecycleHook
 from localstack.state import AssetDirectory, StateVisitor
 from localstack.utils.aws.arns import parse_arn
@@ -650,6 +651,10 @@ class OpensearchProvider(OpensearchApi, ServiceLifecycleHook):
                 for comp in versions.compatible_versions
                 if comp["SourceVersion"] == version_filter
             ]
+            if not compatible_versions:
+                compatible_versions = [
+                    CompatibleVersionsMap(SourceVersion=version_filter, TargetVersions=[])
+                ]
         return GetCompatibleVersionsResponse(CompatibleVersions=compatible_versions)
 
     def describe_domain_config(

localstack/services/opensearch/versions.py

@@ -13,20 +13,24 @@ from localstack.utils.common import get_arch
 
 # Internal representation of the OpenSearch versions (without the "OpenSearch_" prefix)
 _opensearch_install_versions = {
+    "3.1": "3.1.0",
+    "2.19": "2.19.3",
+    "2.17": "2.17.1",
+    "2.15": "2.15.0",
     "2.13": "2.13.0",
     "2.11": "2.11.1",
     "2.9": "2.9.0",
     "2.7": "2.7.0",
     "2.5": "2.5.0",
     "2.3": "2.3.0",
-    "1.3": "1.3.12",
+    "1.3": "1.3.20",
     "1.2": "1.2.4",
     "1.1": "1.1.0",
     "1.0": "1.0.0",
 }
 # Internal representation of the Elasticsearch versions (without the "Elasticsearch_" prefix)
 _elasticsearch_install_versions = {
-    "7.10": "7.10.0",
+    "7.10": "7.10.2",
     "7.9": "7.9.3",
     "7.8": "7.8.1",
     "7.7": "7.7.1",
@@ -221,6 +225,9 @@ compatible_versions = [
             "OpenSearch_2.9",
             "OpenSearch_2.11",
             "OpenSearch_2.13",
+            "OpenSearch_2.15",
+            "OpenSearch_2.17",
+            "OpenSearch_2.19",
         ],
     ),
     CompatibleVersionsMap(
@@ -231,28 +238,68 @@ compatible_versions = [
             "OpenSearch_2.9",
             "OpenSearch_2.11",
             "OpenSearch_2.13",
+            "OpenSearch_2.15",
+            "OpenSearch_2.17",
+            "OpenSearch_2.19",
         ],
     ),
     CompatibleVersionsMap(
         SourceVersion="OpenSearch_2.5",
-        TargetVersions=["OpenSearch_2.7", "OpenSearch_2.9", "OpenSearch_2.11", "OpenSearch_2.13"],
+        TargetVersions=[
+            "OpenSearch_2.7",
+            "OpenSearch_2.9",
+            "OpenSearch_2.11",
+            "OpenSearch_2.13",
+            "OpenSearch_2.15",
+            "OpenSearch_2.17",
+            "OpenSearch_2.19",
+        ],
     ),
     CompatibleVersionsMap(
         SourceVersion="OpenSearch_2.7",
-        TargetVersions=["OpenSearch_2.9", "OpenSearch_2.11", "OpenSearch_2.13"],
+        TargetVersions=[
+            "OpenSearch_2.9",
+            "OpenSearch_2.11",
+            "OpenSearch_2.13",
+            "OpenSearch_2.15",
+            "OpenSearch_2.17",
+            "OpenSearch_2.19",
+        ],
     ),
     CompatibleVersionsMap(
         SourceVersion="OpenSearch_2.9",
-        TargetVersions=["OpenSearch_2.11", "OpenSearch_2.13"],
+        TargetVersions=[
+            "OpenSearch_2.11",
+            "OpenSearch_2.13",
+            "OpenSearch_2.15",
+            "OpenSearch_2.17",
+            "OpenSearch_2.19",
+        ],
     ),
     CompatibleVersionsMap(
         SourceVersion="OpenSearch_2.11",
-        TargetVersions=["OpenSearch_2.13"],
+        TargetVersions=["OpenSearch_2.13", "OpenSearch_2.15", "OpenSearch_2.17", "OpenSearch_2.19"],
+    ),
+    CompatibleVersionsMap(
+        SourceVersion="OpenSearch_2.13",
+        TargetVersions=["OpenSearch_2.15", "OpenSearch_2.17", "OpenSearch_2.19"],
+    ),
+    CompatibleVersionsMap(
+        SourceVersion="OpenSearch_2.15",
+        TargetVersions=["OpenSearch_2.17", "OpenSearch_2.19"],
+    ),
+    CompatibleVersionsMap(
+        SourceVersion="OpenSearch_2.17",
+        TargetVersions=["OpenSearch_2.19"],
+    ),
+    CompatibleVersionsMap(
+        SourceVersion="OpenSearch_2.19",
+        TargetVersions=["OpenSearch_3.1"],
     ),
 ]
 
 
-def get_install_type_and_version(version: str) -> (EngineType, str):
+def get_install_type_and_version(version: str) -> tuple[EngineType, str]:
     engine_type = EngineType(version.split("_")[0])
 
     if version not in install_versions:
@@ -297,6 +344,8 @@ def get_download_url(install_version: str, engine_type: EngineType) -> str:
         return _opensearch_url(install_version)
     elif engine_type == EngineType.Elasticsearch:
         return _es_url(install_version)
+    else:
+        raise ValueError(f"Unknown OpenSearch engine type: {engine_type}")
 
 
 def fetch_latest_versions() -> dict[str, str]:  # pragma: no cover

localstack/services/s3/constants.py

@@ -10,8 +10,6 @@ from localstack.aws.api.s3 import (
 )
 from localstack.aws.api.s3 import Type as GranteeType
 
-S3_VIRTUAL_HOST_FORWARDED_HEADER = "x-s3-vhost-forwarded-for"
-
 S3_UPLOAD_PART_MIN_SIZE = 5242880
 """
 This is minimum size allowed by S3 when uploading more than one part for a Multipart Upload, except for the last part
@@ -21,6 +19,11 @@ This is minimum size allowed by S3 when uploading more than one part for a Multi
 DEFAULT_PRE_SIGNED_ACCESS_KEY_ID = "test"
 DEFAULT_PRE_SIGNED_SECRET_ACCESS_KEY = "test"
 
+S3_HOST_ID = "9Gjjt1m+cjU4OPvX9O9/8RuvnG41MRb/18Oux2o5H5MY7ISNTlXN+Dz9IG62/ILVxhAGI0qyPfg="
+"""
+S3 is returning a Host Id as part of its exceptions
+"""
+
 AUTHENTICATED_USERS_ACL_GROUP = "http://acs.amazonaws.com/groups/global/AuthenticatedUsers"
 ALL_USERS_ACL_GROUP = "http://acs.amazonaws.com/groups/global/AllUsers"
 LOG_DELIVERY_ACL_GROUP = "http://acs.amazonaws.com/groups/s3/LogDelivery"

localstack/services/s3/cors.py

@@ -21,13 +21,13 @@ from localstack.aws.protocol.op_router import RestServiceOperationRouter
 from localstack.aws.spec import get_service_catalog
 from localstack.config import S3_VIRTUAL_HOSTNAME
 from localstack.http import Request, Response
+from localstack.services.s3.constants import S3_HOST_ID
 from localstack.services.s3.utils import S3_VIRTUAL_HOSTNAME_REGEX
 
 # TODO: add more logging statements
 LOG = logging.getLogger(__name__)
 
 _s3_virtual_host_regex = re.compile(S3_VIRTUAL_HOSTNAME_REGEX)
-FAKE_HOST_ID = "9Gjjt1m+cjU4OPvX9O9/8RuvnG41MRb/18Oux2o5H5MY7ISNTlXN+Dz9IG62/ILVxhAGI0qyPfg="
 
 # TODO: refactor those to expose the needed methods maybe in another way that both can import
 add_default_headers = CorsResponseEnricher.add_cors_headers
@@ -135,7 +135,7 @@ class S3CorsHandler(Handler):
             if is_options_request:
                 context.operation = self._get_op_from_request(request)
                 raise BadRequest(
-                    "Insufficient information. Origin request header needed.", HostId=FAKE_HOST_ID
+                    "Insufficient information. Origin request header needed.", HostId=S3_HOST_ID
                 )
             else:
                 # If the header is missing, Amazon S3 doesn't treat the request as a cross-origin request,
@@ -167,7 +167,7 @@ class S3CorsHandler(Handler):
                     context.operation = self._get_op_from_request(request)
                     raise AccessForbidden(
                         message,
-                        HostId=FAKE_HOST_ID,
+                        HostId=S3_HOST_ID,
                         Method=request.headers.get("Access-Control-Request-Method", "OPTIONS"),
                         ResourceType="BUCKET",
                     )
@@ -182,7 +182,7 @@ class S3CorsHandler(Handler):
                 context.operation = self._get_op_from_request(request)
                 raise AccessForbidden(
                     "CORSResponse: This CORS request is not allowed. This is usually because the evalution of Origin, request method / Access-Control-Request-Method or Access-Control-Request-Headers are not whitelisted by the resource's CORS spec.",
-                    HostId=FAKE_HOST_ID,
+                    HostId=S3_HOST_ID,
                     Method=request.headers.get("Access-Control-Request-Method"),
                     ResourceType="OBJECT",
                 )

localstack/services/s3/notifications.py

@@ -105,7 +105,7 @@ class S3EventNotificationContext:
     key_storage_class: StorageClass | None
 
     @classmethod
-    def from_request_context_native(
+    def from_request_context(
         cls,
         request_context: RequestContext,
         s3_bucket: S3Bucket,