Skip to content

Commit 4128af2

Browse files
authored
Merge pull request #432 from 0xdabbad00/bump_version
Bump version, plus some other fixes
2 parents 4ce198b + 47007d0 commit 4128af2

File tree

3 files changed

+5
-20
lines changed

3 files changed

+5
-20
lines changed

README.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,6 @@ You must have the following privileges (these grant various read access of metad
9292
- `arn:aws:iam::aws:policy/SecurityAudit`
9393
- `arn:aws:iam::aws:policy/job-function/ViewOnlyAccess`
9494

95-
And also:
96-
```
97-
{
98-
"Version": "2012-10-17",
99-
"Statement": [
100-
{
101-
"Action": [
102-
"lightsail:GetLoadBalancers"
103-
],
104-
"Resource": "*",
105-
"Effect": "Allow"
106-
}
107-
]
108-
}
109-
```
11095

11196
### Collect the data
11297

cloudmapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import pkgutil
3131
import importlib
3232

33-
__version__ = "2.5.5"
33+
__version__ = "2.5.6"
3434

3535

3636
def show_help(commands):

shared/nodes.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,11 @@ def security_groups(self):
316316
def __init__(self, parent, json_blob, collapse_by_tag=None, collapse_asgs=True):
317317
autoscaling_name = []
318318
if collapse_asgs:
319-
autoscaling_name = pyjq.all('.Tags[] | select(.Key == "aws:autoscaling:groupName") | .Value', json_blob)
319+
autoscaling_name = pyjq.all('.Tags[]? | select(.Key == "aws:autoscaling:groupName") | .Value', json_blob)
320320

321321
collapse_by_tag_value = []
322322
if collapse_by_tag:
323-
collapse_by_tag_value = pyjq.all('.Tags[] | select(.Key == "{}") | .Value'.format(collapse_by_tag), json_blob)
323+
collapse_by_tag_value = pyjq.all('.Tags[]? | select(.Key == "{}") | .Value'.format(collapse_by_tag), json_blob)
324324

325325
if autoscaling_name != []:
326326
self._type = "autoscaling"
@@ -376,7 +376,7 @@ def is_public(self):
376376

377377
@property
378378
def security_groups(self):
379-
return pyjq.all('.SecurityGroups[]', self._json_blob)
379+
return pyjq.all('.SecurityGroups[]?', self._json_blob)
380380

381381
def __init__(self, parent, json_blob):
382382
self._type = "elb"
@@ -429,7 +429,7 @@ def is_public(self):
429429

430430
@property
431431
def security_groups(self):
432-
return pyjq.all('.SecurityGroups[]', self._json_blob)
432+
return pyjq.all('.SecurityGroups[]?', self._json_blob)
433433

434434
def __init__(self, parent, json_blob):
435435
self._type = "elbv2"

0 commit comments

Comments
 (0)