diff --git a/moto/logs/models.py b/moto/logs/models.py index 3bb1892a40c9..09208603a2d6 100644 --- a/moto/logs/models.py +++ b/moto/logs/models.py @@ -1578,9 +1578,12 @@ def _find_log_group( raise InvalidParameterException( msg="1 validation error detected: Value at 'logGroupIdentifier' failed to satisfy constraint: Member must satisfy regular expression pattern: [\\w#+=/:,.@-]*" ) - for log_group in self.groups.values(): - if log_group.arn == log_group_id: - log_group = log_group + log_group = self.groups.get(log_group_id) + if log_group is None: + for candidate in self.groups.values(): + if candidate.arn == log_group_id: + log_group = candidate + break else: raise InvalidParameterException( "Should provider either name or id, but not both" diff --git a/tests/test_logs/test_log_group_identifier.py b/tests/test_logs/test_log_group_identifier.py new file mode 100644 index 000000000000..2819bb8fd83e --- /dev/null +++ b/tests/test_logs/test_log_group_identifier.py @@ -0,0 +1,53 @@ +from time import time + +import boto3 +import pytest +from botocore.exceptions import ClientError + +from moto import mock_aws +from moto.core import DEFAULT_ACCOUNT_ID + + +@mock_aws +@pytest.mark.parametrize("identifier_type", ["name", "arn"]) +def test_log_group_identifier_selects_the_requested_group(identifier_type): + client = boto3.client("logs", region_name="us-east-1") + for name in ["first", "second"]: + client.create_log_group(logGroupName=name) + client.create_log_stream(logGroupName=name, logStreamName=name) + client.put_log_events( + logGroupName=name, + logStreamName=name, + logEvents=[{"timestamp": int(time() * 1000), "message": name}], + ) + + identifier = "first" + if identifier_type == "arn": + identifier = f"arn:aws:logs:us-east-1:{DEFAULT_ACCOUNT_ID}:log-group:first" + + streams = client.describe_log_streams(logGroupIdentifier=identifier)["logStreams"] + assert [stream["logStreamName"] for stream in streams] == ["first"] + events = client.get_log_events( + logGroupIdentifier=identifier, logStreamName="first" + )["events"] + assert [event["message"] for event in events] == ["first"] + + +@mock_aws +@pytest.mark.parametrize("identifier_type", ["name", "arn"]) +@pytest.mark.parametrize("operation", ["describe_log_streams", "get_log_events"]) +def test_unknown_log_group_identifier_does_not_select_another_group( + identifier_type, operation +): + client = boto3.client("logs", region_name="us-east-1") + client.create_log_group(logGroupName="existing") + client.create_log_stream(logGroupName="existing", logStreamName="stream") + identifier = "missing" + if identifier_type == "arn": + identifier = f"arn:aws:logs:us-east-1:{DEFAULT_ACCOUNT_ID}:log-group:missing" + kwargs = {"logGroupIdentifier": identifier} + if operation == "get_log_events": + kwargs["logStreamName"] = "stream" + with pytest.raises(ClientError) as exc: + getattr(client, operation)(**kwargs) + assert exc.value.response["Error"]["Code"] == "ResourceNotFoundException"