fix: update return chunk through yield

Author: jihyungSong

src/spaceone/monitoring/conf/monitoring_conf.py

@@ -1,8 +1,8 @@
 DEFAULT_REGION = 'us-east-1'
 DEFAULT_SCHEMA = 'aws_access_key'
-NUM_OF_LIMIT = 100
 PAGINATOR_MAX_ITEMS = 10000
 PAGINATOR_PAGE_SIZE = 50
+LIMIT = 1000
 
 EXCLUDE_EVENT_NAME = [
     'AddTags',

src/spaceone/monitoring/connector/cloudtrail_connector.py

@@ -1,6 +1,8 @@
 import logging
 from spaceone.core.utils import load_json
 from spaceone.monitoring.libs.connector import AWSConnector
+from spaceone.monitoring.conf.monitoring_conf import *
+
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -15,7 +17,7 @@ def lookup_events(self, params):
         query = params['query']
         start = params['start']
         end = params['end']
-        limit = params.get('limit', 1000)   # Force throttling because too many events cause performance issues
+        limit = params.get('limit', LIMIT)   # Force throttling because too many events cause performance issues
 
         lookup_attributes = query.get('LookupAttributes', [])
 

src/spaceone/monitoring/manager/monitoring_manager.py

@@ -33,6 +33,7 @@ def lookup_events(self, params):
 
         region_name = params['query'].get('region_name', DEFAULT_REGION)
         resource_type = params['query'].get('resource_type')
+        limit = params.get('limit', LIMIT)
 
         cloudtrail_connector: CloudTrailConnector = self.locator.get_connector('CloudTrailConnector', **params)
         cloudtrail_connector.set_client(region_name)
@@ -47,21 +48,23 @@ def lookup_events(self, params):
                 events.extend(self.get_events_iam_user(params))
 
         event_chunk = []
-        for event in events:
+        for event in events[:limit]:
             event_chunk.append(event)
 
             if len(event_chunk) == PAGINATOR_PAGE_SIZE:
                 yield event_chunk
                 event_chunk = []
 
+        yield event_chunk
+
     def set_events(self, events, keyword, resource_type):
         event_vos = []
         for event in events:
             if keyword:
                 if keyword.lower() not in event.get('EventName', '').lower():
                     continue
 
-            if resource_type:
+            if resource_type and resource_type != 'AWS::IAM::AccessKey':
                 if filtered_event := self.filter_resource_type(event, resource_type):
                     event_vos.append(filtered_event)
             else:
@@ -103,7 +106,6 @@ def get_events_iam_access_key(self, params):
             cloudtrail_connector.set_client(region_name)
             for access_key_events in cloudtrail_connector.lookup_events(params):
                 events.extend(access_key_events)
-
         return sorted(events, key=lambda event: event.get('EventTime'), reverse=True)
 
     @staticmethod