localstack-core 4.7.1.dev49__py3-none-any.whl → 4.10.1.dev12__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)
@@ -49,7 +63,12 @@ def find_stream_for_consumer(consumer_arn):
         for cons in kinesis.list_stream_consumers(StreamARN=stream_arn)["Consumers"]:
             if cons["ConsumerARN"] == consumer_arn:
                 return stream_name
-    raise Exception("Unable to find stream for stream consumer %s" % 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):
@@ -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,
@@ -125,7 +202,13 @@ class KinesisProvider(KinesisApi, ServiceLifecycleHook):
                     raise
                 shard_iterator = result.get("NextShardIterator")
                 records = result.get("Records", [])
-                if not records:
+                if records:
+                    # Update the last sequence number to the last record's sequence number
+                    # TODO: This will suffice for now but does not properly capture checkpointing when
+                    # no data is written to a shard. See AWS docs:
+                    # https://docs.aws.amazon.com/kinesis/latest/APIReference/API_SubscribeToShardEvent.html#API_SubscribeToShardEvent_Contents
+                    last_sequence_number = records[-1].get("SequenceNumber", last_sequence_number)
+                else:
                     # On AWS there is *at least* 1 event every 5 seconds
                     # but this is not possible in this structure.
                     # In order to avoid a 5-second blocking call, we make the compromise of 3 seconds.
@@ -136,7 +219,7 @@ class KinesisProvider(KinesisApi, ServiceLifecycleHook):
                         Records=records,
                         ContinuationSequenceNumber=str(last_sequence_number),
                         MillisBehindLatest=0,
-                        ChildShards=[],
+                        ChildShards=None,  # TODO: Include shard children info
                     )
                 )
 

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_/api_utils.py

@@ -8,6 +8,7 @@ import re
 import string
 from typing import TYPE_CHECKING, Any
 
+from localstack import config
 from localstack.aws.api import CommonServiceException, RequestContext
 from localstack.aws.api import lambda_ as api_spec
 from localstack.aws.api.lambda_ import (
@@ -665,7 +666,9 @@ def validate_and_set_batch_size(service: str, batch_size: int | None = None) ->
 def map_layer_out(layer_version: "LayerVersion") -> PublishLayerVersionResponse:
     return PublishLayerVersionResponse(
         Content=LayerVersionContentOutput(
-            Location=layer_version.code.generate_presigned_url(),
+            Location=layer_version.code.generate_presigned_url(
+                endpoint_url=config.external_service_url()
+            ),
             CodeSha256=layer_version.code.code_sha256,
             CodeSize=layer_version.code.code_size,
             # SigningProfileVersionArn="", # same as in function configuration
@@ -715,12 +718,12 @@ def validate_layer_runtimes_and_architectures(
 
     if compatible_runtimes and set(compatible_runtimes).difference(ALL_RUNTIMES):
         constraint = f"Member must satisfy enum value set: {VALID_RUNTIMES}"
-        validation_msg = f"Value '[{', '.join([s for s in compatible_runtimes])}]' at 'compatibleRuntimes' failed to satisfy constraint: {constraint}"
+        validation_msg = f"Value '[{', '.join(list(compatible_runtimes))}]' at 'compatibleRuntimes' failed to satisfy constraint: {constraint}"
         validations.append(validation_msg)
 
     if compatible_architectures and set(compatible_architectures).difference(ARCHITECTURES):
         constraint = "[Member must satisfy enum value set: [x86_64, arm64]]"
-        validation_msg = f"Value '[{', '.join([s for s in compatible_architectures])}]' at 'compatibleArchitectures' failed to satisfy constraint: Member must satisfy constraint: {constraint}"
+        validation_msg = f"Value '[{', '.join(list(compatible_architectures))}]' at 'compatibleArchitectures' failed to satisfy constraint: Member must satisfy constraint: {constraint}"
         validations.append(validation_msg)
 
     return validations

localstack/services/lambda_/invocation/docker_runtime_executor.py

@@ -280,7 +280,7 @@ class DockerRuntimeExecutor(RuntimeExecutor):
     container_name: str
 
     def __init__(self, id: str, function_version: FunctionVersion) -> None:
-        super(DockerRuntimeExecutor, self).__init__(id=id, function_version=function_version)
+        super().__init__(id=id, function_version=function_version)
         self.ip = None
         self.executor_endpoint = ExecutorEndpoint(self.id)
         self.container_name = self._generate_container_name()

localstack/services/lambda_/invocation/event_manager.py

@@ -42,7 +42,7 @@ def get_sqs_client(function_version: FunctionVersion, client_config=None):
 # TODO: remove once DLQ handling is refactored following the removal of the legacy lambda provider
 class LegacyInvocationException(Exception):
     def __init__(self, message, log_output=None, result=None):
-        super(LegacyInvocationException, self).__init__(message)
+        super().__init__(message)
         self.log_output = log_output
         self.result = result
 

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_/invocation/lambda_models.py

@@ -14,6 +14,7 @@ from datetime import datetime
 from pathlib import Path
 from typing import IO, Literal, TypedDict
 
+import boto3
 from botocore.exceptions import ClientError
 
 from localstack import config
@@ -40,7 +41,7 @@ from localstack.aws.api.lambda_ import (
     TracingMode,
 )
 from localstack.aws.connect import connect_to
-from localstack.constants import AWS_REGION_US_EAST_1
+from localstack.constants import AWS_REGION_US_EAST_1, INTERNAL_AWS_SECRET_ACCESS_KEY
 from localstack.services.lambda_.api_utils import qualified_lambda_arn, unqualified_lambda_arn
 from localstack.utils.archives import unzip
 from localstack.utils.strings import long_uid, short_uid
@@ -74,7 +75,7 @@ InitializationType = Literal["on-demand", "provisioned-concurrency"]
 
 class ArchiveCode(metaclass=ABCMeta):
     @abstractmethod
-    def generate_presigned_url(self, endpoint_url: str | None = None):
+    def generate_presigned_url(self, endpoint_url: str):
         """
         Generates a presigned url pointing to the code archive
         """
@@ -168,15 +169,17 @@ class S3Code(ArchiveCode):
         )
         target_file.flush()
 
-    def generate_presigned_url(self, endpoint_url: str | None = None) -> str:
+    def generate_presigned_url(self, endpoint_url: str) -> str:
         """
         Generates a presigned url pointing to the code archive
         """
-        s3_client = connect_to(
+        s3_client = boto3.client(
+            "s3",
             region_name=AWS_REGION_US_EAST_1,
             aws_access_key_id=config.INTERNAL_RESOURCE_ACCOUNT,
+            aws_secret_access_key=INTERNAL_AWS_SECRET_ACCESS_KEY,
             endpoint_url=endpoint_url,
-        ).s3
+        )
         params = {"Bucket": self.s3_bucket, "Key": self.s3_key}
         if self.s3_object_version:
             params["VersionId"] = self.s3_object_version
@@ -257,8 +260,8 @@ class HotReloadingCode(ArchiveCode):
     code_sha256: str = "hot-reloading-hash-not-available"
     code_size: int = 0
 
-    def generate_presigned_url(self, endpoint_url: str | None = None) -> str:
-        return f"Code location: {self.host_path}"
+    def generate_presigned_url(self, endpoint_url: str) -> str:
+        return f"file://{self.host_path}"
 
     def get_unzipped_code_location(self) -> Path:
         path = os.path.expandvars(self.host_path)

localstack/services/lambda_/invocation/lambda_service.py

@@ -478,7 +478,11 @@ class LambdaService:
             ] = new_version_state
 
         except Exception:
-            LOG.exception("Failed to update function version for arn %s", function_arn)
+            LOG.error(
+                "Failed to update function version for arn %s",
+                function_arn,
+                exc_info=LOG.isEnabledFor(logging.DEBUG),
+            )
 
     def update_alias(self, old_alias: VersionAlias, new_alias: VersionAlias, function: Function):
         # if pointer changed, need to restart provisioned

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.34-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/lambda_/provider.py

@@ -313,7 +313,7 @@ class LambdaProvider(LambdaApi, ServiceLifecycleHook):
                             LOG.warning(
                                 "Failed to restore function version %s",
                                 fn_version.id.qualified_arn(),
-                                exc_info=True,
+                                exc_info=LOG.isEnabledFor(logging.DEBUG),
                             )
                     # restore provisioned concurrency per function considering both versions and aliases
                     for (
@@ -344,7 +344,7 @@ class LambdaProvider(LambdaApi, ServiceLifecycleHook):
                                 "Failed to restore provisioned concurrency %s for function %s",
                                 provisioned_config,
                                 fn_arn,
-                                exc_info=True,
+                                exc_info=LOG.isEnabledFor(logging.DEBUG),
                             )
 
                 for esm in state.event_source_mappings.values():
@@ -1512,7 +1512,8 @@ class LambdaProvider(LambdaApi, ServiceLifecycleHook):
         code_location = None
         if code := version.config.code:
             code_location = FunctionCodeLocation(
-                Location=code.generate_presigned_url(), RepositoryType="S3"
+                Location=code.generate_presigned_url(endpoint_url=config.external_service_url()),
+                RepositoryType="S3",
             )
         elif image := version.config.image:
             code_location = FunctionCodeLocation(

localstack/services/lambda_/provider_utils.py

@@ -74,7 +74,7 @@ class LambdaLayerVersionIdentifier(ResourceIdentifier):
     resource = "layer-version"
 
     def __init__(self, account_id: str, region: str, layer_name: str):
-        super(LambdaLayerVersionIdentifier, self).__init__(account_id, region, layer_name)
+        super().__init__(account_id, region, layer_name)
 
     def generate(
         self, existing_ids: ExistingIds = None, tags: Tags = None, next_version: int = None

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)