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

Handle describe-streams error when log events does not exist.

Browse Source
This commit is contained in:
Toshiya Kawasaki 2018-01-14 14:36:17 +09:00
parent 663283a8f0
commit 4f445a3db5
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
moto/logs/models.py
View File

@ -53,23 +53,29 @@ class LogStream:
self.__class__._log_ids += 1 self.__class__._log_ids += 1
def _update(self): def _update(self):
self.firstEventTimestamp = min([x.timestamp for x in self.events]) # events can be empty when stream is described soon after creation
self.lastEventTimestamp = max([x.timestamp for x in self.events]) self.firstEventTimestamp = min([x.timestamp for x in self.events]) if self.events else None
self.lastEventTimestamp = max([x.timestamp for x in self.events]) if self.events else None
def to_describe_dict(self): def to_describe_dict(self):
# Compute start and end times # Compute start and end times
self._update() self._update()
return { res = {
"arn": self.arn, "arn": self.arn,
"creationTime": self.creationTime, "creationTime": self.creationTime,
"firstEventTimestamp": self.firstEventTimestamp,
"lastEventTimestamp": self.lastEventTimestamp,
"lastIngestionTime": self.lastIngestionTime,
"logStreamName": self.logStreamName, "logStreamName": self.logStreamName,
"storedBytes": self.storedBytes, "storedBytes": self.storedBytes,
"uploadSequenceToken": str(self.uploadSequenceToken),
} }
if self.events:
rest = {
"firstEventTimestamp": self.firstEventTimestamp,
"lastEventTimestamp": self.lastEventTimestamp,
"lastIngestionTime": self.lastIngestionTime,
"uploadSequenceToken": str(self.uploadSequenceToken),
}
res.update(rest)
return res
def put_log_events(self, log_group_name, log_stream_name, log_events, sequence_token): def put_log_events(self, log_group_name, log_stream_name, log_events, sequence_token):
# TODO: ensure sequence_token # TODO: ensure sequence_token
@ -140,10 +146,12 @@ class LogGroup:
del self.streams[log_stream_name] del self.streams[log_stream_name]
def describe_log_streams(self, descending, limit, log_group_name, log_stream_name_prefix, next_token, order_by): def describe_log_streams(self, descending, limit, log_group_name, log_stream_name_prefix, next_token, order_by):
# responses only logStreamName, creationTime, arn, storedBytes when no events are stored.
log_streams = [(name, stream.to_describe_dict()) for name, stream in self.streams.items() if name.startswith(log_stream_name_prefix)] log_streams = [(name, stream.to_describe_dict()) for name, stream in self.streams.items() if name.startswith(log_stream_name_prefix)]
def sorter(item): def sorter(item):
return item[0] if order_by == 'logStreamName' else item[1]['lastEventTimestamp'] return item[0] if order_by == 'logStreamName' else item[1].get('lastEventTimestamp', 0)
if next_token is None: if next_token is None:
next_token = 0 next_token = 0