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

localstack/services/lambda_/provider.py

@@ -3728,7 +3728,7 @@ class LambdaProvider(LambdaApi, ServiceLifecycleHook):
         if not layer_version:
             raise ValidationException(
                 f"1 validation error detected: Value '{arn}' at 'arn' failed to satisfy constraint: Member must satisfy regular expression pattern: "
-                + "(arn:(aws[a-zA-Z-]*)?:lambda:[a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}:\\d{12}:layer:[a-zA-Z0-9-_]+:[0-9]+)|(arn:[a-zA-Z0-9-]+:lambda:::awslayer:[a-zA-Z0-9-_]+)"
+                + "(arn:(aws[a-zA-Z-]*)?:lambda:(eusc-)?[a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}:\\d{12}:layer:[a-zA-Z0-9-_]+:[0-9]+)|(arn:[a-zA-Z0-9-]+:lambda:::awslayer:[a-zA-Z0-9-_]+)"
             )
 
         store = lambda_stores[account_id][region_name]

localstack/services/lambda_/runtimes.py

@@ -23,7 +23,7 @@ from localstack.aws.api.lambda_ import Runtime
 # 5. Run the unit test to check the runtime setup:
 # tests.unit.services.lambda_.test_api_utils.TestApiUtils.test_check_runtime
 # 6. Review special tests including:
-# a) [ext] tests.aws.services.lambda_.test_lambda_endpoint_injection
+# a) [pro] tests.aws.services.lambda_.test_lambda_endpoint_injection
 # 7. Before merging, run the ext integration tests to cover transparent endpoint injection testing.
 # 8. Add the new runtime to the K8 image build: https://github.com/localstack/lambda-images
 # 9. Inform the web team to update the resource browser (consider offering an endpoint in the future)
@@ -40,6 +40,7 @@ IMAGE_MAPPING: dict[Runtime, str] = {
     Runtime.nodejs16_x: "nodejs:16",
     Runtime.nodejs14_x: "nodejs:14",  # deprecated Dec 4, 2023  => Jan 9, 2024  => Feb 8, 2024
     Runtime.nodejs12_x: "nodejs:12",  # deprecated Mar 31, 2023 => Mar 31, 2023 => Apr 30, 2023
+    Runtime.python3_14: "python:3.14",
     Runtime.python3_13: "python:3.13",
     Runtime.python3_12: "python:3.12",
     Runtime.python3_11: "python:3.11",
@@ -47,6 +48,7 @@ IMAGE_MAPPING: dict[Runtime, str] = {
     Runtime.python3_9: "python:3.9",
     Runtime.python3_8: "python:3.8",
     Runtime.python3_7: "python:3.7",  # deprecated Dec 4, 2023 => Jan 9, 2024 => Feb 8, 2024
+    Runtime.java25: "java:25",
     Runtime.java21: "java:21",
     Runtime.java17: "java:17",
     Runtime.java11: "java:11",
@@ -116,6 +118,7 @@ RUNTIMES_AGGREGATED = {
         Runtime.nodejs16_x,
     ],
     "python": [
+        Runtime.python3_14,
         Runtime.python3_13,
         Runtime.python3_12,
         Runtime.python3_11,
@@ -124,6 +127,7 @@ RUNTIMES_AGGREGATED = {
         Runtime.python3_8,
     ],
     "java": [
+        Runtime.java25,
         Runtime.java21,
         Runtime.java17,
         Runtime.java11,
@@ -155,12 +159,13 @@ SNAP_START_SUPPORTED_RUNTIMES = [
     Runtime.java11,
     Runtime.java17,
     Runtime.java21,
+    Runtime.java25,
     Runtime.python3_12,
     Runtime.python3_13,
     Runtime.dotnet8,
 ]
 
 # An ordered list of all Lambda runtimes considered valid by AWS. Matching snapshots in test_create_lambda_exceptions
-VALID_RUNTIMES: str = "[nodejs20.x, provided.al2023, python3.12, python3.13, nodejs22.x, java17, nodejs16.x, dotnet8, python3.10, java11, python3.11, dotnet6, java21, nodejs18.x, provided.al2, ruby3.3, ruby3.4, java8.al2, ruby3.2, python3.8, python3.9]"
+VALID_RUNTIMES: str = "[nodejs20.x, python3.14, provided.al2023, python3.12, python3.13, nodejs22.x, java17, nodejs16.x, java25, dotnet8, python3.10, java11, python3.11, dotnet6, java21, nodejs18.x, provided.al2, ruby3.3, ruby3.4, java8.al2, ruby3.2, python3.8, python3.9]"
 # An ordered list of all Lambda runtimes for layers considered valid by AWS. Matching snapshots in test_layer_exceptions
-VALID_LAYER_RUNTIMES: str = "[ruby2.6, dotnetcore1.0, python3.7, nodejs8.10, nasa, ruby2.7, python2.7-greengrass, dotnetcore2.0, python3.8, java21, dotnet6, dotnetcore2.1, python3.9, java11, nodejs6.10, provided, dotnetcore3.1, dotnet8, java25, java17, nodejs, nodejs4.3, java8.al2, go1.x, dotnet10, nodejs20.x, go1.9, byol, nodejs10.x, provided.al2023, nodejs22.x, python3.10, java8, nodejs12.x, python3.11, nodejs24.x, nodejs8.x, python3.12, nodejs14.x, nodejs8.9, python3.13, python3.14, nodejs16.x, provided.al2, nodejs4.3-edge, nodejs18.x, ruby3.2, python3.4, ruby3.3, ruby3.4, ruby2.5, python3.6, python2.7]"
+VALID_LAYER_RUNTIMES: str = "[ruby3.5, ruby2.6, dotnetcore1.0, python3.7, nodejs8.10, nasa, ruby2.7, python2.7-greengrass, dotnetcore2.0, python3.8, java21, dotnet6, dotnetcore2.1, python3.9, java11, nodejs6.10, provided, dotnetcore3.1, dotnet8, java25, java17, nodejs, nodejs4.3, java8.al2, go1.x, dotnet10, nodejs20.x, go1.9, byol, nodejs10.x, provided.al2023, nodejs22.x, python3.10, java8, nodejs12.x, python3.11, nodejs24.x, nodejs8.x, python3.12, nodejs14.x, nodejs8.9, nodejs26.x, python3.13, python3.14, nodejs16.x, python3.15, provided.al2, nodejs4.3-edge, nodejs18.x, ruby3.2, python3.4, ruby3.3, ruby3.4, ruby2.5, python3.6, python2.7]"

localstack/services/logs/provider.py

@@ -22,10 +22,13 @@ from localstack.aws.api.logs import (
     InputLogEvents,
     InvalidParameterException,
     KmsKeyId,
+    ListLogGroupsRequest,
+    ListLogGroupsResponse,
     ListTagsForResourceResponse,
     ListTagsLogGroupResponse,
     LogGroupClass,
     LogGroupName,
+    LogGroupSummary,
     LogsApi,
     LogStreamName,
     PutLogEventsResponse,
@@ -43,7 +46,7 @@ from localstack.services.plugins import ServiceLifecycleHook
 from localstack.utils.aws import arns
 from localstack.utils.aws.client_types import ServicePrincipal
 from localstack.utils.bootstrap import is_api_enabled
-from localstack.utils.common import is_number
+from localstack.utils.numbers import is_number
 from localstack.utils.patch import patch
 
 LOG = logging.getLogger(__name__)
@@ -60,8 +63,8 @@ class LogsProvider(LogsApi, ServiceLifecycleHook):
         log_group_name: LogGroupName,
         log_stream_name: LogStreamName,
         log_events: InputLogEvents,
-        sequence_token: SequenceToken = None,
-        entity: Entity = None,
+        sequence_token: SequenceToken | None = None,
+        entity: Entity | None = None,
         **kwargs,
     ) -> PutLogEventsResponse:
         logs_backend = get_moto_logs_backend(context.account_id, context.region)
@@ -97,33 +100,32 @@ class LogsProvider(LogsApi, ServiceLifecycleHook):
     ) -> DescribeLogGroupsResponse:
         region_backend = get_moto_logs_backend(context.account_id, context.region)
 
-        prefix: str = request.get("logGroupNamePrefix", "")
-        pattern: str = request.get("logGroupNamePattern", "")
+        prefix: str | None = request.get("logGroupNamePrefix", "")
+        pattern: str | None = request.get("logGroupNamePattern", "")
 
         if pattern and prefix:
             raise InvalidParameterException(
                 "LogGroup name prefix and LogGroup name pattern are mutually exclusive parameters."
             )
 
-        copy_groups = copy.deepcopy(region_backend.groups)
+        moto_groups = copy.deepcopy(dict(region_backend.groups)).values()
 
         groups = [
-            group.to_describe_dict()
-            for name, group in copy_groups.items()
+            {"logGroupClass": LogGroupClass.STANDARD} | group.to_describe_dict()
+            for group in sorted(moto_groups, key=lambda g: g.name)
             if not (prefix or pattern)
-            or (prefix and name.startswith(prefix))
-            or (pattern and pattern in name)
+            or (prefix and group.name.startswith(prefix))
+            or (pattern and pattern in group.name)
         ]
 
-        groups = sorted(groups, key=lambda x: x["logGroupName"])
         return DescribeLogGroupsResponse(logGroups=groups)
 
     @handler("DescribeLogStreams", expand=False)
     def describe_log_streams(
         self, context: RequestContext, request: DescribeLogStreamsRequest
     ) -> DescribeLogStreamsResponse:
-        log_group_name: str = request.get("logGroupName")
-        log_group_identifier: str = request.get("logGroupIdentifier")
+        log_group_name: str | None = request.get("logGroupName")
+        log_group_identifier: str | None = request.get("logGroupIdentifier")
 
         if log_group_identifier and log_group_name:
             raise CommonServiceException(
@@ -138,13 +140,29 @@ class LogsProvider(LogsApi, ServiceLifecycleHook):
 
         return moto.call_moto_with_request(context, request_copy)
 
+    @handler("ListLogGroups", expand=False)
+    def list_log_groups(
+        self, context: RequestContext, request: ListLogGroupsRequest
+    ) -> ListLogGroupsResponse:
+        pattern: str | None = request.get("logGroupNamePattern")
+        region_backend: LogsBackend = get_moto_logs_backend(context.account_id, context.region)
+        moto_groups = copy.deepcopy(region_backend.groups).values()
+        groups = [
+            LogGroupSummary(
+                logGroupName=group.name, logGroupArn=group.arn, logGroupClass=LogGroupClass.STANDARD
+            )
+            for group in sorted(moto_groups, key=lambda g: g.name)
+            if not pattern or pattern in group.name
+        ]
+        return ListLogGroupsResponse(logGroups=groups)
+
     def create_log_group(
         self,
         context: RequestContext,
         log_group_name: LogGroupName,
-        kms_key_id: KmsKeyId = None,
-        tags: Tags = None,
-        log_group_class: LogGroupClass = None,
+        kms_key_id: KmsKeyId | None = None,
+        tags: Tags | None = None,
+        log_group_class: LogGroupClass | None = None,
         **kwargs,
     ) -> None:
         call_moto(context)
@@ -442,10 +460,9 @@ def moto_to_describe_dict(target, self):
     # reported race condition in https://github.com/localstack/localstack/issues/8011
     # making copy of "streams" dict here to avoid issues while summing up storedBytes
     copy_streams = copy.deepcopy(self.streams)
-    # parity tests shows that the arn ends with ":*"
-    arn = self.arn if self.arn.endswith(":*") else f"{self.arn}:*"
     log_group = {
-        "arn": arn,
+        "arn": f"{self.arn}:*",
+        "logGroupArn": self.arn,
         "creationTime": self.creation_time,
         "logGroupName": self.name,
         "metricFilterCount": 0,

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,