Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ecs): ensure unique finding id in ECS checks #7059

Merged
merged 1 commit into from
Feb 27, 2025
Merged

fix(ecs): ensure unique finding id in ECS checks #7059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions prowler/providers/aws/services/ecs/ecs_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ def _describe_services(self, cluster):
service_arn = service_desc["serviceArn"]
service_obj = Service(
name=sub(":.*", "", service_arn.split("/")[-1]),
id=f"{sub(':.*', '', service_arn.split('/')[-2])}/{sub(':.*', '', service_arn.split('/')[-1])}",
arn=service_arn,
region=cluster.region,
assign_public_ip=(
Expand Down Expand Up @@ -212,6 +213,7 @@ class TaskDefinition(BaseModel):

class Service(BaseModel):
name: str
id: str
arn: str
region: str
launch_type: str = ""
Expand Down
100 changes: 60 additions & 40 deletions ...rvice_fargate_latest_platform_version/ecs_service_fargate_latest_platform_version_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,15 @@ def test_no_services(self):

mocked_aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])

with patch(
"prowler.providers.common.provider.Provider.get_global_provider",
return_value=mocked_aws_provider,
), patch(
"prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version.ecs_client",
new=ECS(mocked_aws_provider),
with (
patch(
"prowler.providers.common.provider.Provider.get_global_provider",
return_value=mocked_aws_provider,
),
patch(
"prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version.ecs_client",
new=ECS(mocked_aws_provider),
),
):
from prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version import (
ecs_service_fargate_latest_platform_version,
Expand Down Expand Up @@ -162,12 +165,15 @@ def test_service_ec2_type(self):

mocked_aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])

with patch(
"prowler.providers.common.provider.Provider.get_global_provider",
return_value=mocked_aws_provider,
), patch(
"prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version.ecs_client",
new=ECS(mocked_aws_provider),
with (
patch(
"prowler.providers.common.provider.Provider.get_global_provider",
return_value=mocked_aws_provider,
),
patch(
"prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version.ecs_client",
new=ECS(mocked_aws_provider),
),
):
from prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version import (
ecs_service_fargate_latest_platform_version,
Expand Down Expand Up @@ -199,12 +205,15 @@ def test_service_linux_latest_version(self):

mocked_ecs_client = ECS(mocked_aws_provider)

with patch(
"prowler.providers.common.provider.Provider.get_global_provider",
return_value=mocked_aws_provider,
), patch(
"prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version.ecs_client",
new=mocked_ecs_client,
with (
patch(
"prowler.providers.common.provider.Provider.get_global_provider",
return_value=mocked_aws_provider,
),
patch(
"prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version.ecs_client",
new=mocked_ecs_client,
),
):
from prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version import (
ecs_service_fargate_latest_platform_version,
Expand All @@ -217,7 +226,7 @@ def test_service_linux_latest_version(self):
assert result[0].status_extended == (
"ECS Service test-latest-linux-service is using latest FARGATE Linux version 1.4.0."
)
assert result[0].resource_id == "test-latest-linux-service"
assert result[0].resource_id == "test-cluster/test-latest-linux-service"
assert (
result[0].resource_arn
== f"arn:aws:ecs:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:service/test-cluster/test-latest-linux-service"
Expand Down Expand Up @@ -249,12 +258,15 @@ def test_service_windows_latest_version(self):

mocked_aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])

with patch(
"prowler.providers.common.provider.Provider.get_global_provider",
return_value=mocked_aws_provider,
), patch(
"prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version.ecs_client",
new=ECS(mocked_aws_provider),
with (
patch(
"prowler.providers.common.provider.Provider.get_global_provider",
return_value=mocked_aws_provider,
),
patch(
"prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version.ecs_client",
new=ECS(mocked_aws_provider),
),
):
from prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version import (
ecs_service_fargate_latest_platform_version,
Expand All @@ -267,7 +279,7 @@ def test_service_windows_latest_version(self):
assert result[0].status_extended == (
"ECS Service test-latest-windows-service is using latest FARGATE Windows version 1.0.0."
)
assert result[0].resource_id == "test-latest-windows-service"
assert result[0].resource_id == "test-cluster/test-latest-windows-service"
assert (
result[0].resource_arn
== f"arn:aws:ecs:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:service/test-cluster/test-latest-windows-service"
Expand Down Expand Up @@ -295,12 +307,15 @@ def test_service_linux_no_latest_version(self):

mocked_aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])

with patch(
"prowler.providers.common.provider.Provider.get_global_provider",
return_value=mocked_aws_provider,
), patch(
"prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version.ecs_client",
new=ECS(mocked_aws_provider),
with (
patch(
"prowler.providers.common.provider.Provider.get_global_provider",
return_value=mocked_aws_provider,
),
patch(
"prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version.ecs_client",
new=ECS(mocked_aws_provider),
),
):
from prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version import (
ecs_service_fargate_latest_platform_version,
Expand All @@ -313,7 +328,7 @@ def test_service_linux_no_latest_version(self):
assert result[0].status_extended == (
"ECS Service test-no-latest-linux-service is not using latest FARGATE Linux version 1.4.0, currently using 1.2.0."
)
assert result[0].resource_id == "test-no-latest-linux-service"
assert result[0].resource_id == "test-cluster/test-no-latest-linux-service"
assert (
result[0].resource_arn
== f"arn:aws:ecs:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:service/test-cluster/test-no-latest-linux-service"
Expand Down Expand Up @@ -341,12 +356,15 @@ def test_service_windows_no_latest_version(self):

mocked_aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1])

with patch(
"prowler.providers.common.provider.Provider.get_global_provider",
return_value=mocked_aws_provider,
), patch(
"prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version.ecs_client",
new=ECS(mocked_aws_provider),
with (
patch(
"prowler.providers.common.provider.Provider.get_global_provider",
return_value=mocked_aws_provider,
),
patch(
"prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version.ecs_client",
new=ECS(mocked_aws_provider),
),
):
from prowler.providers.aws.services.ecs.ecs_service_fargate_latest_platform_version.ecs_service_fargate_latest_platform_version import (
ecs_service_fargate_latest_platform_version,
Expand All @@ -359,7 +377,9 @@ def test_service_windows_no_latest_version(self):
assert result[0].status_extended == (
"ECS Service test-no-latest-windows-service is not using latest FARGATE Windows version 1.0.0, currently using 0.9.0."
)
assert result[0].resource_id == "test-no-latest-windows-service"
assert (
result[0].resource_id == "test-cluster/test-no-latest-windows-service"
)
assert (
result[0].resource_arn
== f"arn:aws:ecs:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:service/test-cluster/test-no-latest-windows-service"
Expand Down
4 changes: 2 additions & 2 deletions .../aws/services/ecs/ecs_service_no_assign_public_ip/ecs_service_no_assign_public_ip_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def test_service_with_no_public_ip(self):
result[0].status_extended
== "ECS Service service-with-no-public-ip does not have automatic public IP assignment."
)
assert result[0].resource_id == "service-with-no-public-ip"
assert result[0].resource_id == "sample-cluster/service-with-no-public-ip"
assert result[0].resource_arn == service_arn
assert result[0].resource_tags == []
assert result[0].region == AWS_REGION_US_EAST_1
Expand Down Expand Up @@ -221,7 +221,7 @@ def test_task_definition_no_host_network_mode(self):
result[0].status_extended
== "ECS Service service-with-public-ip has automatic public IP assignment."
)
assert result[0].resource_id == "service-with-public-ip"
assert result[0].resource_id == "sample-cluster/service-with-public-ip"
assert result[0].resource_arn == service_arn
assert result[0].resource_tags == []
assert result[0].region == AWS_REGION_US_EAST_1
Loading