From 5855633c1fb679ceda46d355056c1306c960c8f0 Mon Sep 17 00:00:00 2001 From: Sergio Garcia <38561120+sergargar@users.noreply.github.com> Date: Wed, 10 May 2023 14:48:34 +0200 Subject: [PATCH] fix(resourceexplorer2): add resource id (#2335) Co-authored-by: Pepe Fagoaga --- .../resourceexplorer2_indexes_found.py | 1 + .../services/resourceexplorer2/resourceexplorer2_service.py | 1 + .../resourceexplorer2_indexes_found_test.py | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/prowler/providers/aws/services/resourceexplorer2/resourceexplorer2_indexes_found/resourceexplorer2_indexes_found.py b/prowler/providers/aws/services/resourceexplorer2/resourceexplorer2_indexes_found/resourceexplorer2_indexes_found.py index e9bbe7fe..f1394445 100644 --- a/prowler/providers/aws/services/resourceexplorer2/resourceexplorer2_indexes_found/resourceexplorer2_indexes_found.py +++ b/prowler/providers/aws/services/resourceexplorer2/resourceexplorer2_indexes_found/resourceexplorer2_indexes_found.py @@ -12,6 +12,7 @@ class resourceexplorer2_indexes_found(Check): report.status_extended = "No Resource Explorer Indexes found" report.region = resource_explorer_2_client.region report.resource_arn = "NoResourceExplorer" + report.resource_id = resource_explorer_2_client.audited_account if resource_explorer_2_client.indexes: report.region = resource_explorer_2_client.indexes[0].region report.resource_arn = resource_explorer_2_client.indexes[0].arn diff --git a/prowler/providers/aws/services/resourceexplorer2/resourceexplorer2_service.py b/prowler/providers/aws/services/resourceexplorer2/resourceexplorer2_service.py index 37ab1cfa..c37fa7e6 100644 --- a/prowler/providers/aws/services/resourceexplorer2/resourceexplorer2_service.py +++ b/prowler/providers/aws/services/resourceexplorer2/resourceexplorer2_service.py @@ -13,6 +13,7 @@ class ResourceExplorer2: self.service = "resource-explorer-2" self.session = audit_info.audit_session self.audit_resources = audit_info.audit_resources + self.audited_account = audit_info.audited_account self.regional_clients = generate_regional_clients(self.service, audit_info) # If the region is not set in the audit profile, # we pick the first region from the regional clients list diff --git a/tests/providers/aws/services/resourceexplorer2/resourceexplorer2_indexes_found/resourceexplorer2_indexes_found_test.py b/tests/providers/aws/services/resourceexplorer2/resourceexplorer2_indexes_found/resourceexplorer2_indexes_found_test.py index 5f19f09a..d8b5472b 100644 --- a/tests/providers/aws/services/resourceexplorer2/resourceexplorer2_indexes_found/resourceexplorer2_indexes_found_test.py +++ b/tests/providers/aws/services/resourceexplorer2/resourceexplorer2_indexes_found/resourceexplorer2_indexes_found_test.py @@ -39,6 +39,7 @@ class Test_resourceexplorer2_indexes_found: def test_no_indexes_found(self): resourceexplorer2_client = mock.MagicMock resourceexplorer2_client.indexes = [] + resourceexplorer2_client.audited_account = AWS_ACCOUNT_NUMBER resourceexplorer2_client.region = AWS_REGION with mock.patch( "prowler.providers.aws.services.resourceexplorer2.resourceexplorer2_service.ResourceExplorer2", @@ -56,7 +57,7 @@ class Test_resourceexplorer2_indexes_found: assert len(result) == 1 assert result[0].status == "FAIL" assert result[0].status_extended == "No Resource Explorer Indexes found" - assert result[0].resource_id == "" + assert result[0].resource_id == AWS_ACCOUNT_NUMBER assert result[0].resource_arn == "NoResourceExplorer" assert result[0].region == AWS_REGION @@ -65,6 +66,7 @@ class Test_resourceexplorer2_indexes_found: resourceexplorer2_client.indexes = [ Indexes(arn=INDEX_ARN, region=INDEX_REGION, type="LOCAL") ] + resourceexplorer2_client.audited_account = AWS_ACCOUNT_NUMBER resourceexplorer2_client.region = AWS_REGION with mock.patch( "prowler.providers.aws.services.resourceexplorer2.resourceexplorer2_service.ResourceExplorer2", @@ -82,6 +84,6 @@ class Test_resourceexplorer2_indexes_found: assert len(result) == 1 assert result[0].status == "PASS" assert result[0].status_extended == "Resource Explorer Indexes found: 1" - assert result[0].resource_id == "" + assert result[0].resource_id == AWS_ACCOUNT_NUMBER assert result[0].resource_arn == INDEX_ARN assert result[0].region == AWS_REGION