Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix separator in filter_log_events nextToken value. (#3914)

Browse Source 
The old separator was present in some of the values being concatenated.
This commit is contained in:
Neil Greenwood 2021-05-07 18:49:36 +01:00 committed by GitHub
parent 12b409e0de
commit 45167737e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/logs/models.py
View File

@ -389,7 +389,7 @@ class LogGroup(BaseModel):
first_index = 0 first_index = 0
if next_token: if next_token:
try: try:
group, stream, event_id = next_token.split("/") group, stream, event_id = next_token.split("@")
if group != log_group_name: if group != log_group_name:
raise ValueError() raise ValueError()
first_index = ( first_index = (
@ -412,7 +412,7 @@ class LogGroup(BaseModel):
next_token = None next_token = None
if events_page and last_index < len(events): if events_page and last_index < len(events):
last_event = events_page[-1] last_event = events_page[-1]
next_token = "{}/{}/{}".format( next_token = "{}@{}@{}".format(
log_group_name, last_event["logStreamName"], last_event["eventId"] log_group_name, last_event["logStreamName"], last_event["eventId"]
) )

8
tests/test_logs/test_logs.py
View File

@ -129,8 +129,8 @@ def test_filter_logs_raises_if_filter_pattern():
@mock_logs @mock_logs
def test_filter_logs_paging(): def test_filter_logs_paging():
conn = boto3.client("logs", "us-west-2") conn = boto3.client("logs", "us-west-2")
log_group_name = "dummy" log_group_name = "/aws/dummy"
log_stream_name = "stream" log_stream_name = "stream/stage"
conn.create_log_group(logGroupName=log_group_name) conn.create_log_group(logGroupName=log_group_name)
conn.create_log_stream(logGroupName=log_group_name, logStreamName=log_stream_name) conn.create_log_stream(logGroupName=log_group_name, logStreamName=log_stream_name)
timestamp = int(time.time()) timestamp = int(time.time())
@ -149,7 +149,7 @@ def test_filter_logs_paging():
) )
events = res["events"] events = res["events"]
events.should.have.length_of(20) events.should.have.length_of(20)
res["nextToken"].should.equal("dummy/stream/" + events[-1]["eventId"]) res["nextToken"].should.equal("/aws/dummy@stream/stage@" + events[-1]["eventId"])
res = conn.filter_log_events( res = conn.filter_log_events(
logGroupName=log_group_name, logGroupName=log_group_name,
@ -179,7 +179,7 @@ def test_filter_logs_paging():
logGroupName=log_group_name, logGroupName=log_group_name,
logStreamNames=[log_stream_name], logStreamNames=[log_stream_name],
limit=20, limit=20,
nextToken="wrong-group/stream/999", nextToken="wrong-group@stream@999",
) )
res["events"].should.have.length_of(0) res["events"].should.have.length_of(0)
res.should_not.have.key("nextToken") res.should_not.have.key("nextToken")