Merge branch 'refactoring/resource-configs' into refactoring/aws/elas…

…ticache
nccgroup · Mar 10, 2019 · 763ccd7 · 763ccd7
2 parents eec2674 + 25e2ed7
commit 763ccd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ScoutSuite/providers/aws/resources/cloudtrail/service.py b/ScoutSuite/providers/aws/resources/cloudtrail/service.py
@@ -9,10 +9,10 @@ class Trails(AWSResources):
     async def fetch_all(self, **kwargs):
         raw_trails = await self.facade.cloudtrail.get_trails(self.scope['region'])
         for raw_trail in raw_trails:
-            name, resource = self._parse(raw_trail)
+            name, resource = self._parse_trail(raw_trail)
             self[name] = resource
 
-    def _parse(self, raw_trail):
+    def _parse_trail(self, raw_trail):
         trail = {'name': raw_trail.pop('Name')}
         trail_id = get_non_provider_id(trail['name'])
 

diff --git a/ScoutSuite/providers/aws/resources/cloudwatch/service.py b/ScoutSuite/providers/aws/resources/cloudwatch/service.py
@@ -9,10 +9,10 @@ class Alarms(AWSResources):
     async def fetch_all(self, **kwargs):
         raw_alarms = await self.facade.cloudwatch.get_alarms(self.scope['region'])
         for raw_alarm in raw_alarms:
-            name, resource = self._parse(raw_alarm)
+            name, resource = self._parse_alarm(raw_alarm)
             self[name] = resource
 
-    def _parse(self, raw_alarm):
+    def _parse_alarm(self, raw_alarm):
         raw_alarm['arn'] = raw_alarm.pop('AlarmArn')
         raw_alarm['name'] = raw_alarm.pop('AlarmName')