diff --git a/prowler/providers/gcp/services/compute/compute_project_os_login_enabled/compute_project_os_login_enabled.py b/prowler/providers/gcp/services/compute/compute_project_os_login_enabled/compute_project_os_login_enabled.py index 6dc7feb8d2..bebc30136e 100644 --- a/prowler/providers/gcp/services/compute/compute_project_os_login_enabled/compute_project_os_login_enabled.py +++ b/prowler/providers/gcp/services/compute/compute_project_os_login_enabled/compute_project_os_login_enabled.py @@ -5,7 +5,7 @@ from prowler.providers.gcp.services.compute.compute_client import compute_client class compute_project_os_login_enabled(Check): def execute(self) -> Check_Report_GCP: findings = [] - for project in compute_client.projects: + for project in compute_client.compute_projects: report = Check_Report_GCP( metadata=self.metadata(), resource_metadata=project, diff --git a/prowler/providers/gcp/services/iam/iam_audit_logs_enabled/iam_audit_logs_enabled.py b/prowler/providers/gcp/services/iam/iam_audit_logs_enabled/iam_audit_logs_enabled.py index 12e917a2ae..69c41a495b 100644 --- a/prowler/providers/gcp/services/iam/iam_audit_logs_enabled/iam_audit_logs_enabled.py +++ b/prowler/providers/gcp/services/iam/iam_audit_logs_enabled/iam_audit_logs_enabled.py @@ -7,7 +7,7 @@ from prowler.providers.gcp.services.cloudresourcemanager.cloudresourcemanager_cl class iam_audit_logs_enabled(Check): def execute(self) -> Check_Report_GCP: findings = [] - for project in cloudresourcemanager_client.projects: + for project in cloudresourcemanager_client.cloud_resource_manager_projects: report = Check_Report_GCP( metadata=self.metadata(), resource_metadata=project, diff --git a/tests/providers/gcp/services/compute/compute_project_os_login_enabled/compute_project_os_login_enabled_test.py b/tests/providers/gcp/services/compute/compute_project_os_login_enabled/compute_project_os_login_enabled_test.py index 958773a3ba..c20c75f5df 100644 --- a/tests/providers/gcp/services/compute/compute_project_os_login_enabled/compute_project_os_login_enabled_test.py +++ b/tests/providers/gcp/services/compute/compute_project_os_login_enabled/compute_project_os_login_enabled_test.py @@ -1,6 +1,7 @@ from re import search from unittest import mock +from prowler.providers.gcp.models import GCPProject from tests.providers.gcp.gcp_fixtures import GCP_PROJECT_ID, set_mocked_gcp_provider @@ -35,7 +36,16 @@ class Test_compute_project_os_login_enabled: compute_client = mock.MagicMock() compute_client.project_ids = [GCP_PROJECT_ID] - compute_client.projects = [project] + compute_client.compute_projects = [project] + compute_client.projects = { + GCP_PROJECT_ID: GCPProject( + id=GCP_PROJECT_ID, + number="123456789012", + name="test", + labels={}, + lifecycle_state="ACTIVE", + ) + } compute_client.region = "global" with mock.patch( @@ -72,7 +82,16 @@ class Test_compute_project_os_login_enabled: compute_client = mock.MagicMock() compute_client.project_ids = [GCP_PROJECT_ID] - compute_client.projects = [project] + compute_client.compute_projects = [project] + compute_client.projects = { + GCP_PROJECT_ID: GCPProject( + id=GCP_PROJECT_ID, + number="123456789012", + name="test", + labels={}, + lifecycle_state="ACTIVE", + ) + } compute_client.region = "global" with mock.patch( diff --git a/tests/providers/gcp/services/iam/iam_audit_logs_enabled/iam_audit_logs_enabled_test.py b/tests/providers/gcp/services/iam/iam_audit_logs_enabled/iam_audit_logs_enabled_test.py index 974e79749f..4328d5f7fb 100644 --- a/tests/providers/gcp/services/iam/iam_audit_logs_enabled/iam_audit_logs_enabled_test.py +++ b/tests/providers/gcp/services/iam/iam_audit_logs_enabled/iam_audit_logs_enabled_test.py @@ -1,6 +1,7 @@ from re import search from unittest import mock +from prowler.providers.gcp.models import GCPProject from tests.providers.gcp.gcp_fixtures import GCP_PROJECT_ID, set_mocked_gcp_provider @@ -35,7 +36,16 @@ class Test_iam_audit_logs_enabled: cloudresourcemanager_client = mock.MagicMock() cloudresourcemanager_client.project_ids = [GCP_PROJECT_ID] - cloudresourcemanager_client.projects = [project1] + cloudresourcemanager_client.cloud_resource_manager_projects = [project1] + cloudresourcemanager_client.projects = { + GCP_PROJECT_ID: GCPProject( + id=GCP_PROJECT_ID, + number="123456789012", + name="test", + labels={}, + lifecycle_state="ACTIVE", + ) + } cloudresourcemanager_client.region = "global" with mock.patch( @@ -72,7 +82,16 @@ class Test_iam_audit_logs_enabled: cloudresourcemanager_client = mock.MagicMock() cloudresourcemanager_client.project_ids = [GCP_PROJECT_ID] - cloudresourcemanager_client.projects = [project1] + cloudresourcemanager_client.cloud_resource_manager_projects = [project1] + cloudresourcemanager_client.projects = { + GCP_PROJECT_ID: GCPProject( + id=GCP_PROJECT_ID, + number="123456789012", + name="test", + labels={}, + lifecycle_state="ACTIVE", + ) + } cloudresourcemanager_client.region = "global" with mock.patch(