Skip to content

Commit f604ab7

Browse files
prowler-botpuchy22
andauthored
chore(ec2): add name from image information to status_extended (#5758)
Co-authored-by: Rubén De la Torre Vico <[email protected]>
1 parent 17a04a5 commit f604ab7

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

prowler/providers/aws/services/ec2/ec2_ami_public/ec2_ami_public.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ def execute(self):
1212
report.resource_arn = image.arn
1313
report.resource_tags = image.tags
1414
report.status = "PASS"
15-
report.status_extended = f"EC2 AMI {image.id} is not public."
15+
report.status_extended = (
16+
f"EC2 AMI {image.name if image.name else image.id} is not public."
17+
)
1618
if image.public:
1719
report.status = "FAIL"
18-
report.status_extended = f"EC2 AMI {image.id} is currently public."
19-
report.resource_id = image.id
20+
report.status_extended = f"EC2 AMI {image.name if image.name else image.id} is currently public."
2021

2122
findings.append(report)
2223

prowler/providers/aws/services/ec2/ec2_service.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ def _describe_images(self, regional_client):
357357
Image(
358358
id=image["ImageId"],
359359
arn=arn,
360-
name=image.get("Name", None),
360+
name=image.get("Name", ""),
361361
public=image.get("Public", False),
362362
region=regional_client.region,
363363
tags=image.get("Tags"),

tests/providers/aws/services/ec2/ec2_ami_public/ec2_ami_public_test.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def test_one_private_ami(self):
7272

7373
assert len(result) == 1
7474
assert result[0].status == "PASS"
75-
assert result[0].status_extended == f"EC2 AMI {image_id} is not public."
75+
assert result[0].status_extended == "EC2 AMI test-ami is not public."
7676
assert result[0].resource_id == image_id
7777
assert (
7878
result[0].resource_arn
@@ -124,9 +124,7 @@ def test_one_public_ami(self):
124124

125125
assert len(result) == 1
126126
assert result[0].status == "FAIL"
127-
assert (
128-
result[0].status_extended == f"EC2 AMI {image_id} is currently public."
129-
)
127+
assert result[0].status_extended == "EC2 AMI test-ami is currently public."
130128
assert result[0].resource_id == image_id
131129
assert (
132130
result[0].resource_arn

0 commit comments

Comments
 (0)