From ce2b0671dc2c48ffe071087d3292fd8b73a33da1 Mon Sep 17 00:00:00 2001 From: MarioRgzLpz Date: Tue, 1 Oct 2024 09:31:56 +0200 Subject: [PATCH] fix(ecs): Adjust code to the new ARN formats and changed arns in service tests --- prowler/providers/aws/services/ecs/ecs_service.py | 6 +++--- tests/providers/aws/services/ecs/ecs_service_test.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/prowler/providers/aws/services/ecs/ecs_service.py b/prowler/providers/aws/services/ecs/ecs_service.py index ea2c1b43098..21d09e91abf 100644 --- a/prowler/providers/aws/services/ecs/ecs_service.py +++ b/prowler/providers/aws/services/ecs/ecs_service.py @@ -35,7 +35,7 @@ def _list_task_definitions(self, regional_client): ): self.task_definitions[task_definition] = TaskDefinition( # we want the family name without the revision - name=sub(":.*", "", task_definition.split("/")[1]), + name=sub(":.*", "", task_definition.split("/")[-1]), arn=task_definition, revision=task_definition.split(":")[-1], region=regional_client.region, @@ -111,7 +111,7 @@ def _describe_services(self, cluster): service_desc = describe_response["services"][0] service_arn = service_desc["serviceArn"] service_obj = Service( - name=sub(":.*", "", service_arn.split("/")[2]), + name=sub(":.*", "", service_arn.split("/")[-1]), arn=service_arn, region=cluster.region, assign_public_ip=( @@ -139,7 +139,7 @@ def _list_clusters(self, regional_client): is_resource_filtered(cluster, self.audit_resources) ): self.clusters[cluster] = Cluster( - name=sub(":.*", "", cluster.split("/")[1]), + name=sub(":.*", "", cluster.split("/")[-1]), arn=cluster, region=regional_client.region, ) diff --git a/tests/providers/aws/services/ecs/ecs_service_test.py b/tests/providers/aws/services/ecs/ecs_service_test.py index 26cbfbfc0b0..5dc8ca09475 100644 --- a/tests/providers/aws/services/ecs/ecs_service_test.py +++ b/tests/providers/aws/services/ecs/ecs_service_test.py @@ -12,7 +12,7 @@ def mock_make_api_call(self, operation_name, kwarg): if operation_name == "ListTaskDefinitions": return { "taskDefinitionArns": [ - "arn:aws:ecs:eu-west-1:123456789012:task-definition/test_ecs_task:1" + "arn:aws:ecs:eu-west-1:123456789012:task-definition/test_cluster_1/test_ecs_task:1" ] } if operation_name == "DescribeTaskDefinition": @@ -117,7 +117,7 @@ def test_list_task_definitions(self): aws_provider = set_mocked_aws_provider() ecs = ECS(aws_provider) - task_arn = "arn:aws:ecs:eu-west-1:123456789012:task-definition/test_ecs_task:1" + task_arn = "arn:aws:ecs:eu-west-1:123456789012:task-definition/test_cluster_1/test_ecs_task:1" assert len(ecs.task_definitions) == 1 assert ecs.task_definitions[task_arn].name == "test_ecs_task" @@ -131,7 +131,7 @@ def test_describe_task_definitions(self): aws_provider = set_mocked_aws_provider() ecs = ECS(aws_provider) - task_arn = "arn:aws:ecs:eu-west-1:123456789012:task-definition/test_ecs_task:1" + task_arn = "arn:aws:ecs:eu-west-1:123456789012:task-definition/test_cluster_1/test_ecs_task:1" assert len(ecs.task_definitions) == 1 assert ecs.task_definitions[task_arn].name == "test_ecs_task"