refactor(gcp): use always <client>.region for checks (#6206)

This commit is contained in:
Pedro Martín authored and GitHub committed 2024-12-16 18:21:42 -05:00
1 parent b8cc4b4f0f
commit fd610d44c0
32 files changed
+94 -24

No files matched your search

@@ -32,6 +32,7 @@ class Test_compute_instance_block_project_wide_ssh_keys_disabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={"items": [{"key": "block-project-ssh-keys", "value": "true"}]},
shielded_enabled_vtpm=True,
@@ -68,6 +69,7 @@ class Test_compute_instance_block_project_wide_ssh_keys_disabled:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_instance_without_metadata(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -76,6 +78,7 @@ class Test_compute_instance_block_project_wide_ssh_keys_disabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -112,6 +115,7 @@ class Test_compute_instance_block_project_wide_ssh_keys_disabled:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_instance_with_block_project_ssh_keys_false(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -120,6 +124,7 @@ class Test_compute_instance_block_project_wide_ssh_keys_disabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={"items": [{"key": "block-project-ssh-keys", "value": "false"}]},
shielded_enabled_vtpm=True,
@@ -156,3 +161,4 @@ class Test_compute_instance_block_project_wide_ssh_keys_disabled:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
@@ -32,6 +32,7 @@ class Test_compute_instance_confidential_computing_enabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -69,7 +70,7 @@ class Test_compute_instance_confidential_computing_enabled:
)
assert result[0].resource_id == instance.id
assert result[0].resource_name == instance.name
assert result[0].location == instance.zone
assert result[0].location == "us-central1"
assert result[0].project_id == GCP_PROJECT_ID
def test_one_instance_with_shielded_vtpm_disabled(self):
@@ -79,6 +80,7 @@ class Test_compute_instance_confidential_computing_enabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=False,
@@ -116,5 +118,5 @@ class Test_compute_instance_confidential_computing_enabled:
)
assert result[0].resource_id == instance.id
assert result[0].resource_name == instance.name
assert result[0].location == instance.zone
assert result[0].location == "us-central1"
assert result[0].project_id == GCP_PROJECT_ID
@@ -30,6 +30,7 @@ class Test_compute_instance_default_service_account_in_use:
instance = Instance(
name="test",
id="1234567890",
region="us-central1",
zone="us-central1-a",
public_ip=True,
metadata={},
@@ -67,6 +68,7 @@ class Test_compute_instance_default_service_account_in_use:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_compliant_instance_gke(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -75,6 +77,7 @@ class Test_compute_instance_default_service_account_in_use:
name="gke-test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -113,6 +116,7 @@ class Test_compute_instance_default_service_account_in_use:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_instance_with_default_service_account(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -121,6 +125,7 @@ class Test_compute_instance_default_service_account_in_use:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -159,3 +164,4 @@ class Test_compute_instance_default_service_account_in_use:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
@@ -32,6 +32,7 @@ class Test_compute_instance_default_service_account_in_use_with_full_api_access:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -72,6 +73,7 @@ class Test_compute_instance_default_service_account_in_use_with_full_api_access:
== f"The VM Instance {instance.name} is not configured to use the default service account with full access to all cloud APIs."
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_compliant_instance_gke(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -80,6 +82,7 @@ class Test_compute_instance_default_service_account_in_use_with_full_api_access:
name="gke-test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -123,6 +126,7 @@ class Test_compute_instance_default_service_account_in_use_with_full_api_access:
== f"The VM Instance {instance.name} is not configured to use the default service account with full access to all cloud APIs."
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_instance_with_default_service_account(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -131,6 +135,7 @@ class Test_compute_instance_default_service_account_in_use_with_full_api_access:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -174,3 +179,4 @@ class Test_compute_instance_default_service_account_in_use_with_full_api_access:
== f"The VM Instance {instance.name} is configured to use the default service account with full access to all cloud APIs."
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
@@ -32,6 +32,7 @@ class Test_compute_instance_encryption_with_csek_enabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={"items": [{"key": "block-project-ssh-keys", "value": "true"}]},
shielded_enabled_vtpm=True,
@@ -46,6 +47,7 @@ class Test_compute_instance_encryption_with_csek_enabled:
compute_client = mock.MagicMock
compute_client.project_ids = [GCP_PROJECT_ID]
compute_client.instances = [instance]
compute_client.region = "us-central1"
with mock.patch(
"prowler.providers.common.provider.Provider.get_global_provider",
@@ -68,6 +70,7 @@ class Test_compute_instance_encryption_with_csek_enabled:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_instance_with_one_unecrypted_disk(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -76,6 +79,7 @@ class Test_compute_instance_encryption_with_csek_enabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -112,6 +116,7 @@ class Test_compute_instance_encryption_with_csek_enabled:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_instance_with_all_unencrypted_disks(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -120,6 +125,7 @@ class Test_compute_instance_encryption_with_csek_enabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={"items": [{"key": "block-project-ssh-keys", "value": "false"}]},
shielded_enabled_vtpm=True,
@@ -156,3 +162,4 @@ class Test_compute_instance_encryption_with_csek_enabled:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
@@ -31,6 +31,7 @@ class Test_compute_instance_ip_forwarding_is_enabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -67,6 +68,7 @@ class Test_compute_instance_ip_forwarding_is_enabled:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_compliant_instance_gke(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -75,6 +77,7 @@ class Test_compute_instance_ip_forwarding_is_enabled:
name="gke-test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -113,6 +116,7 @@ class Test_compute_instance_ip_forwarding_is_enabled:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_instance_with_ip_forwarding_enabled(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -121,6 +125,7 @@ class Test_compute_instance_ip_forwarding_is_enabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -159,3 +164,4 @@ class Test_compute_instance_ip_forwarding_is_enabled:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
@@ -42,6 +42,7 @@ class Test_compute_instance_public_ip:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=False,
metadata={},
shielded_enabled_vtpm=True,
@@ -70,7 +71,7 @@ class Test_compute_instance_public_ip:
assert result[0].resource_id == "1234567890"
assert result[0].project_id == GCP_PROJECT_ID
assert result[0].resource_name == "test"
assert result[0].location == "us-central1-a"
assert result[0].location == "us-central1"
def test_public_ip_instance(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -79,6 +80,7 @@ class Test_compute_instance_public_ip:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -116,4 +118,4 @@ class Test_compute_instance_public_ip:
assert result[0].resource_id == "1234567890"
assert result[0].project_id == GCP_PROJECT_ID
assert result[0].resource_name == "test"
assert result[0].location == "us-central1-a"
assert result[0].location == "us-central1"
@@ -41,6 +41,7 @@ class Test_compute_network_default_in_use:
compute_client.project_ids = [GCP_PROJECT_ID]
compute_client.networks = []
compute_client.region = "global"
check = compute_network_default_in_use()
result = check.execute()
@@ -79,6 +80,7 @@ class Test_compute_network_default_in_use:
project_id=GCP_PROJECT_ID,
)
]
compute_client.region = "global"
check = compute_network_default_in_use()
result = check.execute()
@@ -117,6 +119,7 @@ class Test_compute_network_default_in_use:
project_id=GCP_PROJECT_ID,
)
]
compute_client.region = "global"
check = compute_network_default_in_use()
result = check.execute()
@@ -36,6 +36,7 @@ class Test_compute_project_os_login_enabled:
compute_client = mock.MagicMock
compute_client.project_ids = [GCP_PROJECT_ID]
compute_client.projects = [project]
compute_client.region = "global"
with mock.patch(
"prowler.providers.common.provider.Provider.get_global_provider",
@@ -72,6 +73,7 @@ class Test_compute_project_os_login_enabled:
compute_client = mock.MagicMock
compute_client.project_ids = [GCP_PROJECT_ID]
compute_client.projects = [project]
compute_client.region = "global"
with mock.patch(
"prowler.providers.common.provider.Provider.get_global_provider",
@@ -32,6 +32,7 @@ class Test_compute_instance_serial_ports_in_use:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -68,6 +69,7 @@ class Test_compute_instance_serial_ports_in_use:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_compliant_instance_with_0(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -76,6 +78,7 @@ class Test_compute_instance_serial_ports_in_use:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={"items": [{"key": "serial-port-enabled", "value": "0"}]},
shielded_enabled_vtpm=True,
@@ -112,6 +115,7 @@ class Test_compute_instance_serial_ports_in_use:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_compliant_instance_with_false(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -120,6 +124,7 @@ class Test_compute_instance_serial_ports_in_use:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={"items": [{"key": "serial-port-enabled", "value": "false"}]},
shielded_enabled_vtpm=True,
@@ -156,6 +161,7 @@ class Test_compute_instance_serial_ports_in_use:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_instance_with_serial_ports_enable_1(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -164,6 +170,7 @@ class Test_compute_instance_serial_ports_in_use:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={"items": [{"key": "serial-port-enable", "value": "1"}]},
shielded_enabled_vtpm=True,
@@ -200,6 +207,7 @@ class Test_compute_instance_serial_ports_in_use:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_instance_with_serial_ports_enable_true(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -208,6 +216,7 @@ class Test_compute_instance_serial_ports_in_use:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={"items": [{"key": "serial-port-enable", "value": "true"}]},
shielded_enabled_vtpm=True,
@@ -244,3 +253,4 @@ class Test_compute_instance_serial_ports_in_use:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
@@ -36,6 +36,7 @@ class TestComputeService:
assert compute_client.instances[0].name == "instance1"
assert compute_client.instances[0].id.__class__.__name__ == "str"
assert compute_client.instances[0].zone == "zone1"
assert compute_client.instances[0].region == "zone1"
assert compute_client.instances[0].public_ip
assert compute_client.instances[0].project_id == GCP_PROJECT_ID
assert compute_client.instances[0].metadata == {}
@@ -57,6 +58,7 @@ class TestComputeService:
assert compute_client.instances[1].name == "instance2"
assert compute_client.instances[1].id.__class__.__name__ == "str"
assert compute_client.instances[1].zone == "zone1"
assert compute_client.instances[1].region == "zone1"
assert not compute_client.instances[1].public_ip
assert compute_client.instances[1].project_id == GCP_PROJECT_ID
assert compute_client.instances[1].metadata == {}
@@ -32,6 +32,7 @@ class Test_compute_instance_shielded_vm_enabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -68,6 +69,7 @@ class Test_compute_instance_shielded_vm_enabled:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_instance_with_shielded_vtpm_disabled(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -76,6 +78,7 @@ class Test_compute_instance_shielded_vm_enabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=False,
@@ -112,6 +115,7 @@ class Test_compute_instance_shielded_vm_enabled:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
def test_one_instance_with_shielded_integrity_monitoring_disabled(self):
from prowler.providers.gcp.services.compute.compute_service import Instance
@@ -120,6 +124,7 @@ class Test_compute_instance_shielded_vm_enabled:
name="test",
id="1234567890",
zone="us-central1-a",
region="us-central1",
public_ip=True,
metadata={},
shielded_enabled_vtpm=True,
@@ -156,3 +161,4 @@ class Test_compute_instance_shielded_vm_enabled:
result[0].status_extended,
)
assert result[0].resource_id == instance.id
assert result[0].location == "us-central1"
@@ -44,6 +44,7 @@ class Test_dataproc_encrypted_with_cmks_disabled:
project_id=GCP_PROJECT_ID,
)
dataproc_client.clusters = [cluster]
dataproc_client.region = "global"
from prowler.providers.gcp.services.dataproc.dataproc_encrypted_with_cmks_disabled.dataproc_encrypted_with_cmks_disabled import (
dataproc_encrypted_with_cmks_disabled,
@@ -59,6 +60,7 @@ class Test_dataproc_encrypted_with_cmks_disabled:
result[0].status_extended,
)
assert result[0].resource_id == cluster.id
assert result[0].location == "global"
def test_cluster_without_encryption(self):
dataproc_client = mock.MagicMock
@@ -81,6 +83,7 @@ class Test_dataproc_encrypted_with_cmks_disabled:
project_id=GCP_PROJECT_ID,
)
dataproc_client.clusters = [cluster]
dataproc_client.region = "global"
from prowler.providers.gcp.services.dataproc.dataproc_encrypted_with_cmks_disabled.dataproc_encrypted_with_cmks_disabled import (
dataproc_encrypted_with_cmks_disabled,
@@ -96,3 +99,4 @@ class Test_dataproc_encrypted_with_cmks_disabled:
result[0].status_extended,
)
assert result[0].resource_id == cluster.id
assert result[0].location == "global"
@@ -31,6 +31,7 @@ class Test_gke_cluster_no_default_service_account:
name="test",
id="123",
location="eu-west-1",
region="eu-west-1",
service_account="default",
node_pools=[],
project_id=GCP_PROJECT_ID,
@@ -40,7 +41,6 @@ class Test_gke_cluster_no_default_service_account:
gke_client = mock.MagicMock
gke_client.project_ids = [GCP_PROJECT_ID]
gke_client.clusters = clusters
gke_client.region = "global"
with mock.patch(
"prowler.providers.common.provider.Provider.get_global_provider",
@@ -65,7 +65,7 @@ class Test_gke_cluster_no_default_service_account:
assert result[0].project_id == clusters["123"].project_id
assert result[0].resource_id == clusters["123"].id
assert result[0].resource_name == clusters["123"].name
assert result[0].location == clusters["123"].location
assert result[0].location == "eu-west-1"
def test_one_cluster_without_node_pool_without_default_sa(self):
@@ -74,6 +74,7 @@ class Test_gke_cluster_no_default_service_account:
name="test",
id="123",
location="eu-west-1",
region="eu-west-1",
service_account="1231231231",
node_pools=[],
project_id=GCP_PROJECT_ID,
@@ -83,7 +84,6 @@ class Test_gke_cluster_no_default_service_account:
gke_client = mock.MagicMock
gke_client.project_ids = [GCP_PROJECT_ID]
gke_client.clusters = clusters
gke_client.region = "global"
with mock.patch(
"prowler.providers.common.provider.Provider.get_global_provider",
@@ -108,7 +108,7 @@ class Test_gke_cluster_no_default_service_account:
assert result[0].project_id == clusters["123"].project_id
assert result[0].resource_id == clusters["123"].id
assert result[0].resource_name == clusters["123"].name
assert result[0].location == clusters["123"].location
assert result[0].location == "eu-west-1"
def test_one_cluster_with_node_pool_with_default_sa(self):
@@ -117,6 +117,7 @@ class Test_gke_cluster_no_default_service_account:
name="test",
id="123",
location="eu-west-1",
region="eu-west-1",
service_account="default",
node_pools=[
NodePool(
@@ -133,7 +134,6 @@ class Test_gke_cluster_no_default_service_account:
gke_client = mock.MagicMock
gke_client.project_ids = [GCP_PROJECT_ID]
gke_client.clusters = clusters
gke_client.region = "global"
with mock.patch(
"prowler.providers.common.provider.Provider.get_global_provider",
@@ -158,7 +158,7 @@ class Test_gke_cluster_no_default_service_account:
assert result[0].project_id == clusters["123"].project_id
assert result[0].resource_id == clusters["123"].id
assert result[0].resource_name == clusters["123"].name
assert result[0].location == clusters["123"].location
assert result[0].location == "eu-west-1"
def test_one_cluster_with_node_pool_with_non_default_sa(self):
@@ -167,6 +167,7 @@ class Test_gke_cluster_no_default_service_account:
name="test",
id="123",
location="eu-west-1",
region="eu-west-1",
service_account="default",
node_pools=[
NodePool(
@@ -183,7 +184,6 @@ class Test_gke_cluster_no_default_service_account:
gke_client = mock.MagicMock
gke_client.project_ids = [GCP_PROJECT_ID]
gke_client.clusters = clusters
gke_client.region = "global"
with mock.patch(
"prowler.providers.common.provider.Provider.get_global_provider",
@@ -208,4 +208,4 @@ class Test_gke_cluster_no_default_service_account:
assert result[0].project_id == clusters["123"].project_id
assert result[0].resource_id == clusters["123"].id
assert result[0].resource_name == clusters["123"].name
assert result[0].location == clusters["123"].location
assert result[0].location == "eu-west-1"