From b2e322fab739620fdf66ae31a9bd981a2a040e7c Mon Sep 17 00:00:00 2001 From: Prowler Bot Date: Fri, 17 Jan 2025 14:15:19 +0100 Subject: [PATCH] fix(gcp): fix flaky tests from dns service (#6570) Co-authored-by: Daniel Barranquero <74871504+danibarranqueroo@users.noreply.github.com> --- .../dns/dns_dnssec_disabled/dns_dnssec_disabled_test.py | 9 ++++++++- .../dns_rsasha1_in_use_to_key_sign_in_dnssec_test.py | 9 ++++++++- .../dns_rsasha1_in_use_to_zone_sign_in_dnssec_test.py | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/tests/providers/gcp/services/dns/dns_dnssec_disabled/dns_dnssec_disabled_test.py b/tests/providers/gcp/services/dns/dns_dnssec_disabled/dns_dnssec_disabled_test.py index e5294e332c..101c109987 100644 --- a/tests/providers/gcp/services/dns/dns_dnssec_disabled/dns_dnssec_disabled_test.py +++ b/tests/providers/gcp/services/dns/dns_dnssec_disabled/dns_dnssec_disabled_test.py @@ -1,13 +1,18 @@ from re import search from unittest import mock -from tests.providers.gcp.gcp_fixtures import GCP_PROJECT_ID, set_mocked_gcp_provider +from tests.providers.gcp.gcp_fixtures import ( + GCP_EU1_LOCATION, + GCP_PROJECT_ID, + set_mocked_gcp_provider, +) class Test_dns_dnssec_disabled: def test_dns_no_managed_zones(self): dns_client = mock.MagicMock dns_client.managed_zones = [] + dns_client.region = GCP_EU1_LOCATION with mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", @@ -51,6 +56,7 @@ class Test_dns_dnssec_disabled: dns_client = mock.MagicMock dns_client.project_ids = [GCP_PROJECT_ID] dns_client.managed_zones = [managed_zone] + dns_client.region = GCP_EU1_LOCATION with mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", @@ -101,6 +107,7 @@ class Test_dns_dnssec_disabled: dns_client = mock.MagicMock dns_client.project_ids = [GCP_PROJECT_ID] dns_client.managed_zones = [managed_zone] + dns_client.region = GCP_EU1_LOCATION with mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", diff --git a/tests/providers/gcp/services/dns/dns_rsasha1_in_use_to_key_sign_in_dnssec/dns_rsasha1_in_use_to_key_sign_in_dnssec_test.py b/tests/providers/gcp/services/dns/dns_rsasha1_in_use_to_key_sign_in_dnssec/dns_rsasha1_in_use_to_key_sign_in_dnssec_test.py index 6b52984942..ae2252f6ff 100644 --- a/tests/providers/gcp/services/dns/dns_rsasha1_in_use_to_key_sign_in_dnssec/dns_rsasha1_in_use_to_key_sign_in_dnssec_test.py +++ b/tests/providers/gcp/services/dns/dns_rsasha1_in_use_to_key_sign_in_dnssec/dns_rsasha1_in_use_to_key_sign_in_dnssec_test.py @@ -1,13 +1,18 @@ from re import search from unittest import mock -from tests.providers.gcp.gcp_fixtures import GCP_PROJECT_ID, set_mocked_gcp_provider +from tests.providers.gcp.gcp_fixtures import ( + GCP_EU1_LOCATION, + GCP_PROJECT_ID, + set_mocked_gcp_provider, +) class Test_dns_rsasha1_in_use_to_key_sign_in_dnssec: def test_dns_no_managed_zones(self): dns_client = mock.MagicMock dns_client.managed_zones = [] + dns_client.region = GCP_EU1_LOCATION with mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", @@ -51,6 +56,7 @@ class Test_dns_rsasha1_in_use_to_key_sign_in_dnssec: dns_client = mock.MagicMock dns_client.project_ids = [GCP_PROJECT_ID] dns_client.managed_zones = [managed_zone] + dns_client.region = GCP_EU1_LOCATION with mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", @@ -101,6 +107,7 @@ class Test_dns_rsasha1_in_use_to_key_sign_in_dnssec: dns_client = mock.MagicMock dns_client.project_ids = [GCP_PROJECT_ID] dns_client.managed_zones = [managed_zone] + dns_client.region = GCP_EU1_LOCATION with mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", diff --git a/tests/providers/gcp/services/dns/dns_rsasha1_in_use_to_zone_sign_in_dnssec/dns_rsasha1_in_use_to_zone_sign_in_dnssec_test.py b/tests/providers/gcp/services/dns/dns_rsasha1_in_use_to_zone_sign_in_dnssec/dns_rsasha1_in_use_to_zone_sign_in_dnssec_test.py index fe53e52c77..66e0dcae88 100644 --- a/tests/providers/gcp/services/dns/dns_rsasha1_in_use_to_zone_sign_in_dnssec/dns_rsasha1_in_use_to_zone_sign_in_dnssec_test.py +++ b/tests/providers/gcp/services/dns/dns_rsasha1_in_use_to_zone_sign_in_dnssec/dns_rsasha1_in_use_to_zone_sign_in_dnssec_test.py @@ -1,13 +1,18 @@ from re import search from unittest import mock -from tests.providers.gcp.gcp_fixtures import GCP_PROJECT_ID, set_mocked_gcp_provider +from tests.providers.gcp.gcp_fixtures import ( + GCP_EU1_LOCATION, + GCP_PROJECT_ID, + set_mocked_gcp_provider, +) class Test_dns_rsasha1_in_use_to_zone_sign_in_dnssec: def test_dns_no_managed_zones(self): dns_client = mock.MagicMock dns_client.managed_zones = [] + dns_client.region = GCP_EU1_LOCATION with mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", @@ -51,6 +56,7 @@ class Test_dns_rsasha1_in_use_to_zone_sign_in_dnssec: dns_client = mock.MagicMock dns_client.project_ids = [GCP_PROJECT_ID] dns_client.managed_zones = [managed_zone] + dns_client.region = GCP_EU1_LOCATION with mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", @@ -101,6 +107,7 @@ class Test_dns_rsasha1_in_use_to_zone_sign_in_dnssec: dns_client = mock.MagicMock dns_client.project_ids = [GCP_PROJECT_ID] dns_client.managed_zones = [managed_zone] + dns_client.region = GCP_EU1_LOCATION with mock.patch( "prowler.providers.common.provider.Provider.get_global_provider",