Skip to content

Commit 500e14f

Browse files
committed
fix: update event return chunk
1 parent 8599e9f commit 500e14f

2 files changed

Lines changed: 14 additions & 7 deletions

File tree

src/spaceone/monitoring/conf/monitoring_conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
DEFAULT_REGION = 'us-east-1'
22
DEFAULT_SCHEMA = 'aws_access_key'
33
NUM_OF_LIMIT = 100
4+
MAX_EVENT_CHUNK_NUM = 20
45

56
EXCLUDE_EVENT_NAME = [
67
'AddTags',

src/spaceone/monitoring/manager/monitoring_manager.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,22 @@ def lookup_events(self, params):
3636
cloudtrail_connector: CloudTrailConnector = self.locator.get_connector('CloudTrailConnector', **params)
3737
cloudtrail_connector.set_client(region_name)
3838

39-
for _events in cloudtrail_connector.lookup_events(params):
40-
events.extend(_events)
41-
42-
if resource_type == 'AWS::IAM::User':
43-
events.extend(self.get_events_iam_user(params))
44-
4539
if resource_type == 'AWS::IAM::AccessKey':
4640
events.extend(self.get_events_iam_access_key(params))
41+
else:
42+
for _events in cloudtrail_connector.lookup_events(params):
43+
events.extend(_events)
44+
45+
if resource_type == 'AWS::IAM::User':
46+
events.extend(self.get_events_iam_user(params))
47+
48+
event_chunk = []
49+
for event in events:
50+
event_chunk.append(event)
4751

48-
return [events]
52+
if len(event_chunk) == MAX_EVENT_CHUNK_NUM:
53+
yield event_chunk
54+
event_chunk = []
4955

5056
def set_events(self, events, keyword, resource_type):
5157
event_vos = []

0 commit comments

Comments
 (0)