From 68924b3eed2b9ebdf1d25dfb9d33211812e484c1 Mon Sep 17 00:00:00 2001 From: Sergio Garcia Date: Tue, 5 Mar 2024 15:16:00 +0100 Subject: [PATCH] fix tests --- .../backup_plans_exist/backup_plans_exist_test.py | 3 +++ .../backup_reportplans_exist_test.py | 6 ++++++ .../backup_vaults_exist_test.py | 6 ++++++ .../cloudtrail_multi_region_enabled_test.py | 6 +++--- .../config_recorder_all_regions_enabled_test.py | 12 +++++++++++- ...m_ebs_snapshot_lifecycle_policy_exists_test.py | 3 +++ .../drs/drs_job_exist/drs_job_exist_test.py | 12 ++++++++++++ .../ec2_ebs_default_encryption_test.py | 11 ++++++++++- ...r_cluster_account_public_block_enabled_test.py | 6 ++++++ .../fms_policy_compliant_test.py | 15 +++++++++++++++ ...onnection_passwords_encryption_enabled_test.py | 9 +++++++++ ...a_catalogs_metadata_encryption_enabled_test.py | 12 ++++++++++++ .../macie_is_enabled/macie_is_enabled_test.py | 15 +++++++++++++++ .../resourceexplorer2_indexes_found_test.py | 6 ++++++ .../ssmincidents_enabled_with_plans_test.py | 12 ++++++++++++ .../trustedadvisor_errors_and_warnings_test.py | 3 +++ ...dvisor_premium_support_plan_subscribed_test.py | 6 ++++++ 17 files changed, 138 insertions(+), 5 deletions(-) diff --git a/tests/providers/aws/services/backup/backup_plans_exist/backup_plans_exist_test.py b/tests/providers/aws/services/backup/backup_plans_exist/backup_plans_exist_test.py index 5de864184d..c5e915d579 100644 --- a/tests/providers/aws/services/backup/backup_plans_exist/backup_plans_exist_test.py +++ b/tests/providers/aws/services/backup/backup_plans_exist/backup_plans_exist_test.py @@ -16,6 +16,9 @@ def test_no_backup_plans(self): backup_client.audited_partition = "aws" backup_client.region = AWS_REGION backup_client.backup_plan_arn_template = f"arn:{backup_client.audited_partition}:backup:{backup_client.region}:{backup_client.audited_account}:backup-plan" + backup_client.__get_backup_plan_arn_template__ = mock.MagicMock( + return_value=backup_client.backup_plan_arn_template + ) backup_client.backup_plans = [] backup_client.backup_vaults = ["vault"] with mock.patch( diff --git a/tests/providers/aws/services/backup/backup_reportplans_exist/backup_reportplans_exist_test.py b/tests/providers/aws/services/backup/backup_reportplans_exist/backup_reportplans_exist_test.py index f0db033cf4..a30f008066 100644 --- a/tests/providers/aws/services/backup/backup_reportplans_exist/backup_reportplans_exist_test.py +++ b/tests/providers/aws/services/backup/backup_reportplans_exist/backup_reportplans_exist_test.py @@ -37,6 +37,9 @@ def test_no_backup_report_plans(self): backup_client.region = AWS_REGION backup_client.audited_partition = "aws" backup_client.report_plan_arn_template = f"arn:{backup_client.audited_partition}:backup:{backup_client.region}:{backup_client.audited_account}:report-plan" + backup_client.__get_report_plan_arn_template__ = mock.MagicMock( + return_value=backup_client.report_plan_arn_template + ) backup_plan_id = str(uuid4()).upper() backup_plan_arn = ( f"arn:aws:backup:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:plan:{backup_plan_id}" @@ -82,6 +85,9 @@ def test_one_backup_report_plan(self): backup_client.region = AWS_REGION backup_client.audited_partition = "aws" backup_client.report_plan_arn_template = f"arn:{backup_client.audited_partition}:backup:{backup_client.region}:{backup_client.audited_account}:report-plan" + backup_client.__get_report_plan_arn_template__ = mock.MagicMock( + return_value=backup_client.report_plan_arn_template + ) backup_plan_id = str(uuid4()).upper() backup_plan_arn = ( f"arn:aws:backup:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:plan:{backup_plan_id}" diff --git a/tests/providers/aws/services/backup/backup_vaults_exist/backup_vaults_exist_test.py b/tests/providers/aws/services/backup/backup_vaults_exist/backup_vaults_exist_test.py index 05a561e8f0..857ae0d9c5 100644 --- a/tests/providers/aws/services/backup/backup_vaults_exist/backup_vaults_exist_test.py +++ b/tests/providers/aws/services/backup/backup_vaults_exist/backup_vaults_exist_test.py @@ -14,6 +14,9 @@ def test_no_backup_vaults(self): backup_client.region = AWS_REGION backup_client.audited_partition = "aws" backup_client.backup_vault_arn_template = f"arn:{backup_client.audited_partition}:backup:{backup_client.region}:{backup_client.audited_account}:backup-vault" + backup_client.__get_backup_vault_arn_template__ = mock.MagicMock( + return_value=backup_client.backup_vault_arn_template + ) backup_client.backup_vaults = [] with mock.patch( "prowler.providers.aws.services.backup.backup_service.Backup", @@ -44,6 +47,9 @@ def test_one_backup_vault(self): backup_client.region = AWS_REGION backup_client.audited_partition = "aws" backup_client.backup_vault_arn_template = f"arn:{backup_client.audited_partition}:backup:{backup_client.region}:{backup_client.audited_account}:backup-vault" + backup_client.__get_backup_vault_arn_template__ = mock.MagicMock( + return_value=backup_client.backup_vault_arn_template + ) backup_vault_arn = f"arn:aws:backup:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:backup-vault:MyBackupVault" backup_client.backup_vaults = [ BackupVault( diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_multi_region_enabled/cloudtrail_multi_region_enabled_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_multi_region_enabled/cloudtrail_multi_region_enabled_test.py index 9a87315b96..c53356785f 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_multi_region_enabled/cloudtrail_multi_region_enabled_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_multi_region_enabled/cloudtrail_multi_region_enabled_test.py @@ -61,7 +61,7 @@ def test_no_trails(self): assert report.resource_id == AWS_ACCOUNT_NUMBER assert ( report.resource_arn - == f"arn:aws:cloudtrail:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:trail" + == f"arn:aws:cloudtrail:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:trail" ) assert report.resource_tags == [] @@ -137,7 +137,7 @@ def test_various_trails_no_logging(self): assert report.resource_id == AWS_ACCOUNT_NUMBER assert ( report.resource_arn - == f"arn:aws:cloudtrail:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:trail" + == f"arn:aws:cloudtrail:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:trail" ) assert report.resource_tags == [] @@ -213,7 +213,7 @@ def test_various_trails_with_and_without_logging(self): assert report.resource_id == AWS_ACCOUNT_NUMBER assert ( report.resource_arn - == f"arn:aws:cloudtrail:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:trail" + == f"arn:aws:cloudtrail:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:trail" ) assert report.resource_tags == [] assert report.region == AWS_REGION_EU_WEST_1 diff --git a/tests/providers/aws/services/config/config_recorder_all_regions_enabled/config_recorder_all_regions_enabled_test.py b/tests/providers/aws/services/config/config_recorder_all_regions_enabled/config_recorder_all_regions_enabled_test.py index ba91941e52..c5b7fc377b 100644 --- a/tests/providers/aws/services/config/config_recorder_all_regions_enabled/config_recorder_all_regions_enabled_test.py +++ b/tests/providers/aws/services/config/config_recorder_all_regions_enabled/config_recorder_all_regions_enabled_test.py @@ -49,6 +49,16 @@ def test_config_no_recorders(self): == f"arn:aws:config:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:recorder" ) assert result[0].resource_id == AWS_ACCOUNT_NUMBER + assert result[1].status == "FAIL" + assert ( + result[1].status_extended + == f"AWS Config recorder {AWS_ACCOUNT_NUMBER} is disabled." + ) + assert ( + result[1].resource_arn + == f"arn:aws:config:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:recorder" + ) + assert result[1].resource_id == AWS_ACCOUNT_NUMBER @mock_aws def test_config_one_recoder_disabled(self): @@ -181,7 +191,7 @@ def test_config_one_recorder_disabled_allowlisted(self): assert recorder.resource_id == AWS_ACCOUNT_NUMBER assert ( recorder.resource_arn - == f"arn:aws:config:{AWS_REGION_EU_SOUTH_2}:{AWS_ACCOUNT_NUMBER}:recorder" + == f"arn:aws:config:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:recorder" ) assert recorder.region == AWS_REGION_US_EAST_1 else: diff --git a/tests/providers/aws/services/dlm/dlm_ebs_snapshot_lifecycle_policy_exists/dlm_ebs_snapshot_lifecycle_policy_exists_test.py b/tests/providers/aws/services/dlm/dlm_ebs_snapshot_lifecycle_policy_exists/dlm_ebs_snapshot_lifecycle_policy_exists_test.py index 484d41a66c..c06860f826 100644 --- a/tests/providers/aws/services/dlm/dlm_ebs_snapshot_lifecycle_policy_exists/dlm_ebs_snapshot_lifecycle_policy_exists_test.py +++ b/tests/providers/aws/services/dlm/dlm_ebs_snapshot_lifecycle_policy_exists/dlm_ebs_snapshot_lifecycle_policy_exists_test.py @@ -88,6 +88,9 @@ def test_one_ebs_snapshot_and_dlm_lifecycle_policy(self): } } dlm_client.lifecycle_policy_arn_template = f"arn:{dlm_client.audited_partition}:dlm:{dlm_client.region}:{dlm_client.audited_account}:policy" + dlm_client.__get_lifecycle_policy_arn_template__ = mock.MagicMock( + return_value=dlm_client.lifecycle_policy_arn_template + ) audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.ec2.ec2_service import EC2 diff --git a/tests/providers/aws/services/drs/drs_job_exist/drs_job_exist_test.py b/tests/providers/aws/services/drs/drs_job_exist/drs_job_exist_test.py index 89ff5add4a..ff4eb8952a 100644 --- a/tests/providers/aws/services/drs/drs_job_exist/drs_job_exist_test.py +++ b/tests/providers/aws/services/drs/drs_job_exist/drs_job_exist_test.py @@ -31,6 +31,9 @@ def test_drs_job_exist(self): ) ] drs_client.recovery_job_arn_template = f"arn:{drs_client.audited_partition}:drs:{drs_client.region}:{drs_client.audited_account}:recovery-job" + drs_client.__get_recovery_job_arn_template__ = mock.MagicMock( + return_value=drs_client.recovery_job_arn_template + ) with mock.patch( "prowler.providers.aws.services.drs.drs_service.DRS", new=drs_client, @@ -71,6 +74,9 @@ def test_drs_no_jobs(self): ) ] drs_client.recovery_job_arn_template = f"arn:{drs_client.audited_partition}:drs:{drs_client.region}:{drs_client.audited_account}:recovery-job" + drs_client.__get_recovery_job_arn_template__ = mock.MagicMock( + return_value=drs_client.recovery_job_arn_template + ) with mock.patch( "prowler.providers.aws.services.drs.drs_service.DRS", new=drs_client, @@ -112,6 +118,9 @@ def test_drs_disabled(self): ) ] drs_client.recovery_job_arn_template = f"arn:{drs_client.audited_partition}:drs:{drs_client.region}:{drs_client.audited_account}:recovery-job" + drs_client.__get_recovery_job_arn_template__ = mock.MagicMock( + return_value=drs_client.recovery_job_arn_template + ) with mock.patch( "prowler.providers.aws.services.drs.drs_service.DRS", new=drs_client, @@ -151,6 +160,9 @@ def test_drs_disabled_allowlisted(self): ) ] drs_client.recovery_job_arn_template = f"arn:{drs_client.audited_partition}:drs:{drs_client.region}:{drs_client.audited_account}:recovery-job" + drs_client.__get_recovery_job_arn_template__ = mock.MagicMock( + return_value=drs_client.recovery_job_arn_template + ) with mock.patch( "prowler.providers.aws.services.drs.drs_service.DRS", new=drs_client, diff --git a/tests/providers/aws/services/ec2/ec2_ebs_default_encryption/ec2_ebs_default_encryption_test.py b/tests/providers/aws/services/ec2/ec2_ebs_default_encryption/ec2_ebs_default_encryption_test.py index 407e4acbd0..ad516ff576 100644 --- a/tests/providers/aws/services/ec2/ec2_ebs_default_encryption/ec2_ebs_default_encryption_test.py +++ b/tests/providers/aws/services/ec2/ec2_ebs_default_encryption/ec2_ebs_default_encryption_test.py @@ -89,6 +89,15 @@ def test_ec2_ebs_encryption_disabled(self): result[0].resource_arn == f"arn:aws:ec2:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:volume" ) + assert result[1].status == "FAIL" + assert ( + result[1].status_extended == "EBS Default Encryption is not activated." + ) + assert result[1].resource_id == AWS_ACCOUNT_NUMBER + assert ( + result[1].resource_arn + == f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:volume" + ) @mock_aws def test_ec2_ebs_encryption_disabled_ignored(self): @@ -154,5 +163,5 @@ def test_ec2_ebs_encryption_disabled_ignoring_with_volumes(self): assert result[0].resource_id == AWS_ACCOUNT_NUMBER assert ( result[0].resource_arn - == f"arn:aws:ec2:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:volume" + == f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:volume" ) diff --git a/tests/providers/aws/services/emr/emr_cluster_account_public_block_enabled/emr_cluster_account_public_block_enabled_test.py b/tests/providers/aws/services/emr/emr_cluster_account_public_block_enabled/emr_cluster_account_public_block_enabled_test.py index adbf7a21de..84283e799e 100644 --- a/tests/providers/aws/services/emr/emr_cluster_account_public_block_enabled/emr_cluster_account_public_block_enabled_test.py +++ b/tests/providers/aws/services/emr/emr_cluster_account_public_block_enabled/emr_cluster_account_public_block_enabled_test.py @@ -21,6 +21,9 @@ def test_account_public_block_enabled(self): emr_client.region = AWS_REGION_EU_WEST_1 emr_client.audited_partition = "aws" emr_client.cluster_arn_template = f"arn:{emr_client.audited_partition}:elasticmapreduce:{emr_client.region}:{emr_client.audited_account}:cluster" + emr_client.__get_cluster_arn_template__ = mock.MagicMock( + return_value=emr_client.cluster_arn_template + ) with mock.patch( "prowler.providers.aws.services.emr.emr_service.EMR", new=emr_client, @@ -53,6 +56,9 @@ def test_account_public_block_disabled(self): emr_client.region = AWS_REGION_EU_WEST_1 emr_client.audited_partition = "aws" emr_client.cluster_arn_template = f"arn:{emr_client.audited_partition}:elasticmapreduce:{emr_client.region}:{emr_client.audited_account}:cluster" + emr_client.__get_cluster_arn_template__ = mock.MagicMock( + return_value=emr_client.cluster_arn_template + ) with mock.patch( "prowler.providers.aws.services.emr.emr_service.EMR", new=emr_client, diff --git a/tests/providers/aws/services/fms/fms_policy_compliant/fms_policy_compliant_test.py b/tests/providers/aws/services/fms/fms_policy_compliant/fms_policy_compliant_test.py index 1f3a185dbe..f56919b305 100644 --- a/tests/providers/aws/services/fms/fms_policy_compliant/fms_policy_compliant_test.py +++ b/tests/providers/aws/services/fms/fms_policy_compliant/fms_policy_compliant_test.py @@ -55,6 +55,9 @@ def test_fms_admin_with_non_compliant_policies(self): ) ] fms_client.policy_arn_template = f"arn:{fms_client.audited_partition}:fms:{fms_client.region}:{fms_client.audited_account}:policy" + fms_client.__get_policy_arn_template__ = mock.MagicMock( + return_value=fms_client.policy_arn_template + ) with mock.patch( "prowler.providers.aws.services.fms.fms_service.FMS", new=fms_client, @@ -106,6 +109,9 @@ def test_fms_admin_with_compliant_policies(self): ) ] fms_client.policy_arn_template = f"arn:{fms_client.audited_partition}:fms:{fms_client.region}:{fms_client.audited_account}:policy" + fms_client.__get_policy_arn_template__ = mock.MagicMock( + return_value=fms_client.policy_arn_template + ) with mock.patch( "prowler.providers.aws.services.fms.fms_service.FMS", new=fms_client, @@ -161,6 +167,9 @@ def test_fms_admin_with_non_and_compliant_policies(self): ) ] fms_client.policy_arn_template = f"arn:{fms_client.audited_partition}:fms:{fms_client.region}:{fms_client.audited_account}:policy" + fms_client.__get_policy_arn_template__ = mock.MagicMock( + return_value=fms_client.policy_arn_template + ) with mock.patch( "prowler.providers.aws.services.fms.fms_service.FMS", new=fms_client, @@ -195,6 +204,9 @@ def test_fms_admin_without_policies(self): fms_client.fms_admin_account = True fms_client.fms_policies = [] fms_client.policy_arn_template = f"arn:{fms_client.audited_partition}:fms:{fms_client.region}:{fms_client.audited_account}:policy" + fms_client.__get_policy_arn_template__ = mock.MagicMock( + return_value=fms_client.policy_arn_template + ) with mock.patch( "prowler.providers.aws.services.fms.fms_service.FMS", new=fms_client, @@ -246,6 +258,9 @@ def test_fms_admin_with_policy_with_null_status(self): ) ] fms_client.policy_arn_template = f"arn:{fms_client.audited_partition}:fms:{fms_client.region}:{fms_client.audited_account}:policy" + fms_client.__get_policy_arn_template__ = mock.MagicMock( + return_value=fms_client.policy_arn_template + ) with mock.patch( "prowler.providers.aws.services.fms.fms_service.FMS", new=fms_client, diff --git a/tests/providers/aws/services/glue/glue_data_catalogs_connection_passwords_encryption_enabled/glue_data_catalogs_connection_passwords_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_data_catalogs_connection_passwords_encryption_enabled/glue_data_catalogs_connection_passwords_encryption_enabled_test.py index 362a91faca..b6f4c99062 100644 --- a/tests/providers/aws/services/glue/glue_data_catalogs_connection_passwords_encryption_enabled/glue_data_catalogs_connection_passwords_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_data_catalogs_connection_passwords_encryption_enabled/glue_data_catalogs_connection_passwords_encryption_enabled_test.py @@ -44,6 +44,9 @@ def test_glue_catalog_password_unencrypted(self): glue_client.audited_partition = "aws" glue_client.region = AWS_REGION_US_EAST_1 glue_client.data_catalog_arn_template = f"arn:{glue_client.audited_partition}:glue:{glue_client.region}:{glue_client.audited_account}:data-catalog" + glue_client.__get_data_catalog_arn_template__ = mock.MagicMock( + return_value=glue_client.data_catalog_arn_template + ) with mock.patch( "prowler.providers.aws.services.glue.glue_service.Glue", glue_client, @@ -82,6 +85,9 @@ def test_glue_catalog_password_unencrypted_ignoring(self): glue_client.audited_partition = "aws" glue_client.region = AWS_REGION_US_EAST_1 glue_client.data_catalog_arn_template = f"arn:{glue_client.audited_partition}:glue:{glue_client.region}:{glue_client.audited_account}:data-catalog" + glue_client.__get_data_catalog_arn_template__ = mock.MagicMock( + return_value=glue_client.data_catalog_arn_template + ) glue_client.audit_info.ignore_unused_services = True with mock.patch( "prowler.providers.aws.services.glue.glue_service.Glue", @@ -114,6 +120,9 @@ def test_glue_catalog_password_unencrypted_ignoring_with_tables(self): glue_client.audited_partition = "aws" glue_client.region = AWS_REGION_US_EAST_1 glue_client.data_catalog_arn_template = f"arn:{glue_client.audited_partition}:glue:{glue_client.region}:{glue_client.audited_account}:data-catalog" + glue_client.__get_data_catalog_arn_template__ = mock.MagicMock( + return_value=glue_client.data_catalog_arn_template + ) glue_client.audit_info.ignore_unused_services = True with mock.patch( "prowler.providers.aws.services.glue.glue_service.Glue", diff --git a/tests/providers/aws/services/glue/glue_data_catalogs_metadata_encryption_enabled/glue_data_catalogs_metadata_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_data_catalogs_metadata_encryption_enabled/glue_data_catalogs_metadata_encryption_enabled_test.py index 7cdd291ab0..ccb3d5891f 100644 --- a/tests/providers/aws/services/glue/glue_data_catalogs_metadata_encryption_enabled/glue_data_catalogs_metadata_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_data_catalogs_metadata_encryption_enabled/glue_data_catalogs_metadata_encryption_enabled_test.py @@ -45,6 +45,9 @@ def test_glue_catalog_unencrypted(self): glue_client.audited_partition = "aws" glue_client.region = AWS_REGION_US_EAST_1 glue_client.data_catalog_arn_template = f"arn:{glue_client.audited_partition}:glue:{glue_client.region}:{glue_client.audited_account}:data-catalog" + glue_client.__get_data_catalog_arn_template__ = mock.MagicMock( + return_value=glue_client.data_catalog_arn_template + ) with mock.patch( "prowler.providers.aws.services.glue.glue_service.Glue", glue_client, @@ -84,6 +87,9 @@ def test_glue_catalog_unencrypted_ignoring(self): glue_client.audited_partition = "aws" glue_client.region = AWS_REGION_US_EAST_1 glue_client.data_catalog_arn_template = f"arn:{glue_client.audited_partition}:glue:{glue_client.region}:{glue_client.audited_account}:data-catalog" + glue_client.__get_data_catalog_arn_template__ = mock.MagicMock( + return_value=glue_client.data_catalog_arn_template + ) with mock.patch( "prowler.providers.aws.services.glue.glue_service.Glue", glue_client, @@ -116,6 +122,9 @@ def test_glue_catalog_unencrypted_ignoring_with_tables(self): glue_client.audited_partition = "aws" glue_client.region = AWS_REGION_US_EAST_1 glue_client.data_catalog_arn_template = f"arn:{glue_client.audited_partition}:glue:{glue_client.region}:{glue_client.audited_account}:data-catalog" + glue_client.__get_data_catalog_arn_template__ = mock.MagicMock( + return_value=glue_client.data_catalog_arn_template + ) with mock.patch( "prowler.providers.aws.services.glue.glue_service.Glue", glue_client, @@ -154,6 +163,9 @@ def test_glue_catalog_encrypted(self): glue_client.audited_partition = "aws" glue_client.region = AWS_REGION_US_EAST_1 glue_client.data_catalog_arn_template = f"arn:{glue_client.audited_partition}:glue:{glue_client.region}:{glue_client.audited_account}:data-catalog" + glue_client.__get_data_catalog_arn_template__ = mock.MagicMock( + return_value=glue_client.data_catalog_arn_template + ) with mock.patch( "prowler.providers.aws.services.glue.glue_service.Glue", glue_client, diff --git a/tests/providers/aws/services/macie/macie_is_enabled/macie_is_enabled_test.py b/tests/providers/aws/services/macie/macie_is_enabled/macie_is_enabled_test.py index 0114705bd8..7df819f39b 100644 --- a/tests/providers/aws/services/macie/macie_is_enabled/macie_is_enabled_test.py +++ b/tests/providers/aws/services/macie/macie_is_enabled/macie_is_enabled_test.py @@ -32,6 +32,9 @@ def test_macie_disabled(self): ) ] macie_client.session_arn_template = f"arn:{macie_client.audited_partition}:macie:{macie_client.region}:{macie_client.audited_account}:session" + macie_client.__get_session_arn_template__ = mock.MagicMock( + return_value=macie_client.session_arn_template + ) current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) with mock.patch( @@ -81,6 +84,9 @@ def test_macie_enabled(self): ) ] macie_client.session_arn_template = f"arn:{macie_client.audited_partition}:macie:{macie_client.region}:{macie_client.audited_account}:session" + macie_client.__get_session_arn_template__ = mock.MagicMock( + return_value=macie_client.session_arn_template + ) current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) with mock.patch( @@ -124,6 +130,9 @@ def test_macie_suspended_ignored(self): macie_client.audited_partition = "aws" macie_client.region = AWS_REGION_EU_WEST_1 macie_client.session_arn_template = f"arn:{macie_client.audited_partition}:macie:{macie_client.region}:{macie_client.audited_account}:session" + macie_client.__get_session_arn_template__ = mock.MagicMock( + return_value=macie_client.session_arn_template + ) macie_client.sessions = [ Session( status="PAUSED", @@ -180,6 +189,9 @@ def test_macie_suspended_ignored_with_buckets(self): ) ] macie_client.session_arn_template = f"arn:{macie_client.audited_partition}:macie:{macie_client.region}:{macie_client.audited_account}:session" + macie_client.__get_session_arn_template__ = mock.MagicMock( + return_value=macie_client.session_arn_template + ) macie_client.audit_info.ignore_unused_services = True current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) @@ -231,6 +243,9 @@ def test_macie_suspended(self): ] current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) macie_client.session_arn_template = f"arn:{macie_client.audited_partition}:macie:{macie_client.region}:{macie_client.audited_account}:session" + macie_client.__get_session_arn_template__ = mock.MagicMock( + return_value=macie_client.session_arn_template + ) with mock.patch( "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", new=current_audit_info, 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 5ebb826089..0abd945b9d 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 @@ -23,6 +23,9 @@ def test_no_indexes_found(self): resourceexplorer2_client.audited_partition = "aws" resourceexplorer2_client.region = AWS_REGION_US_EAST_1 resourceexplorer2_client.index_arn_template = f"arn:{resourceexplorer2_client.audited_partition}:resource-explorer:{resourceexplorer2_client.region}:{resourceexplorer2_client.audited_account}:index" + resourceexplorer2_client.__get_index_arn_template__ = mock.MagicMock( + return_value=resourceexplorer2_client.index_arn_template + ) with mock.patch( "prowler.providers.aws.services.resourceexplorer2.resourceexplorer2_service.ResourceExplorer2", new=resourceexplorer2_client, @@ -58,6 +61,9 @@ def test_one_index_found(self): resourceexplorer2_client.region = AWS_REGION_US_EAST_1 resourceexplorer2_client.audited_partition = "aws" resourceexplorer2_client.index_arn_template = f"arn:{resourceexplorer2_client.audited_partition}:resource-explorer:{resourceexplorer2_client.region}:{resourceexplorer2_client.audited_account}:index" + resourceexplorer2_client.__get_index_arn_template__ = mock.MagicMock( + return_value=resourceexplorer2_client.index_arn_template + ) with mock.patch( "prowler.providers.aws.services.resourceexplorer2.resourceexplorer2_service.ResourceExplorer2", new=resourceexplorer2_client, diff --git a/tests/providers/aws/services/ssmincidents/ssmincidents_enabled_with_plans/ssmincidents_enabled_with_plans_test.py b/tests/providers/aws/services/ssmincidents/ssmincidents_enabled_with_plans/ssmincidents_enabled_with_plans_test.py index a117ff78b7..e21e159f9c 100644 --- a/tests/providers/aws/services/ssmincidents/ssmincidents_enabled_with_plans/ssmincidents_enabled_with_plans_test.py +++ b/tests/providers/aws/services/ssmincidents/ssmincidents_enabled_with_plans/ssmincidents_enabled_with_plans_test.py @@ -23,6 +23,9 @@ def test_ssmincidents_no_replicationset(self): ) ssmincidents_client.region = AWS_REGION_US_EAST_1 ssmincidents_client.replication_set_arn_template = f"arn:{ssmincidents_client.audited_partition}:ssm-incidents:{ssmincidents_client.region}:{ssmincidents_client.audited_account}:replication-set" + ssmincidents_client.__get_replication_set_arn_template__ = mock.MagicMock( + return_value=ssmincidents_client.replication_set_arn_template + ) ssmincidents_client.replication_set = [] with mock.patch( "prowler.providers.aws.services.ssmincidents.ssmincidents_service.SSMIncidents", @@ -60,6 +63,9 @@ def test_ssmincidents_replicationset_not_active(self): ] ssmincidents_client.audited_partition = "aws" ssmincidents_client.replication_set_arn_template = f"arn:{ssmincidents_client.audited_partition}:ssm-incidents:{ssmincidents_client.region}:{ssmincidents_client.audited_account}:replication-set" + ssmincidents_client.__get_replication_set_arn_template__ = mock.MagicMock( + return_value=ssmincidents_client.replication_set_arn_template + ) with mock.patch( "prowler.providers.aws.services.ssmincidents.ssmincidents_service.SSMIncidents", new=ssmincidents_client, @@ -94,6 +100,9 @@ def test_ssmincidents_replicationset_active_no_plans(self): ] ssmincidents_client.audited_partition = "aws" ssmincidents_client.replication_set_arn_template = f"arn:{ssmincidents_client.audited_partition}:ssm-incidents:{ssmincidents_client.region}:{ssmincidents_client.audited_account}:replication-set" + ssmincidents_client.__get_replication_set_arn_template__ = mock.MagicMock( + return_value=ssmincidents_client.replication_set_arn_template + ) ssmincidents_client.response_plans = [] with mock.patch( "prowler.providers.aws.services.ssmincidents.ssmincidents_service.SSMIncidents", @@ -134,6 +143,9 @@ def test_ssmincidents_replicationset_active_with_plans(self): ] ssmincidents_client.audited_partition = "aws" ssmincidents_client.replication_set_arn_template = f"arn:{ssmincidents_client.audited_partition}:ssm-incidents:{ssmincidents_client.region}:{ssmincidents_client.audited_account}:replication-set" + ssmincidents_client.__get_replication_set_arn_template__ = mock.MagicMock( + return_value=ssmincidents_client.replication_set_arn_template + ) with mock.patch( "prowler.providers.aws.services.ssmincidents.ssmincidents_service.SSMIncidents", new=ssmincidents_client, diff --git a/tests/providers/aws/services/trustedadvisor/trustedadvisor_errors_and_warnings/trustedadvisor_errors_and_warnings_test.py b/tests/providers/aws/services/trustedadvisor/trustedadvisor_errors_and_warnings/trustedadvisor_errors_and_warnings_test.py index dd899342d9..f4b8bdd690 100644 --- a/tests/providers/aws/services/trustedadvisor/trustedadvisor_errors_and_warnings/trustedadvisor_errors_and_warnings_test.py +++ b/tests/providers/aws/services/trustedadvisor/trustedadvisor_errors_and_warnings/trustedadvisor_errors_and_warnings_test.py @@ -24,6 +24,9 @@ def test_no_detectors_premium_support_disabled(self): trustedadvisor_client.audited_partition = "aws" trustedadvisor_client.region = AWS_REGION_US_EAST_1 trustedadvisor_client.account_arn_template = f"arn:{trustedadvisor_client.audited_partition}:trusted-advisor:{trustedadvisor_client.region}:{trustedadvisor_client.audited_account}:account" + trustedadvisor_client.__get_account_arn_template__ = mock.MagicMock( + return_value=trustedadvisor_client.account_arn_template + ) with mock.patch( "prowler.providers.aws.services.trustedadvisor.trustedadvisor_service.TrustedAdvisor", trustedadvisor_client, diff --git a/tests/providers/aws/services/trustedadvisor/trustedadvisor_premium_support_plan_subscribed/trustedadvisor_premium_support_plan_subscribed_test.py b/tests/providers/aws/services/trustedadvisor/trustedadvisor_premium_support_plan_subscribed/trustedadvisor_premium_support_plan_subscribed_test.py index 0fa79847f2..b7f2187f89 100644 --- a/tests/providers/aws/services/trustedadvisor/trustedadvisor_premium_support_plan_subscribed/trustedadvisor_premium_support_plan_subscribed_test.py +++ b/tests/providers/aws/services/trustedadvisor/trustedadvisor_premium_support_plan_subscribed/trustedadvisor_premium_support_plan_subscribed_test.py @@ -23,6 +23,9 @@ def test_premium_support_not_susbcribed(self): # Set verify_premium_support_plans config trustedadvisor_client.audit_config = {"verify_premium_support_plans": True} trustedadvisor_client.account_arn_template = f"arn:{trustedadvisor_client.audited_partition}:trusted-advisor:{trustedadvisor_client.region}:{trustedadvisor_client.audited_account}:account" + trustedadvisor_client.__get_account_arn_template__ = mock.MagicMock( + return_value=trustedadvisor_client.account_arn_template + ) with mock.patch( "prowler.providers.aws.services.trustedadvisor.trustedadvisor_service.TrustedAdvisor", trustedadvisor_client, @@ -58,6 +61,9 @@ def test_premium_support_susbcribed(self): # Set verify_premium_support_plans config trustedadvisor_client.audit_config = {"verify_premium_support_plans": True} trustedadvisor_client.account_arn_template = f"arn:{trustedadvisor_client.audited_partition}:trusted-advisor:{trustedadvisor_client.region}:{trustedadvisor_client.audited_account}:account" + trustedadvisor_client.__get_account_arn_template__ = mock.MagicMock( + return_value=trustedadvisor_client.account_arn_template + ) with mock.patch( "prowler.providers.aws.services.trustedadvisor.trustedadvisor_service.TrustedAdvisor", trustedadvisor_client,