Merge pull request #432 from 0xdabbad00/bump_version

Bump version, plus some other fixes
duo-labs · Jun 10, 2019 · 4128af2 · 4128af2
2 parents 4ce198b + 47007d0
commit 4128af2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -92,21 +92,6 @@ You must have the following privileges (these grant various read access of metad
 - `arn:aws:iam::aws:policy/SecurityAudit`
 - `arn:aws:iam::aws:policy/job-function/ViewOnlyAccess`
 
-And also:
-```
-{
-    "Version": "2012-10-17",
-    "Statement": [
-        {
-            "Action": [
-                "lightsail:GetLoadBalancers"
-            ],
-            "Resource": "*",
-            "Effect": "Allow"
-        }
-    ]
-}
-```
 
 ### Collect the data
 

diff --git a/cloudmapper.py b/cloudmapper.py
@@ -30,7 +30,7 @@
 import pkgutil
 import importlib
 
-__version__ = "2.5.5"
+__version__ = "2.5.6"
 
 
 def show_help(commands):

diff --git a/shared/nodes.py b/shared/nodes.py
@@ -316,11 +316,11 @@ def security_groups(self):
     def __init__(self, parent, json_blob, collapse_by_tag=None, collapse_asgs=True):
         autoscaling_name = []
         if collapse_asgs:
-            autoscaling_name = pyjq.all('.Tags[] | select(.Key == "aws:autoscaling:groupName") | .Value', json_blob)
+            autoscaling_name = pyjq.all('.Tags[]? | select(.Key == "aws:autoscaling:groupName") | .Value', json_blob)
 
         collapse_by_tag_value = []
         if collapse_by_tag:
-            collapse_by_tag_value = pyjq.all('.Tags[] | select(.Key == "{}") | .Value'.format(collapse_by_tag), json_blob)
+            collapse_by_tag_value = pyjq.all('.Tags[]? | select(.Key == "{}") | .Value'.format(collapse_by_tag), json_blob)
 
         if autoscaling_name != []:
             self._type = "autoscaling"
@@ -376,7 +376,7 @@ def is_public(self):
 
     @property
     def security_groups(self):
-        return pyjq.all('.SecurityGroups[]', self._json_blob)
+        return pyjq.all('.SecurityGroups[]?', self._json_blob)
 
     def __init__(self, parent, json_blob):
         self._type = "elb"
@@ -429,7 +429,7 @@ def is_public(self):
 
     @property
     def security_groups(self):
-        return pyjq.all('.SecurityGroups[]', self._json_blob)
+        return pyjq.all('.SecurityGroups[]?', self._json_blob)
 
     def __init__(self, parent, json_blob):
         self._type = "elbv2"