From bda5d62c72b1670b00a76e58eb15822c78e0f442 Mon Sep 17 00:00:00 2001 From: Pepe Fagoaga Date: Wed, 13 Mar 2024 18:15:24 +0100 Subject: [PATCH] chore(aws): Replace audit_info for provider (#3521) Co-authored-by: Sergio Garcia <38561120+sergargar@users.noreply.github.com> --- docs/tutorials/mutelist.md | 2 +- poetry.lock | 10 +- prowler/config/config.yaml | 8 +- prowler/lib/outputs/models.py | 2 + prowler/providers/aws/aws_provider.py | 8 +- .../aws/lib/audit_info/audit_info.py | 43 ------ .../providers/aws/lib/mutelist/mutelist.py | 2 +- .../lib/quick_inventory/quick_inventory.py | 4 +- .../resource_api_tagging.py | 9 +- .../globalaccelerator_service.py | 2 +- .../trustedadvisor/trustedadvisor_service.py | 8 +- pyproject.toml | 2 +- tests/lib/check/check_test.py | 2 +- tests/lib/outputs/outputs_test.py | 2 +- tests/lib/outputs/slack_test.py | 2 +- tests/providers/aws/aws_provider_test.py | 2 +- .../aws/lib/mutelist/mutelist_test.py | 41 +++--- .../lib/organizations/organizations_test.py | 5 +- tests/providers/aws/lib/s3/s3_test.py | 8 +- .../aws/lib/security_hub/security_hub_test.py | 4 +- .../providers/aws/lib/service/service_test.py | 24 ++-- .../accessanalyzer_service_test.py | 20 +-- .../services/account/account_service_test.py | 25 ++-- .../aws/services/acm/acm_service_test.py | 34 ++--- .../apigateway_authorizers_enabled_test.py | 82 +++++------ ...gateway_client_certificate_enabled_test.py | 34 ++--- .../apigateway_endpoint_public_test.py | 32 ++--- ...endpoint_public_without_authorizer_test.py | 32 ++--- .../apigateway_logging_enabled_test.py | 32 ++--- .../apigateway/apigateway_service_test.py | 40 +++--- .../apigateway_waf_acl_attached_test.py | 32 ++--- ...pigatewayv2_access_logging_enabled_test.py | 25 ++-- .../apigatewayv2_authorizers_enabled_test.py | 25 ++-- .../apigatewayv2/apigatewayv2_service_test.py | 32 ++--- .../appstream/appstream_service_test.py | 22 +-- .../services/athena/athena_service_test.py | 25 ++-- .../athena_workgroup_encryption_test.py | 32 ++--- ...na_workgroup_enforce_configuration_test.py | 32 ++--- ...d_secrets_ec2_launch_configuration_test.py | 53 ++++--- .../autoscaling_group_multiple_az_test.py | 37 +++-- .../autoscaling/autoscaling_service_test.py | 28 ++-- ...rations_cloudtrail_logging_enabled_test.py | 40 +++--- ...lambda_function_no_secrets_in_code_test.py | 22 +-- ...a_function_no_secrets_in_variables_test.py | 20 +-- ...a_function_not_publicly_accessible_test.py | 20 +-- ...awslambda_function_url_cors_policy_test.py | 23 +-- .../awslambda_function_url_public_test.py | 16 +-- ..._function_using_supported_runtimes_test.py | 20 +-- .../awslambda/awslambda_service_test.py | 20 +-- .../services/backup/backup_service_test.py | 37 +++-- .../cloudformation_service_test.py | 26 ++-- ...ons_field_level_encryption_enabled_test.py | 2 +- ...ributions_geo_restrictions_enabled_test.py | 2 +- ...dfront_distributions_https_enabled_test.py | 2 +- ...ront_distributions_logging_enabled_test.py | 2 +- ...ons_using_deprecated_ssl_protocols_test.py | 2 +- ...cloudfront_distributions_using_waf_test.py | 2 +- .../cloudfront/cloudfront_service_test.py | 15 +- ...udtrail_bucket_requires_mfa_delete_test.py | 52 +++---- ...udtrail_cloudwatch_logging_enabled_test.py | 36 +++-- .../cloudtrail_insights_exist_test.py | 28 ++-- .../cloudtrail_kms_encryption_enabled_test.py | 28 ++-- ...dtrail_log_file_validation_enabled_test.py | 28 ++-- ...s_s3_bucket_access_logging_enabled_test.py | 44 +++--- ..._bucket_is_not_publicly_accessible_test.py | 54 ++++--- .../cloudtrail_multi_region_enabled_test.py | 44 +++--- ..._enabled_logging_management_events_test.py | 44 +++--- ...udtrail_s3_dataevents_read_enabled_test.py | 78 +++++----- ...dtrail_s3_dataevents_write_enabled_test.py | 78 +++++----- .../cloudtrail/cloudtrail_service_test.py | 42 +++--- ...s_to_network_acls_alarm_configured_test.py | 102 ++++++------- ..._network_gateways_alarm_configured_test.py | 102 ++++++------- ...work_route_tables_alarm_configured_test.py | 102 ++++++------- ...h_changes_to_vpcs_alarm_configured_test.py | 102 ++++++------- ...tch_cross_account_sharing_disabled_test.py | 24 ++-- ...h_log_group_kms_encryption_enabled_test.py | 34 ++--- ...watch_log_group_no_secrets_in_logs_test.py | 34 ++--- ...ntion_policy_specific_days_enabled_test.py | 52 +++---- ...nfig_configuration_changes_enabled_test.py | 102 ++++++------- ...rail_configuration_changes_enabled_test.py | 102 ++++++------- ...ric_filter_authentication_failures_test.py | 102 ++++++------- ...c_filter_aws_organizations_changes_test.py | 102 ++++++------- ...e_or_scheduled_deletion_of_kms_cmk_test.py | 102 ++++++------- ...ilter_for_s3_bucket_policy_changes_test.py | 102 ++++++------- ...h_log_metric_filter_policy_changes_test.py | 102 ++++++------- ...watch_log_metric_filter_root_usage_test.py | 102 ++++++------- ...tric_filter_security_group_changes_test.py | 102 ++++++------- ..._metric_filter_sign_in_without_mfa_test.py | 102 ++++++------- ...tric_filter_unauthorized_api_calls_test.py | 102 ++++++------- .../cloudwatch/cloudwatch_service_test.py | 52 +++---- ...xternal_public_publishing_disabled_test.py | 2 +- .../codeartifact/codeartifact_service_test.py | 18 +-- .../codebuild/codebuild_service_test.py | 19 ++- .../services/cognito/cognito_service_test.py | 32 ++--- ...onfig_recorder_all_regions_enabled_test.py | 42 +++--- .../services/config/config_service_test.py | 24 ++-- ...ce_directory_monitor_notifications_test.py | 2 +- .../directoryservice_service_test.py | 18 +-- ...s_snapshot_lifecycle_policy_exists_test.py | 36 ++--- .../aws/services/dlm/dlm_service_test.py | 30 ++-- .../documentdb/documentdb_service_test.py | 30 ++-- .../aws/services/drs/drs_service_test.py | 23 ++- ...lerator_cluster_encryption_enabled_test.py | 28 ++-- .../dynamodb/dynamodb_service_test.py | 36 ++--- ..._tables_kms_cmk_encryption_enabled_test.py | 28 ++-- .../dynamodb_tables_pitr_enabled_test.py | 28 ++-- .../ec2/ec2_ami_public/ec2_ami_public_test.py | 32 ++--- .../ec2_ebs_default_encryption_test.py | 36 ++--- .../ec2_ebs_public_snapshot_test.py | 38 ++--- .../ec2_ebs_snapshots_encrypted_test.py | 38 ++--- .../ec2_ebs_volume_encryption_test.py | 32 ++--- .../ec2_ebs_volume_snapshots_exists_test.py | 42 +++--- .../ec2_elastic_ip_shodan_test.py | 36 ++--- .../ec2_elastic_ip_unassigned_test.py | 32 ++--- ...stance_detailed_monitoring_enabled_test.py | 32 ++--- .../ec2_instance_imdsv2_enabled_test.py | 42 +++--- ...ernet_facing_with_instance_profile_test.py | 32 ++--- .../ec2_instance_managed_by_ssm_test.py | 28 ++-- ..._instance_older_than_specific_days_test.py | 38 ++--- .../ec2_instance_profile_attached_test.py | 32 ++--- .../ec2_instance_public_ip_test.py | 32 ++--- .../ec2_instance_secrets_user_data_test.py | 62 ++++---- ..._networkacl_allow_ingress_any_port_test.py | 58 ++++---- ...tworkacl_allow_ingress_tcp_port_22_test.py | 58 ++++---- ...orkacl_allow_ingress_tcp_port_3389_test.py | 58 ++++---- ..._ingress_from_internet_to_any_port_test.py | 70 ++++----- ...ternet_to_port_mongodb_27017_27018_test.py | 58 ++++---- ...rom_internet_to_tcp_ftp_port_20_21_test.py | 58 ++++---- ...gress_from_internet_to_tcp_port_22_test.py | 58 ++++---- ...ess_from_internet_to_tcp_port_3389_test.py | 58 ++++---- ..._tcp_port_cassandra_7199_9160_8888_test.py | 58 ++++---- ...lasticsearch_kibana_9200_9300_5601_test.py | 58 ++++---- ...om_internet_to_tcp_port_kafka_9092_test.py | 58 ++++---- ...ternet_to_tcp_port_memcached_11211_test.py | 58 ++++---- ...om_internet_to_tcp_port_mysql_3306_test.py | 58 ++++---- ...ernet_to_tcp_port_oracle_1521_2483_test.py | 58 ++++---- ...internet_to_tcp_port_postgres_5432_test.py | 70 ++++----- ...om_internet_to_tcp_port_redis_6379_test.py | 68 ++++----- ...t_to_tcp_port_sql_server_1433_1434_test.py | 58 ++++---- ...rom_internet_to_tcp_port_telnet_23_test.py | 58 ++++---- ...ygroup_allow_wide_open_public_ipv4_test.py | 32 ++--- ...ritygroup_default_restrict_traffic_test.py | 35 +++-- ...2_securitygroup_from_launch_wizard_test.py | 32 ++--- .../ec2_securitygroup_not_used_test.py | 64 ++++----- ...oup_with_many_ingress_egress_rules_test.py | 38 ++--- .../aws/services/ec2/ec2_service_test.py | 82 +++++------ ...gistry_scan_images_on_push_enabled_test.py | 24 ++-- ...ositories_lifecycle_policy_enabled_test.py | 20 +-- ...positories_not_publicly_accessible_test.py | 20 +-- ...tories_scan_images_on_push_enabled_test.py | 20 +-- ...an_vulnerabilities_in_latest_image_test.py | 48 +++---- .../aws/services/ecr/ecr_service_test.py | 42 +++--- .../aws/services/ecs/ecs_service_test.py | 31 ++-- .../aws/services/efs/efs_service_test.py | 18 +-- ..._cmk_encryption_in_secrets_enabled_test.py | 5 +- ...eks_cluster_network_policy_enabled_test.py | 5 +- .../eks_cluster_private_nodes_enabled_test.py | 5 +- ...l_plane_endpoint_access_restricted_test.py | 5 +- ...ol_plane_logging_all_types_enabled_test.py | 5 +- ..._endpoints_not_publicly_accessible_test.py | 5 +- .../aws/services/eks/eks_service_test.py | 30 ++-- ...ticache_cluster_uses_public_subnet_test.py | 24 ++-- .../elasticache/elasticache_service_test.py | 30 ++-- .../elb_insecure_ssl_ciphers_test.py | 28 ++-- .../elb_internet_facing_test.py | 28 ++-- .../elb_logging_enabled_test.py | 28 ++-- .../aws/services/elb/elb_service_test.py | 24 ++-- .../elb_ssl_listeners_test.py | 28 ++-- .../elbv2_deletion_protection_test.py | 28 ++-- .../elbv2_desync_mitigation_mode_test.py | 36 +++-- .../elbv2_insecure_ssl_ciphers_test.py | 28 ++-- .../elbv2_internet_facing_test.py | 28 ++-- .../elbv2_listeners_underneath_test.py | 28 ++-- .../elbv2_logging_enabled_test.py | 28 ++-- .../aws/services/elbv2/elbv2_service_test.py | 32 ++--- .../elbv2_ssl_listeners_test.py | 36 +++-- .../elbv2_waf_acl_attached_test.py | 40 +++--- ...uster_account_public_block_enabled_test.py | 5 +- ..._cluster_master_nodes_no_public_ip_test.py | 5 +- .../emr_cluster_publicly_accesible_test.py | 34 ++--- .../aws/services/emr/emr_service_test.py | 20 +-- .../fms_policy_compliant_test.py | 5 +- .../aws/services/fms/fms_service_test.py | 18 +-- .../services/glacier/glacier_service_test.py | 20 +-- ...lacier_vaults_policy_public_access_test.py | 5 +- .../globalaccelerator_service_test.py | 22 +-- ...ction_passwords_encryption_enabled_test.py | 19 ++- ...talogs_metadata_encryption_enabled_test.py | 19 ++- ...e_database_connections_ssl_enabled_test.py | 2 +- ...cloudwatch_logs_encryption_enabled_test.py | 2 +- ...ts_job_bookmark_encryption_enabled_test.py | 2 +- ...nt_endpoints_s3_encryption_enabled_test.py | 2 +- ..._jobs_amazon_s3_encryption_enabled_test.py | 2 +- ...cloudwatch_logs_encryption_enabled_test.py | 2 +- ...bs_job_bookmark_encryption_enabled_test.py | 2 +- .../aws/services/glue/glue_service_test.py | 50 +++---- .../guardduty_centrally_managed_test.py | 5 +- .../guardduty_is_enabled_test.py | 2 +- ...uardduty_no_high_severity_findings_test.py | 5 +- .../guardduty/guardduty_service_test.py | 42 +++--- .../iam_administrator_access_with_mfa_test.py | 45 +++--- .../iam_avoid_root_usage_test.py | 61 ++++---- ...olicy_no_administrative_privileges_test.py | 29 ++-- .../iam_check_saml_providers_sts_test.py | 13 +- ...olicy_no_administrative_privileges_test.py | 29 ++-- ...olicy_no_administrative_privileges_test.py | 29 ++-- ...olicy_no_administrative_privileges_test.py | 100 ++++++------- ..._policy_permissive_role_assumption_test.py | 45 +++--- ...expired_server_certificates_stored_test.py | 21 ++- .../iam_no_root_access_key_test.py | 37 +++-- ...s_passwords_within_90_days_or_less_test.py | 28 ++-- .../iam_password_policy_lowercase_test.py | 20 +-- ..._password_policy_minimum_length_14_test.py | 32 ++--- .../iam_password_policy_number_test.py | 24 ++-- .../iam_password_policy_reuse_24_test.py | 24 ++-- .../iam_password_policy_symbol_test.py | 24 ++-- .../iam_password_policy_uppercase_test.py | 24 ++-- ...policy_allows_privilege_escalation_test.py | 136 +++++++++--------- ...cy_attached_only_to_group_or_roles_test.py | 36 ++--- ...olicy_no_full_access_to_cloudtrail_test.py | 29 ++-- .../iam_policy_no_full_access_to_kms_test.py | 29 ++-- ...am_role_administratoraccess_policy_test.py | 51 ++++--- ...ross_account_readonlyaccess_policy_test.py | 51 ++++--- ...service_confused_deputy_prevention_test.py | 73 +++++----- .../iam_root_hardware_mfa_enabled_test.py | 24 ++-- .../iam_root_mfa_enabled_test.py | 25 ++-- .../iam_rotate_access_key_90_days_test.py | 45 +++--- .../iam_securityaudit_role_created_test.py | 21 ++- .../aws/services/iam/iam_service_test.py | 100 ++++++------- .../iam_support_role_created_test.py | 25 ++-- .../iam_user_accesskey_unused_test.py | 45 +++--- .../iam_user_console_access_unused_test.py | 29 ++-- .../iam_user_hardware_mfa_enabled_test.py | 33 ++--- ...am_user_mfa_enabled_console_access_test.py | 41 +++--- ...m_user_no_setup_initial_access_key_test.py | 41 +++--- .../iam_user_two_active_access_key_test.py | 45 +++--- ...am_user_with_temporary_credentials_test.py | 5 +- .../inspector2_active_findings_exist_test.py | 52 +++---- .../inspector2_is_enabled_test.py | 26 ++-- .../inspector2/inspector2_service_test.py | 26 ++-- .../kms_cmk_are_used/kms_cmk_are_used_test.py | 37 +++-- .../kms_cmk_rotation_enabled_test.py | 29 ++-- .../kms_key_not_publicly_accessible_test.py | 37 +++-- .../aws/services/kms/kms_service_test.py | 36 ++--- .../macie_is_enabled/macie_is_enabled_test.py | 58 ++++---- .../aws/services/macie/macie_service_test.py | 19 ++- ...neptune_cluster_uses_public_subnet_test.py | 36 ++--- .../services/neptune/neptune_service_test.py | 30 ++-- .../networkfirewall_in_all_vpc_test.py | 79 +++++----- .../networkfirewall_service_test.py | 27 ++-- ...vice_domains_audit_logging_enabled_test.py | 5 +- ...domains_cloudwatch_logging_enabled_test.py | 5 +- ...domains_encryption_at_rest_enabled_test.py | 5 +- ...ains_https_communications_enforced_test.py | 5 +- ...ins_internal_user_database_enabled_test.py | 5 +- ...ns_node_to_node_encryption_enabled_test.py | 5 +- ...ce_domains_not_publicly_accessible_test.py | 5 +- ...he_latest_service_software_version_test.py | 5 +- ..._cognito_authentication_for_kibana_test.py | 5 +- .../opensearch/opensearch_service_test.py | 34 ++--- ...ions_account_part_of_organizations_test.py | 20 +-- ...nizations_delegated_administrators_test.py | 51 +++---- ...ganizations_scp_check_deny_regions_test.py | 56 ++++---- .../organizations_service_test.py | 17 +-- ...tags_policies_enabled_and_attached_test.py | 22 +-- .../rds_instance_backup_enabled_test.py | 28 ++-- .../rds_instance_deletion_protection_test.py | 44 +++--- ...instance_deprecated_engine_version_test.py | 28 ++-- ...stance_enhanced_monitoring_enabled_test.py | 28 ++-- ...stance_integration_cloudwatch_logs_test.py | 28 ++-- ...ance_minor_version_upgrade_enabled_test.py | 28 ++-- .../rds_instance_multi_az_test.py | 40 +++--- .../rds_instance_no_public_access_test.py | 48 +++---- .../rds_instance_storage_encrypted_test.py | 28 ++-- .../rds_instance_transport_encrypted_test.py | 36 ++--- .../aws/services/rds/rds_service_test.py | 44 +++--- .../rds_snapshots_public_access_test.py | 44 +++--- .../redshift_cluster_audit_logging_test.py | 5 +- ...edshift_cluster_automated_snapshot_test.py | 5 +- ...edshift_cluster_automatic_upgrades_test.py | 5 +- .../redshift_cluster_public_access_test.py | 5 +- .../redshift/redshift_service_test.py | 34 ++--- .../resourceexplorer2_indexes_found_test.py | 5 +- .../resourceexplorer2_service_test.py | 23 ++- ...e53_dangling_ip_subdomain_takeover_test.py | 85 ++++++----- ...domains_privacy_protection_enabled_test.py | 2 +- ...ute53_domains_transferlock_enabled_test.py | 2 +- ...d_zones_cloudwatch_logging_enabled_test.py | 5 +- .../services/route53/route53_service_test.py | 21 ++- .../route53/route53domains_service_test.py | 21 +-- ...account_level_public_access_blocks_test.py | 40 +++--- .../s3_bucket_acl_prohibited_test.py | 35 +++-- .../s3_bucket_default_encryption_test.py | 25 ++-- .../s3_bucket_kms_encryption_test.py | 53 ++++--- ...3_bucket_level_public_access_block_test.py | 60 ++++---- .../s3_bucket_no_mfa_delete_test.py | 33 ++--- .../s3_bucket_object_lock_test.py | 33 ++--- .../s3_bucket_object_versioning_test.py | 25 ++-- ..._bucket_policy_public_write_access_test.py | 74 +++++----- .../s3_bucket_public_access_test.py | 92 ++++++------ .../s3_bucket_public_list_acl_test.py | 118 +++++++-------- .../s3_bucket_public_write_acl_test.py | 118 +++++++-------- .../s3_bucket_secure_transport_policy_test.py | 35 +++-- ...cket_server_access_logging_enabled_test.py | 25 ++-- .../aws/services/s3/s3_service_test.py | 82 +++++------ ...r_models_network_isolation_enabled_test.py | 5 +- ...ker_models_vpc_settings_configured_test.py | 5 +- ...tebook_instance_encryption_enabled_test.py | 5 +- ...book_instance_root_access_disabled_test.py | 5 +- ...k_instance_vpc_settings_configured_test.py | 5 +- ..._direct_internet_access_configured_test.py | 5 +- .../sagemaker/sagemaker_service_test.py | 46 +++--- ..._intercontainer_encryption_enabled_test.py | 5 +- ...ing_jobs_network_isolation_enabled_test.py | 5 +- ...lume_and_output_encryption_enabled_test.py | 5 +- ...ining_jobs_vpc_settings_configured_test.py | 5 +- ...manager_automatic_rotation_enabled_test.py | 5 +- .../secretsmanager_service_test.py | 27 ++-- .../securityhub_enabled_test.py | 4 +- .../securityhub/securityhub_service_test.py | 17 +-- ...otection_in_associated_elastic_ips_test.py | 34 ++--- ...otection_in_classic_load_balancers_test.py | 28 ++-- ...ection_in_cloudfront_distributions_test.py | 5 +- ..._protection_in_global_accelerators_test.py | 5 +- ..._in_internet_facing_load_balancers_test.py | 41 +++--- ...protection_in_route53_hosted_zones_test.py | 2 +- .../services/shield/shield_service_test.py | 24 ++-- .../aws/services/sns/sns_service_test.py | 30 ++-- ...ics_kms_encryption_at_rest_enabled_test.py | 5 +- ...sns_topics_not_publicly_accessible_test.py | 5 +- ...sqs_queues_not_publicly_accessible_test.py | 5 +- ...ues_server_side_encryption_enabled_test.py | 5 +- .../aws/services/sqs/sqs_service_test.py | 34 ++--- .../ssm_document_secrets_test.py | 5 +- .../ssm_documents_set_as_public_test.py | 5 +- .../ssm_managed_compliant_patching_test.py | 5 +- .../aws/services/ssm/ssm_service_test.py | 20 +-- .../ssmincidents_enabled_with_plans_test.py | 5 +- .../ssmincidents/ssmincidents_service_test.py | 35 +++-- ...trustedadvisor_errors_and_warnings_test.py | 2 +- ...or_premium_support_plan_subscribed_test.py | 2 +- .../trustedadvisor_service_test.py | 21 ++- .../vpc_different_regions_test.py | 39 ++--- ...point_connections_trust_boundaries_test.py | 124 ++++++++-------- ...llowed_principals_trust_boundaries_test.py | 78 +++++----- .../vpc_flow_logs_enabled_test.py | 48 +++---- ...outing_tables_with_least_privilege_test.py | 37 +++-- .../aws/services/vpc/vpc_service_test.py | 48 +++---- .../vpc_subnet_different_az_test.py | 29 ++-- ...vpc_subnet_no_public_ip_by_default_test.py | 21 ++- ...vpc_subnet_separate_private_public_test.py | 29 ++-- .../aws/services/waf/waf_service_test.py | 31 ++-- .../aws/services/wafv2/wafv2_service_test.py | 25 ++-- .../wafv2_webacl_logging_enabled_test.py | 5 +- .../wellarchitected_service_test.py | 26 ++-- ...d_workload_no_high_or_medium_risks_test.py | 5 +- .../workspaces/workspaces_service_test.py | 27 ++-- ...rkspaces_volume_encryption_enabled_test.py | 5 +- ...s_vpc_2private_1public_subnets_nat_test.py | 44 +++--- .../aws/{audit_info_utils.py => utils.py} | 81 ++++++----- tests/providers/common/audit_info_test.py | 3 +- tests/providers/common/common_outputs_test.py | 34 ----- 362 files changed, 5690 insertions(+), 6022 deletions(-) delete mode 100644 prowler/providers/aws/lib/audit_info/audit_info.py rename tests/providers/aws/{audit_info_utils.py => utils.py} (59%) diff --git a/docs/tutorials/mutelist.md b/docs/tutorials/mutelist.md index bfdacc4095..bb8e586516 100644 --- a/docs/tutorials/mutelist.md +++ b/docs/tutorials/mutelist.md @@ -114,7 +114,7 @@ You will need to pass the S3 URI where your Mute List YAML file was uploaded to prowler aws -w s3:////mutelist.yaml ``` ???+ note - Make sure that the used AWS credentials have s3:GetObject permissions in the S3 path where the allowlist file is located. + Make sure that the used AWS credentials have `s3:GetObject` permissions in the S3 path where the mutelist file is located. ### AWS DynamoDB Table ARN diff --git a/poetry.lock b/poetry.lock index d733cca100..3d6357be74 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "about-time" @@ -2317,13 +2317,13 @@ test = ["pytest", "pytest-cov"] [[package]] name = "moto" -version = "5.0.2" +version = "5.0.3" description = "" optional = false python-versions = ">=3.8" files = [ - {file = "moto-5.0.2-py2.py3-none-any.whl", hash = "sha256:71bb832a18b64f10fc4cec117b9b0e2305e5831d9a17eb74f6b9819ed7613843"}, - {file = "moto-5.0.2.tar.gz", hash = "sha256:7e27395e5c63ff9554ae14b5baa41bfe6d6b1be0e59eb02977c6ce28411246de"}, + {file = "moto-5.0.3-py2.py3-none-any.whl", hash = "sha256:261d312d1d69c2afccb450a0566666d7b75d76ed6a7d00aac278a9633b073ff0"}, + {file = "moto-5.0.3.tar.gz", hash = "sha256:070ac2edf89ad7aee28534481ce68e2f344c8a6a8fefec5427eea0d599bfdbdb"}, ] [package.dependencies] @@ -4455,4 +4455,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.13" -content-hash = "bf0fbc4e6ba2ecc7f163a3a5048b60cce386dfbf603de925e405326413b7a268" +content-hash = "7afdc0cc5591b2c397142e9ba88d797d81980a8d3b05b24c8c0bcc60e7e20d9e" diff --git a/prowler/config/config.yaml b/prowler/config/config.yaml index 4483c5fd97..4383fc2c1b 100644 --- a/prowler/config/config.yaml +++ b/prowler/config/config.yaml @@ -1,10 +1,10 @@ # AWS Configuration aws: # AWS Global Configuration - # aws.allowlist_non_default_regions --> Set to True to allowlist failed findings in non-default regions for AccessAnalyzer, GuardDuty, SecurityHub, DRS and Config - allowlist_non_default_regions: False - # If you want to allowlist/mute failed findings only in specific regions, create a file with the following syntax and run it with `prowler aws -w allowlist.yaml`: - # Allowlist: + # aws.mute_non_default_regions --> Set to True to muted failed findings in non-default regions for AccessAnalyzer, GuardDuty, SecurityHub, DRS and Config + mute_non_default_regions: False + # If you want to mute failed findings only in specific regions, create a file with the following syntax and run it with `prowler aws -w mutelist.yaml`: + # Mutelist: # Accounts: # "*": # Checks: diff --git a/prowler/lib/outputs/models.py b/prowler/lib/outputs/models.py index 18288522d9..d6ef8363a8 100644 --- a/prowler/lib/outputs/models.py +++ b/prowler/lib/outputs/models.py @@ -6,6 +6,8 @@ from pydantic import BaseModel from prowler.config.config import prowler_version from prowler.lib.logger import logger +from prowler.lib.utils.utils import outputs_unix_timestamp +from prowler.providers.aws.models import AWSOrganizationsInfo def get_check_compliance(finding, provider_type, output_options) -> dict: diff --git a/prowler/providers/aws/aws_provider.py b/prowler/providers/aws/aws_provider.py index 3caf8cb636..9d91059644 100644 --- a/prowler/providers/aws/aws_provider.py +++ b/prowler/providers/aws/aws_provider.py @@ -225,9 +225,11 @@ class AwsProvider(Provider): self._ignore_unused_services = ignore_unused_services # Audit Config - self._audit_config = load_and_validate_config_file( - self._type, arguments.config_file - ) + self._audit_config = {} + if hasattr(arguments, "config_file"): + self._audit_config = load_and_validate_config_file( + self._type, arguments.config_file + ) @property def identity(self): diff --git a/prowler/providers/aws/lib/audit_info/audit_info.py b/prowler/providers/aws/lib/audit_info/audit_info.py deleted file mode 100644 index fe2aba2a30..0000000000 --- a/prowler/providers/aws/lib/audit_info/audit_info.py +++ /dev/null @@ -1,43 +0,0 @@ -from boto3 import session -from botocore.config import Config - -from prowler.providers.aws.config import BOTO3_USER_AGENT_EXTRA -from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info, AWSAssumeRole - -# Default Current Audit Info -current_audit_info = AWS_Audit_Info( - original_session=None, - audit_session=session.Session( - profile_name=None, - botocore_session=None, - ), - # Default standard retrier config - # https://boto3.amazonaws.com/v1/documentation/api/latest/guide/retries.html - session_config=Config( - retries={"max_attempts": 3, "mode": "standard"}, - user_agent_extra=BOTO3_USER_AGENT_EXTRA, - ), - audited_account=None, - audited_account_arn=None, - audited_user_id=None, - audited_partition=None, - audited_identity_arn=None, - profile=None, - profile_region=None, - credentials=None, - assumed_role_info=AWSAssumeRole( - role_arn=None, - session_duration=None, - external_id=None, - mfa_enabled=None, - role_session_name=None, - ), - mfa_enabled=None, - audit_resources=None, - audited_regions=None, - organizations_metadata=None, - audit_metadata=None, - audit_config=None, - ignore_unused_services=False, - enabled_regions=set(), -) diff --git a/prowler/providers/aws/lib/mutelist/mutelist.py b/prowler/providers/aws/lib/mutelist/mutelist.py index 7cd13e7177..76114db6c4 100644 --- a/prowler/providers/aws/lib/mutelist/mutelist.py +++ b/prowler/providers/aws/lib/mutelist/mutelist.py @@ -193,7 +193,7 @@ def is_muted_in_check( muted_regions = muted_check_info.get("Regions") muted_resources = muted_check_info.get("Resources") muted_tags = muted_check_info.get("Tags", "*") - # We need to set the allowlisted_tags if None, "" or [], so the falsy helps + # We need to set the muted_tags if None, "" or [], so the falsy helps if not muted_tags: muted_tags = "*" # If there is a *, it affects to all checks diff --git a/prowler/providers/aws/lib/quick_inventory/quick_inventory.py b/prowler/providers/aws/lib/quick_inventory/quick_inventory.py index 82471431d0..6bc15ea46f 100644 --- a/prowler/providers/aws/lib/quick_inventory/quick_inventory.py +++ b/prowler/providers/aws/lib/quick_inventory/quick_inventory.py @@ -15,10 +15,10 @@ from prowler.config.config import ( ) from prowler.lib.logger import logger from prowler.providers.aws.lib.arn.models import get_arn_resource_type -from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info from prowler.providers.aws.lib.s3.s3 import send_to_s3_bucket +# TODO(Audit_Info): use provider here def quick_inventory(audit_info: AWS_Audit_Info, args): resources = [] global_resources = [] @@ -209,6 +209,7 @@ def create_inventory_table(resources: list, resources_in_region: dict) -> dict: return inventory_table +# TODO(Audit_Info): use provider here def create_output(resources: list, audit_info: AWS_Audit_Info, args): json_output = [] # Check if custom output filename was input, if not, set the default @@ -302,6 +303,7 @@ def create_output(resources: list, audit_info: AWS_Audit_Info, args): ) +# TODO(Audit_Info): use provider here def get_regional_buckets(audit_info: AWS_Audit_Info, region: str) -> list: regional_buckets = [] s3_client = audit_info.audit_session.client("s3", region_name=region) diff --git a/prowler/providers/aws/lib/resource_api_tagging/resource_api_tagging.py b/prowler/providers/aws/lib/resource_api_tagging/resource_api_tagging.py index 66310c466f..3383b24a14 100644 --- a/prowler/providers/aws/lib/resource_api_tagging/resource_api_tagging.py +++ b/prowler/providers/aws/lib/resource_api_tagging/resource_api_tagging.py @@ -1,11 +1,10 @@ import sys from prowler.lib.logger import logger -from prowler.providers.aws.aws_provider import generate_regional_clients -from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info -def get_tagged_resources(input_resource_tags: list, current_audit_info: AWS_Audit_Info): +# TODO(aws): Remove from the provider or from here +def get_tagged_resources(input_resource_tags: list, provider): """ get_tagged_resources returns a list of the resources that are going to be scanned based on the given input tags """ @@ -17,8 +16,8 @@ def get_tagged_resources(input_resource_tags: list, current_audit_info: AWS_Audi value = tag.split("=")[1] resource_tags.append({"Key": key, "Values": [value]}) # Get Resources with resource_tags for all regions - for regional_client in generate_regional_clients( - "resourcegroupstaggingapi", current_audit_info + for regional_client in provider.generate_regional_clients( + "resourcegroupstaggingapi" ).values(): try: get_resources_paginator = regional_client.get_paginator("get_resources") diff --git a/prowler/providers/aws/services/globalaccelerator/globalaccelerator_service.py b/prowler/providers/aws/services/globalaccelerator/globalaccelerator_service.py index c394a3c095..2de3bc22a0 100644 --- a/prowler/providers/aws/services/globalaccelerator/globalaccelerator_service.py +++ b/prowler/providers/aws/services/globalaccelerator/globalaccelerator_service.py @@ -11,7 +11,7 @@ class GlobalAccelerator(AWSService): # Call AWSService's __init__ super().__init__(__class__.__name__, provider) self.accelerators = {} - if provider.audited_partition == "aws": + if self.audited_partition == "aws": # Global Accelerator is a global service that supports endpoints in multiple AWS Regions # but you must specify the US West (Oregon) Region to create, update, or otherwise work with accelerators. # That is, for example, specify --region us-west-2 on AWS CLI commands. diff --git a/prowler/providers/aws/services/trustedadvisor/trustedadvisor_service.py b/prowler/providers/aws/services/trustedadvisor/trustedadvisor_service.py index faf79db489..8a20c4b374 100644 --- a/prowler/providers/aws/services/trustedadvisor/trustedadvisor_service.py +++ b/prowler/providers/aws/services/trustedadvisor/trustedadvisor_service.py @@ -17,15 +17,13 @@ class TrustedAdvisor(AWSService): self.premium_support = PremiumSupport(enabled=False) # Support API is not available in China Partition # But only in us-east-1 or us-gov-west-1 https://docs.aws.amazon.com/general/latest/gr/awssupport.html - if provider.audited_partition != "aws-cn": - if provider.audited_partition == "aws": + if self.audited_partition != "aws-cn": + if self.audited_partition == "aws": support_region = "us-east-1" else: support_region = "us-gov-west-1" - self.client = provider.audit_session.client( - self.service, region_name=support_region - ) + self.client = self.session.client(self.service, region_name=support_region) self.client.region = support_region self.__describe_services__() if self.premium_support.enabled: diff --git a/pyproject.toml b/pyproject.toml index d45075d250..75684e78fb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -70,7 +70,7 @@ docker = "7.0.0" flake8 = "7.0.0" freezegun = "1.4.0" mock = "5.1.0" -moto = {extras = ["all"], version = "5.0.2"} +moto = {extras = ["all"], version = "5.0.3"} openapi-schema-validator = "0.6.2" openapi-spec-validator = "0.7.1" pylint = "3.1.0" diff --git a/tests/lib/check/check_test.py b/tests/lib/check/check_test.py index 8ccc6d1304..1728bfec0f 100644 --- a/tests/lib/check/check_test.py +++ b/tests/lib/check/check_test.py @@ -27,7 +27,7 @@ from prowler.providers.aws.aws_provider import ( get_checks_from_input_arn, get_regions_from_audit_resources, ) -from tests.providers.aws.audit_info_utils import set_mocked_aws_audit_info +from tests.providers.aws.utils import set_mocked_aws_audit_info AWS_ACCOUNT_NUMBER = "123456789012" AWS_REGION = "us-east-1" diff --git a/tests/lib/outputs/outputs_test.py b/tests/lib/outputs/outputs_test.py index 483c0378f7..ac62bf6525 100644 --- a/tests/lib/outputs/outputs_test.py +++ b/tests/lib/outputs/outputs_test.py @@ -62,7 +62,6 @@ from prowler.lib.outputs.models import ( ) from prowler.lib.outputs.outputs import extract_findings_statistics, set_report_color from prowler.lib.utils.utils import hash_sha512, open_file -from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info from prowler.providers.common.models import Audit_Metadata AWS_ACCOUNT_ID = "123456789012" @@ -72,6 +71,7 @@ class Test_Outputs: def test_fill_file_descriptors(self): audited_account = AWS_ACCOUNT_ID output_directory = f"{os.path.dirname(os.path.realpath(__file__))}" + # TODO(Audit_Info): use provider here audit_info = AWS_Audit_Info( session_config=None, original_session=None, diff --git a/tests/lib/outputs/slack_test.py b/tests/lib/outputs/slack_test.py index 03620da28e..850749d8e9 100644 --- a/tests/lib/outputs/slack_test.py +++ b/tests/lib/outputs/slack_test.py @@ -7,7 +7,6 @@ from prowler.lib.outputs.slack import ( create_message_identity, send_slack_message, ) -from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info from prowler.providers.azure.lib.audit_info.models import ( Azure_Audit_Info, AzureIdentityInfo, @@ -29,6 +28,7 @@ def mock_create_message_identity(*_): class Test_Slack_Integration: def test_create_message_identity(self): + # TODO(Audit_Info): use provider here aws_audit_info = AWS_Audit_Info( session_config=None, original_session=None, diff --git a/tests/providers/aws/aws_provider_test.py b/tests/providers/aws/aws_provider_test.py index db2038de97..4d9203198d 100644 --- a/tests/providers/aws/aws_provider_test.py +++ b/tests/providers/aws/aws_provider_test.py @@ -13,7 +13,7 @@ from prowler.providers.aws.aws_provider import ( get_global_region, ) from prowler.providers.aws.lib.audit_info.models import AWS_Assume_Role -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_CHINA_PARTITION, AWS_GOV_CLOUD_PARTITION, diff --git a/tests/providers/aws/lib/mutelist/mutelist_test.py b/tests/providers/aws/lib/mutelist/mutelist_test.py index 8aef3eb92a..f25c5268fa 100644 --- a/tests/providers/aws/lib/mutelist/mutelist_test.py +++ b/tests/providers/aws/lib/mutelist/mutelist_test.py @@ -13,7 +13,7 @@ from prowler.providers.aws.lib.mutelist.mutelist import ( mutelist_findings, parse_mutelist_file, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_CENTRAL_1, AWS_REGION_EU_SOUTH_3, @@ -23,7 +23,7 @@ from tests.providers.aws.audit_info_utils import ( ) -class Test_Allowlist: +class TestMutelist: # Test S3 mutelist @mock_aws def test_s3_mutelist(self): @@ -40,7 +40,9 @@ class Test_Allowlist: with open("tests/providers/aws/lib/mutelist/fixtures/mutelist.yaml") as f: assert yaml.safe_load(f)["Mute List"] == parse_mutelist_file( - audit_info, "s3://test-mutelist/mutelist.yaml" + audit_info.session.current_session, + audit_info.identity.account, + "s3://test-mutelist/mutelist.yaml", ) # Test DynamoDB mutelist @@ -78,7 +80,8 @@ class Test_Allowlist: assert ( "keyword" in parse_mutelist_file( - audit_info, + audit_info.session.current_session, + audit_info.identity.account, "arn:aws:dynamodb:" + AWS_REGION_US_EAST_1 + ":" @@ -123,7 +126,8 @@ class Test_Allowlist: assert ( "environment=dev" in parse_mutelist_file( - audit_info, + audit_info.session.current_session, + audit_info.identity.account, "arn:aws:dynamodb:" + AWS_REGION_US_EAST_1 + ":" @@ -133,9 +137,8 @@ class Test_Allowlist: )["Accounts"]["*"]["Checks"]["*"]["Tags"] ) - # Allowlist tests def test_mutelist_findings_only_wildcard(self): - # Allowlist example + mutelist = { "Accounts": { "*": { @@ -166,7 +169,7 @@ class Test_Allowlist: assert muted_findings[0].status == "MUTED" def test_mutelist_all_exceptions_empty(self): - # Allowlist example + mutelist = { "Accounts": { "*": { @@ -201,7 +204,7 @@ class Test_Allowlist: muted_findings = mutelist_findings(mutelist, AWS_ACCOUNT_NUMBER, check_findings) assert len(muted_findings) == 1 - assert muted_findings[0].status == "WARNING" + assert muted_findings[0].status == "MUTED" def test_is_muted_with_everything_excepted(self): mutelist = { @@ -291,7 +294,7 @@ class Test_Allowlist: ) def test_is_muted(self): - # Allowlist example + mutelist = { "Accounts": { "*": { @@ -509,7 +512,7 @@ class Test_Allowlist: ) def test_is_muted_all_and_single_account_with_different_resources(self): - # Allowlist example + mutelist = { "Accounts": { "*": { @@ -579,7 +582,7 @@ class Test_Allowlist: def test_is_muted_all_and_single_account_with_different_resources_and_exceptions( self, ): - # Allowlist example + mutelist = { "Accounts": { "*": { @@ -931,7 +934,7 @@ class Test_Allowlist: ) def test_is_muted_specific_account_with_other_account_excepted(self): - # Allowlist example + mutelist = { "Accounts": { AWS_ACCOUNT_NUMBER: { @@ -966,7 +969,7 @@ class Test_Allowlist: ) def test_is_muted_complex_mutelist(self): - # Allowlist example + mutelist = { "Accounts": { "*": { @@ -1110,7 +1113,7 @@ class Test_Allowlist: ) def test_is_excepted_only_in_account(self): - # Allowlist example + exceptions = { "Accounts": [AWS_ACCOUNT_NUMBER], "Regions": [], @@ -1127,7 +1130,7 @@ class Test_Allowlist: ) def test_is_excepted_only_in_region(self): - # Allowlist example + exceptions = { "Accounts": [], "Regions": [AWS_REGION_EU_CENTRAL_1, AWS_REGION_EU_SOUTH_3], @@ -1144,7 +1147,7 @@ class Test_Allowlist: ) def test_is_excepted_only_in_resources(self): - # Allowlist example + exceptions = { "Accounts": [], "Regions": [], @@ -1161,7 +1164,7 @@ class Test_Allowlist: ) def test_is_excepted_only_in_tags(self): - # Allowlist example + exceptions = { "Accounts": [], "Regions": [], @@ -1178,7 +1181,7 @@ class Test_Allowlist: ) def test_is_excepted_in_account_and_tags(self): - # Allowlist example + exceptions = { "Accounts": [AWS_ACCOUNT_NUMBER], "Regions": [], diff --git a/tests/providers/aws/lib/organizations/organizations_test.py b/tests/providers/aws/lib/organizations/organizations_test.py index 5a5fefe4f8..b7274d72d6 100644 --- a/tests/providers/aws/lib/organizations/organizations_test.py +++ b/tests/providers/aws/lib/organizations/organizations_test.py @@ -8,10 +8,7 @@ from prowler.providers.aws.lib.organizations.organizations import ( get_organizations_metadata, parse_organizations_metadata, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_US_EAST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1 class Test_AWS_Organizations: diff --git a/tests/providers/aws/lib/s3/s3_test.py b/tests/providers/aws/lib/s3/s3_test.py index 454d83a256..ef34655a6f 100644 --- a/tests/providers/aws/lib/s3/s3_test.py +++ b/tests/providers/aws/lib/s3/s3_test.py @@ -28,7 +28,7 @@ class TestS3: # Create mock session audit_info.audit_session = boto3.session.Session(region_name=AWS_REGION) - audit_info.audited_account = AWS_ACCOUNT_ID + audit_info.identity.account = AWS_ACCOUNT_ID # Create mock bucket client = audit_info.audit_session.client("s3") @@ -36,7 +36,7 @@ class TestS3: # Mocked CSV output file output_directory = f"{ACTUAL_DIRECTORY}/{FIXTURES_DIR_NAME}" - filename = f"prowler-output-{audit_info.audited_account}" + filename = f"prowler-output-{audit_info.identity.account}" # Send mock CSV file to mock S3 Bucket send_to_s3_bucket( @@ -67,7 +67,7 @@ class TestS3: # Create mock session audit_info.audit_session = boto3.session.Session(region_name=AWS_REGION) - audit_info.audited_account = AWS_ACCOUNT_ID + audit_info.identity.account = AWS_ACCOUNT_ID # Create mock bucket client = audit_info.audit_session.client("s3") @@ -75,7 +75,7 @@ class TestS3: # Mocked CSV output file output_directory = f"{ACTUAL_DIRECTORY}/{FIXTURES_DIR_NAME}" - filename = f"prowler-output-{audit_info.audited_account}" + filename = f"prowler-output-{audit_info.identity.account}" # Send mock CSV file to mock S3 Bucket send_to_s3_bucket( diff --git a/tests/providers/aws/lib/security_hub/security_hub_test.py b/tests/providers/aws/lib/security_hub/security_hub_test.py index c4e47b21a4..0fe9b095f7 100644 --- a/tests/providers/aws/lib/security_hub/security_hub_test.py +++ b/tests/providers/aws/lib/security_hub/security_hub_test.py @@ -8,14 +8,12 @@ from mock import MagicMock, patch from prowler.config.config import prowler_version, timestamp_utc from prowler.lib.check.models import Check_Report, load_check_metadata - -# from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info from prowler.providers.aws.lib.security_hub.security_hub import ( batch_send_to_security_hub, prepare_security_hub_findings, verify_security_hub_integration_enabled_per_region, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_COMMERCIAL_PARTITION, AWS_REGION_EU_WEST_1, diff --git a/tests/providers/aws/lib/service/service_test.py b/tests/providers/aws/lib/service/service_test.py index 3ef56e745d..37cb17763d 100644 --- a/tests/providers/aws/lib/service/service_test.py +++ b/tests/providers/aws/lib/service/service_test.py @@ -1,7 +1,7 @@ from mock import patch from prowler.providers.aws.lib.service.service import AWSService -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_COMMERCIAL_PARTITION, @@ -10,8 +10,8 @@ from tests.providers.aws.audit_info_utils import ( ) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -19,22 +19,22 @@ def mock_generate_regional_clients(service, audit_info): @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_AWSService: def test_AWSService_init(self): service_name = "s3" - audit_info = set_mocked_aws_audit_info() - service = AWSService(service_name, audit_info) + provider = set_mocked_aws_audit_info() + service = AWSService(service_name, provider) - assert service.audit_info == audit_info + assert service.provider == provider assert service.audited_account == AWS_ACCOUNT_NUMBER assert service.audited_account_arn == AWS_ACCOUNT_ARN assert service.audited_partition == AWS_COMMERCIAL_PARTITION assert service.audit_resources == [] assert service.audited_checks == [] - assert service.session == audit_info.audit_session + assert service.session == provider.session.current_session assert service.service == service_name assert len(service.regional_clients) == 1 assert ( @@ -46,16 +46,16 @@ class Test_AWSService: def test_AWSService_init_global_service(self): service_name = "cloudfront" - audit_info = set_mocked_aws_audit_info() - service = AWSService(service_name, audit_info, global_service=True) + provider = set_mocked_aws_audit_info() + service = AWSService(service_name, provider, global_service=True) - assert service.audit_info == audit_info + assert service.provider == provider assert service.audited_account == AWS_ACCOUNT_NUMBER assert service.audited_account_arn == AWS_ACCOUNT_ARN assert service.audited_partition == AWS_COMMERCIAL_PARTITION assert service.audit_resources == [] assert service.audited_checks == [] - assert service.session == audit_info.audit_session + assert service.session == provider.session.current_session assert service.service == service_name assert not hasattr(service, "regional_clients") assert service.region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/accessanalyzer/accessanalyzer_service_test.py b/tests/providers/aws/services/accessanalyzer/accessanalyzer_service_test.py index ac7ae7fa13..bbbf43bcff 100644 --- a/tests/providers/aws/services/accessanalyzer/accessanalyzer_service_test.py +++ b/tests/providers/aws/services/accessanalyzer/accessanalyzer_service_test.py @@ -5,10 +5,10 @@ import botocore from prowler.providers.aws.services.accessanalyzer.accessanalyzer_service import ( AccessAnalyzer, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking Access Analyzer Calls @@ -54,8 +54,8 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -65,14 +65,14 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_AccessAnalyzer_Service: # Test AccessAnalyzer Client def test__get_client__(self): access_analyzer = AccessAnalyzer( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert ( access_analyzer.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ @@ -82,20 +82,20 @@ class Test_AccessAnalyzer_Service: # Test AccessAnalyzer Session def test__get_session__(self): access_analyzer = AccessAnalyzer( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert access_analyzer.session.__class__.__name__ == "Session" # Test AccessAnalyzer Service def test__get_service__(self): access_analyzer = AccessAnalyzer( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert access_analyzer.service == "accessanalyzer" def test__list_analyzers__(self): access_analyzer = AccessAnalyzer( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert len(access_analyzer.analyzers) == 1 assert access_analyzer.analyzers[0].arn == "ARN" @@ -107,7 +107,7 @@ class Test_AccessAnalyzer_Service: def test__list_findings__(self): access_analyzer = AccessAnalyzer( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert len(access_analyzer.analyzers) == 1 assert len(access_analyzer.analyzers[0].findings) == 1 diff --git a/tests/providers/aws/services/account/account_service_test.py b/tests/providers/aws/services/account/account_service_test.py index a7a7018c67..484a1f57ad 100644 --- a/tests/providers/aws/services/account/account_service_test.py +++ b/tests/providers/aws/services/account/account_service_test.py @@ -2,10 +2,7 @@ import botocore from mock import patch from prowler.providers.aws.services.account.account_service import Account, Contact -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, set_mocked_aws_provider # Mocking Access Analyzer Calls make_api_call = botocore.client.BaseClient._make_api_call @@ -55,33 +52,33 @@ def mock_make_api_call(self, operation_name, kwargs): class Test_Account_Service: # Test Account Service def test_service(self): - audit_info = set_mocked_aws_audit_info() - account = Account(audit_info) + aws_provider = set_mocked_aws_provider() + account = Account(aws_provider) assert account.service == "account" # Test Account Client def test_client(self): - audit_info = set_mocked_aws_audit_info() - account = Account(audit_info) + aws_provider = set_mocked_aws_provider() + account = Account(aws_provider) assert account.client.__class__.__name__ == "Account" # Test Account Session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info() - account = Account(audit_info) + aws_provider = set_mocked_aws_provider() + account = Account(aws_provider) assert account.session.__class__.__name__ == "Session" # Test Account Session def test_audited_account(self): - audit_info = set_mocked_aws_audit_info() - account = Account(audit_info) + aws_provider = set_mocked_aws_provider() + account = Account(aws_provider) assert account.audited_account == AWS_ACCOUNT_NUMBER # Test Account Get Account Contacts def test_get_account_contacts(self): # Account client for this test class - audit_info = set_mocked_aws_audit_info() - account = Account(audit_info) + aws_provider = set_mocked_aws_provider() + account = Account(aws_provider) assert account.number_of_contacts == 4 assert account.contact_base == Contact( type="PRIMARY", diff --git a/tests/providers/aws/services/acm/acm_service_test.py b/tests/providers/aws/services/acm/acm_service_test.py index 5806b1aa84..1ba8f6f928 100644 --- a/tests/providers/aws/services/acm/acm_service_test.py +++ b/tests/providers/aws/services/acm/acm_service_test.py @@ -6,10 +6,10 @@ from freezegun import freeze_time from mock import patch from prowler.providers.aws.services.acm.acm_service import ACM -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking Access Analyzer Calls @@ -74,8 +74,8 @@ def mock_make_api_call(self, operation_name, kwargs): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -84,7 +84,7 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @@ -96,16 +96,16 @@ class Test_ACM_Service: # @mock_acm def test_service(self): # ACM client for this test class - audit_info = set_mocked_aws_audit_info() - acm = ACM(audit_info) + aws_provider = set_mocked_aws_provider() + acm = ACM(aws_provider) assert acm.service == "acm" # Test ACM Client # @mock_acm def test_client(self): # ACM client for this test class - audit_info = set_mocked_aws_audit_info() - acm = ACM(audit_info) + aws_provider = set_mocked_aws_provider() + acm = ACM(aws_provider) for regional_client in acm.regional_clients.values(): assert regional_client.__class__.__name__ == "ACM" @@ -113,16 +113,16 @@ class Test_ACM_Service: # @mock_acm def test__get_session__(self): # ACM client for this test class - audit_info = set_mocked_aws_audit_info() - acm = ACM(audit_info) + aws_provider = set_mocked_aws_provider() + acm = ACM(aws_provider) assert acm.session.__class__.__name__ == "Session" # Test ACM Session # @mock_acm def test_audited_account(self): # ACM client for this test class - audit_info = set_mocked_aws_audit_info() - acm = ACM(audit_info) + aws_provider = set_mocked_aws_provider() + acm = ACM(aws_provider) assert acm.audited_account == AWS_ACCOUNT_NUMBER # Test ACM List Certificates @@ -136,8 +136,8 @@ class Test_ACM_Service: # ) # ACM client for this test class - audit_info = set_mocked_aws_audit_info() - acm = ACM(audit_info) + aws_provider = set_mocked_aws_provider() + acm = ACM(aws_provider) assert len(acm.certificates) == 1 assert acm.certificates[0].arn == certificate_arn assert acm.certificates[0].name == certificate_name @@ -157,8 +157,8 @@ class Test_ACM_Service: # ) # ACM client for this test class - audit_info = set_mocked_aws_audit_info() - acm = ACM(audit_info) + aws_provider = set_mocked_aws_provider() + acm = ACM(aws_provider) assert len(acm.certificates) == 1 assert acm.certificates[0].tags == [ {"Key": "test", "Value": "test"}, diff --git a/tests/providers/aws/services/apigateway/apigateway_authorizers_enabled/apigateway_authorizers_enabled_test.py b/tests/providers/aws/services/apigateway/apigateway_authorizers_enabled/apigateway_authorizers_enabled_test.py index 402c75f84e..3e2ebce3dc 100644 --- a/tests/providers/aws/services/apigateway/apigateway_authorizers_enabled/apigateway_authorizers_enabled_test.py +++ b/tests/providers/aws/services/apigateway/apigateway_authorizers_enabled/apigateway_authorizers_enabled_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -18,16 +18,16 @@ class Test_apigateway_restapi_authorizers_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import ( @@ -72,16 +72,16 @@ class Test_apigateway_restapi_authorizers_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import ( @@ -100,7 +100,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] @@ -117,16 +117,16 @@ class Test_apigateway_restapi_authorizers_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import ( @@ -145,7 +145,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] @@ -178,16 +178,16 @@ class Test_apigateway_restapi_authorizers_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import ( @@ -206,7 +206,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] @@ -239,16 +239,16 @@ class Test_apigateway_restapi_authorizers_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import ( @@ -267,7 +267,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] @@ -307,16 +307,16 @@ class Test_apigateway_restapi_authorizers_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import ( @@ -335,7 +335,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] @@ -377,16 +377,16 @@ class Test_apigateway_restapi_authorizers_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import ( @@ -405,7 +405,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] @@ -437,16 +437,16 @@ class Test_apigateway_restapi_authorizers_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_authorizers_enabled.apigateway_restapi_authorizers_enabled import ( @@ -465,7 +465,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] diff --git a/tests/providers/aws/services/apigateway/apigateway_client_certificate_enabled/apigateway_client_certificate_enabled_test.py b/tests/providers/aws/services/apigateway/apigateway_client_certificate_enabled/apigateway_client_certificate_enabled_test.py index 8b16ed6281..c6a45bbd22 100644 --- a/tests/providers/aws/services/apigateway/apigateway_client_certificate_enabled/apigateway_client_certificate_enabled_test.py +++ b/tests/providers/aws/services/apigateway/apigateway_client_certificate_enabled/apigateway_client_certificate_enabled_test.py @@ -4,10 +4,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.apigateway.apigateway_service import Stage -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -24,16 +24,16 @@ class Test_apigateway_restapi_client_certificate_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_client_certificate_enabled.apigateway_restapi_client_certificate_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_client_certificate_enabled.apigateway_restapi_client_certificate_enabled import ( @@ -84,16 +84,16 @@ class Test_apigateway_restapi_client_certificate_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_client_certificate_enabled.apigateway_restapi_client_certificate_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_client_certificate_enabled.apigateway_restapi_client_certificate_enabled import ( @@ -112,7 +112,7 @@ class Test_apigateway_restapi_client_certificate_enabled: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [None] @@ -129,16 +129,16 @@ class Test_apigateway_restapi_client_certificate_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_client_certificate_enabled.apigateway_restapi_client_certificate_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ) as service_client: # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_client_certificate_enabled.apigateway_restapi_client_certificate_enabled import ( @@ -148,7 +148,7 @@ class Test_apigateway_restapi_client_certificate_enabled: service_client.rest_apis[0].stages.append( Stage( name="test", - arn=f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/test-rest-api/stages/test", + arn=f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/test-rest-api/stages/test", logging=True, client_certificate=True, waf=True, @@ -167,7 +167,7 @@ class Test_apigateway_restapi_client_certificate_enabled: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/test-rest-api/stages/test" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/test-rest-api/stages/test" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] diff --git a/tests/providers/aws/services/apigateway/apigateway_endpoint_public/apigateway_endpoint_public_test.py b/tests/providers/aws/services/apigateway/apigateway_endpoint_public/apigateway_endpoint_public_test.py index 2d8197ff6c..e08e69c9da 100644 --- a/tests/providers/aws/services/apigateway/apigateway_endpoint_public/apigateway_endpoint_public_test.py +++ b/tests/providers/aws/services/apigateway/apigateway_endpoint_public/apigateway_endpoint_public_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -17,16 +17,16 @@ class Test_apigateway_restapi_public: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_public.apigateway_restapi_public.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_public.apigateway_restapi_public import ( @@ -55,16 +55,16 @@ class Test_apigateway_restapi_public: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_public.apigateway_restapi_public.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_public.apigateway_restapi_public import ( @@ -83,7 +83,7 @@ class Test_apigateway_restapi_public: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] @@ -105,16 +105,16 @@ class Test_apigateway_restapi_public: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_public.apigateway_restapi_public.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_public.apigateway_restapi_public import ( @@ -133,7 +133,7 @@ class Test_apigateway_restapi_public: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] diff --git a/tests/providers/aws/services/apigateway/apigateway_endpoint_public_without_authorizer/apigateway_endpoint_public_without_authorizer_test.py b/tests/providers/aws/services/apigateway/apigateway_endpoint_public_without_authorizer/apigateway_endpoint_public_without_authorizer_test.py index f68469c96b..e46291036f 100644 --- a/tests/providers/aws/services/apigateway/apigateway_endpoint_public_without_authorizer/apigateway_endpoint_public_without_authorizer_test.py +++ b/tests/providers/aws/services/apigateway/apigateway_endpoint_public_without_authorizer/apigateway_endpoint_public_without_authorizer_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) API_GW_NAME = "test-rest-api" @@ -19,16 +19,16 @@ class Test_apigateway_restapi_public_with_authorizer: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_public_with_authorizer.apigateway_restapi_public_with_authorizer.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_public_with_authorizer.apigateway_restapi_public_with_authorizer import ( @@ -57,16 +57,16 @@ class Test_apigateway_restapi_public_with_authorizer: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_public_with_authorizer.apigateway_restapi_public_with_authorizer.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_public_with_authorizer.apigateway_restapi_public_with_authorizer import ( @@ -85,7 +85,7 @@ class Test_apigateway_restapi_public_with_authorizer: assert result[0].resource_id == API_GW_NAME assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] @@ -110,16 +110,16 @@ class Test_apigateway_restapi_public_with_authorizer: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_public_with_authorizer.apigateway_restapi_public_with_authorizer.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_public_with_authorizer.apigateway_restapi_public_with_authorizer import ( @@ -138,7 +138,7 @@ class Test_apigateway_restapi_public_with_authorizer: assert result[0].resource_id == API_GW_NAME assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] diff --git a/tests/providers/aws/services/apigateway/apigateway_logging_enabled/apigateway_logging_enabled_test.py b/tests/providers/aws/services/apigateway/apigateway_logging_enabled/apigateway_logging_enabled_test.py index 8c84a5b623..d587ad8bfe 100644 --- a/tests/providers/aws/services/apigateway/apigateway_logging_enabled/apigateway_logging_enabled_test.py +++ b/tests/providers/aws/services/apigateway/apigateway_logging_enabled/apigateway_logging_enabled_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -17,16 +17,16 @@ class Test_apigateway_restapi_logging_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_logging_enabled.apigateway_restapi_logging_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_logging_enabled.apigateway_restapi_logging_enabled import ( @@ -87,16 +87,16 @@ class Test_apigateway_restapi_logging_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_logging_enabled.apigateway_restapi_logging_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_logging_enabled.apigateway_restapi_logging_enabled import ( @@ -115,7 +115,7 @@ class Test_apigateway_restapi_logging_enabled: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [None] @@ -160,16 +160,16 @@ class Test_apigateway_restapi_logging_enabled: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_logging_enabled.apigateway_restapi_logging_enabled.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_logging_enabled.apigateway_restapi_logging_enabled import ( @@ -188,7 +188,7 @@ class Test_apigateway_restapi_logging_enabled: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [None] diff --git a/tests/providers/aws/services/apigateway/apigateway_service_test.py b/tests/providers/aws/services/apigateway/apigateway_service_test.py index e4156f95f8..b2f35190de 100644 --- a/tests/providers/aws/services/apigateway/apigateway_service_test.py +++ b/tests/providers/aws/services/apigateway/apigateway_service_test.py @@ -2,10 +2,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.apigateway.apigateway_service import APIGateway -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -14,16 +14,16 @@ class Test_APIGateway_Service: @mock_aws def test_service(self): # APIGateway client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigateway = APIGateway(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigateway = APIGateway(aws_provider) assert apigateway.service == "apigateway" # Test APIGateway Client @mock_aws def test_client(self): # APIGateway client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigateway = APIGateway(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigateway = APIGateway(aws_provider) for regional_client in apigateway.regional_clients.values(): assert regional_client.__class__.__name__ == "APIGateway" @@ -31,16 +31,16 @@ class Test_APIGateway_Service: @mock_aws def test__get_session__(self): # APIGateway client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigateway = APIGateway(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigateway = APIGateway(aws_provider) assert apigateway.session.__class__.__name__ == "Session" # Test APIGateway Session @mock_aws def test_audited_account(self): # APIGateway client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigateway = APIGateway(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigateway = APIGateway(aws_provider) assert apigateway.audited_account == AWS_ACCOUNT_NUMBER # Test APIGateway Get Rest APIs @@ -53,8 +53,8 @@ class Test_APIGateway_Service: name="test-rest-api", ) # APIGateway client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigateway = APIGateway(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigateway = APIGateway(aws_provider) assert len(apigateway.rest_apis) == len( apigateway_client.get_rest_apis()["items"] ) @@ -75,8 +75,8 @@ class Test_APIGateway_Service: type="TOKEN", ) # APIGateway client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigateway = APIGateway(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigateway = APIGateway(aws_provider) assert apigateway.rest_apis[0].authorizer is True # Test APIGateway Get Rest API @@ -91,8 +91,8 @@ class Test_APIGateway_Service: tags={"test": "test"}, ) # APIGateway client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigateway = APIGateway(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigateway = APIGateway(aws_provider) assert apigateway.rest_apis[0].public_endpoint is False assert apigateway.rest_apis[0].tags == [{"test": "test"}] @@ -143,8 +143,8 @@ class Test_APIGateway_Service: }, ], ) - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigateway = APIGateway(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigateway = APIGateway(aws_provider) assert apigateway.rest_apis[0].stages[0].logging is True # Test APIGateway __get_resources__ @@ -178,8 +178,8 @@ class Test_APIGateway_Service: authorizationType="AWS_IAM", ) - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigateway = APIGateway(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigateway = APIGateway(aws_provider) # we skip OPTIONS methods assert list(apigateway.rest_apis[0].resources[1].resource_methods.keys()) == [ diff --git a/tests/providers/aws/services/apigateway/apigateway_waf_acl_attached/apigateway_waf_acl_attached_test.py b/tests/providers/aws/services/apigateway/apigateway_waf_acl_attached/apigateway_waf_acl_attached_test.py index 8e037ec5cd..b7e2751927 100644 --- a/tests/providers/aws/services/apigateway/apigateway_waf_acl_attached/apigateway_waf_acl_attached_test.py +++ b/tests/providers/aws/services/apigateway/apigateway_waf_acl_attached/apigateway_waf_acl_attached_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -17,16 +17,16 @@ class Test_apigateway_restapi_waf_acl_attached: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_waf_acl_attached.apigateway_restapi_waf_acl_attached.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_waf_acl_attached.apigateway_restapi_waf_acl_attached import ( @@ -92,16 +92,16 @@ class Test_apigateway_restapi_waf_acl_attached: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_waf_acl_attached.apigateway_restapi_waf_acl_attached.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_waf_acl_attached.apigateway_restapi_waf_acl_attached import ( @@ -120,7 +120,7 @@ class Test_apigateway_restapi_waf_acl_attached: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [None] @@ -165,16 +165,16 @@ class Test_apigateway_restapi_waf_acl_attached: APIGateway, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigateway.apigateway_restapi_waf_acl_attached.apigateway_restapi_waf_acl_attached.apigateway_client", - new=APIGateway(current_audit_info), + new=APIGateway(aws_provider), ): # Test Check from prowler.providers.aws.services.apigateway.apigateway_restapi_waf_acl_attached.apigateway_restapi_waf_acl_attached import ( @@ -193,7 +193,7 @@ class Test_apigateway_restapi_waf_acl_attached: assert result[0].resource_id == "test-rest-api" assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test" + == f"arn:{aws_provider.identity.partition}:apigateway:{AWS_REGION_US_EAST_1}::/restapis/{rest_api['id']}/stages/test" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [None] diff --git a/tests/providers/aws/services/apigatewayv2/apigatewayv2_access_logging_enabled/apigatewayv2_access_logging_enabled_test.py b/tests/providers/aws/services/apigatewayv2/apigatewayv2_access_logging_enabled/apigatewayv2_access_logging_enabled_test.py index 8b0f74aace..921f4f606c 100644 --- a/tests/providers/aws/services/apigatewayv2/apigatewayv2_access_logging_enabled/apigatewayv2_access_logging_enabled_test.py +++ b/tests/providers/aws/services/apigatewayv2/apigatewayv2_access_logging_enabled/apigatewayv2_access_logging_enabled_test.py @@ -5,10 +5,7 @@ from boto3 import client from mock import patch from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider # Mocking ApiGatewayV2 Calls make_api_call = botocore.client.BaseClient._make_api_call @@ -45,16 +42,14 @@ class Test_apigatewayv2_api_access_logging_enabled: ApiGatewayV2, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( - [AWS_REGION_US_EAST_1] - ) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_access_logging_enabled.apigatewayv2_api_access_logging_enabled.apigatewayv2_client", - new=ApiGatewayV2(current_audit_info), + new=ApiGatewayV2(aws_provider), ): # Test Check from prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_access_logging_enabled.apigatewayv2_api_access_logging_enabled import ( @@ -78,16 +73,14 @@ class Test_apigatewayv2_api_access_logging_enabled: ApiGatewayV2, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( - [AWS_REGION_US_EAST_1] - ) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_access_logging_enabled.apigatewayv2_api_access_logging_enabled.apigatewayv2_client", - new=ApiGatewayV2(current_audit_info), + new=ApiGatewayV2(aws_provider), ): # Test Check from prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_access_logging_enabled.apigatewayv2_api_access_logging_enabled import ( diff --git a/tests/providers/aws/services/apigatewayv2/apigatewayv2_authorizers_enabled/apigatewayv2_authorizers_enabled_test.py b/tests/providers/aws/services/apigatewayv2/apigatewayv2_authorizers_enabled/apigatewayv2_authorizers_enabled_test.py index 8196c21838..e39fa56820 100644 --- a/tests/providers/aws/services/apigatewayv2/apigatewayv2_authorizers_enabled/apigatewayv2_authorizers_enabled_test.py +++ b/tests/providers/aws/services/apigatewayv2/apigatewayv2_authorizers_enabled/apigatewayv2_authorizers_enabled_test.py @@ -5,10 +5,7 @@ from boto3 import client from mock import patch from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider # Mocking ApiGatewayV2 Calls make_api_call = botocore.client.BaseClient._make_api_call @@ -45,16 +42,14 @@ class Test_apigatewayv2_api_authorizers_enabled: ApiGatewayV2, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( - [AWS_REGION_US_EAST_1] - ) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_authorizers_enabled.apigatewayv2_api_authorizers_enabled.apigatewayv2_client", - new=ApiGatewayV2(current_audit_info), + new=ApiGatewayV2(aws_provider), ): # Test Check from prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_authorizers_enabled.apigatewayv2_api_authorizers_enabled import ( @@ -83,16 +78,14 @@ class Test_apigatewayv2_api_authorizers_enabled: ApiGatewayV2, ) - current_audit_info = current_audit_info = set_mocked_aws_audit_info( - [AWS_REGION_US_EAST_1] - ) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_authorizers_enabled.apigatewayv2_api_authorizers_enabled.apigatewayv2_client", - new=ApiGatewayV2(current_audit_info), + new=ApiGatewayV2(aws_provider), ): # Test Check from prowler.providers.aws.services.apigatewayv2.apigatewayv2_api_authorizers_enabled.apigatewayv2_api_authorizers_enabled import ( diff --git a/tests/providers/aws/services/apigatewayv2/apigatewayv2_service_test.py b/tests/providers/aws/services/apigatewayv2/apigatewayv2_service_test.py index 67234e28f6..729439316d 100644 --- a/tests/providers/aws/services/apigatewayv2/apigatewayv2_service_test.py +++ b/tests/providers/aws/services/apigatewayv2/apigatewayv2_service_test.py @@ -6,10 +6,10 @@ from moto import mock_aws from prowler.providers.aws.services.apigatewayv2.apigatewayv2_service import ( ApiGatewayV2, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking ApiGatewayV2 Calls @@ -45,16 +45,16 @@ class Test_ApiGatewayV2_Service: @mock_aws def test_service(self): # ApiGatewayV2 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigatewayv2 = ApiGatewayV2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigatewayv2 = ApiGatewayV2(aws_provider) assert apigatewayv2.service == "apigatewayv2" # Test ApiGatewayV2 Client @mock_aws def test_client(self): # ApiGatewayV2 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigatewayv2 = ApiGatewayV2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigatewayv2 = ApiGatewayV2(aws_provider) for regional_client in apigatewayv2.regional_clients.values(): assert regional_client.__class__.__name__ == "ApiGatewayV2" @@ -62,16 +62,16 @@ class Test_ApiGatewayV2_Service: @mock_aws def test__get_session__(self): # ApiGatewayV2 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigatewayv2 = ApiGatewayV2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigatewayv2 = ApiGatewayV2(aws_provider) assert apigatewayv2.session.__class__.__name__ == "Session" # Test ApiGatewayV2 Session @mock_aws def test_audited_account(self): # ApiGatewayV2 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigatewayv2 = ApiGatewayV2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigatewayv2 = ApiGatewayV2(aws_provider) assert apigatewayv2.audited_account == AWS_ACCOUNT_NUMBER # Test ApiGatewayV2 Get APIs @@ -84,8 +84,8 @@ class Test_ApiGatewayV2_Service: Name="test-api", ProtocolType="HTTP", Tags={"test": "test"} ) # ApiGatewayV2 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigatewayv2 = ApiGatewayV2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigatewayv2 = ApiGatewayV2(aws_provider) assert len(apigatewayv2.apis) == len(apigatewayv2_client.get_apis()["Items"]) assert apigatewayv2.apis[0].tags == [{"test": "test"}] @@ -105,8 +105,8 @@ class Test_ApiGatewayV2_Service: AuthorizerPayloadFormatVersion="2.0", ) # ApiGatewayV2 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigatewayv2 = ApiGatewayV2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigatewayv2 = ApiGatewayV2(aws_provider) assert apigatewayv2.apis[0].authorizer is True # Test ApiGatewayV2 Get Stages @@ -117,6 +117,6 @@ class Test_ApiGatewayV2_Service: # Create ApiGatewayV2 Rest API and a deployment stage apigatewayv2_client.create_api(Name="test-api", ProtocolType="HTTP") - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - apigatewayv2 = ApiGatewayV2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + apigatewayv2 = ApiGatewayV2(aws_provider) assert apigatewayv2.apis[0].stages[0].logging is True diff --git a/tests/providers/aws/services/appstream/appstream_service_test.py b/tests/providers/aws/services/appstream/appstream_service_test.py index 456d87cab3..b5695f98cb 100644 --- a/tests/providers/aws/services/appstream/appstream_service_test.py +++ b/tests/providers/aws/services/appstream/appstream_service_test.py @@ -3,10 +3,10 @@ from unittest.mock import patch import botocore from prowler.providers.aws.services.appstream.appstream_service import AppStream -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mock Test Region @@ -51,8 +51,10 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client(service, region_name=AWS_REGION) +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( + service, region_name=AWS_REGION + ) regional_client.region = AWS_REGION return {AWS_REGION: regional_client} @@ -60,28 +62,28 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_AppStream_Service: # Test AppStream Client def test__get_client__(self): - appstream = AppStream(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + appstream = AppStream(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert appstream.regional_clients[AWS_REGION].__class__.__name__ == "AppStream" # Test AppStream Session def test__get_session__(self): - appstream = AppStream(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + appstream = AppStream(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert appstream.session.__class__.__name__ == "Session" # Test AppStream Session def test__get_service__(self): - appstream = AppStream(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + appstream = AppStream(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert appstream.service == "appstream" def test__describe_fleets__(self): # Set partition for the service - appstream = AppStream(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + appstream = AppStream(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert len(appstream.fleets) == 2 assert ( @@ -108,7 +110,7 @@ class Test_AppStream_Service: def test__list_tags_for_resource__(self): # Set partition for the service - appstream = AppStream(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + appstream = AppStream(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert len(appstream.fleets) == 2 assert appstream.fleets[0].tags == [{"test": "test"}] diff --git a/tests/providers/aws/services/athena/athena_service_test.py b/tests/providers/aws/services/athena/athena_service_test.py index 5daed07a27..26d063f8aa 100644 --- a/tests/providers/aws/services/athena/athena_service_test.py +++ b/tests/providers/aws/services/athena/athena_service_test.py @@ -3,10 +3,7 @@ from mock import patch from moto import mock_aws from prowler.providers.aws.services.athena.athena_service import Athena -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider # Mocking Access Analyzer Calls make_api_call = BaseClient._make_api_call @@ -39,8 +36,8 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -49,7 +46,7 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_Athena_Service: @@ -57,9 +54,9 @@ class Test_Athena_Service: @mock_aws def test__get_workgroups__not_encrypted(self): default_workgroup_name = "primary" - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - workgroup_arn = f"arn:{audit_info.audited_partition}:athena:{AWS_REGION_EU_WEST_1}:{audit_info.audited_account}:workgroup/{default_workgroup_name}" - athena = Athena(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + workgroup_arn = f"arn:{aws_provider.identity.partition}:athena:{AWS_REGION_EU_WEST_1}:{aws_provider.identity.account}:workgroup/{default_workgroup_name}" + athena = Athena(aws_provider) assert len(athena.workgroups) == 1 assert athena.workgroups[workgroup_arn] assert athena.workgroups[workgroup_arn].arn == workgroup_arn @@ -81,11 +78,11 @@ class Test_Athena_Service: @mock_aws def test__get_workgroups__encrypted(self): default_workgroup_name = "primary" - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) # Athena client # This API call is not implemented by Moto - # athena_client = audit_info.audit_session.client( + # athena_client = aws_provider.audit_session.client( # "athena", region_name=AWS_REGION # ) # athena_client.update_work_group( @@ -97,8 +94,8 @@ class Test_Athena_Service: # }, # ) - workgroup_arn = f"arn:{audit_info.audited_partition}:athena:{AWS_REGION_EU_WEST_1}:{audit_info.audited_account}:workgroup/{default_workgroup_name}" - athena = Athena(audit_info) + workgroup_arn = f"arn:{aws_provider.identity.partition}:athena:{AWS_REGION_EU_WEST_1}:{aws_provider.identity.account}:workgroup/{default_workgroup_name}" + athena = Athena(aws_provider) assert len(athena.workgroups) == 1 assert athena.workgroups[workgroup_arn] assert athena.workgroups[workgroup_arn].arn == workgroup_arn diff --git a/tests/providers/aws/services/athena/athena_workgroup_encryption/athena_workgroup_encryption_test.py b/tests/providers/aws/services/athena/athena_workgroup_encryption/athena_workgroup_encryption_test.py index 4753afa41e..75d45d202c 100644 --- a/tests/providers/aws/services/athena/athena_workgroup_encryption/athena_workgroup_encryption_test.py +++ b/tests/providers/aws/services/athena/athena_workgroup_encryption/athena_workgroup_encryption_test.py @@ -3,12 +3,12 @@ from unittest import mock from mock import patch from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.services.athena.athena_service_test import mock_make_api_call +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) -from tests.providers.aws.services.athena.athena_service_test import mock_make_api_call ATHENA_PRIMARY_WORKGROUP = "primary" ATHENA_PRIMARY_WORKGROUP_ARN = f"arn:aws:athena:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:workgroup/{ATHENA_PRIMARY_WORKGROUP}" @@ -19,14 +19,14 @@ class Test_athena_workgroup_encryption: def test_primary_workgroup_not_encrypted(self): from prowler.providers.aws.services.athena.athena_service import Athena - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.athena.athena_workgroup_encryption.athena_workgroup_encryption.athena_client", - new=Athena(current_audit_info), + new=Athena(aws_provider), ): from prowler.providers.aws.services.athena.athena_workgroup_encryption.athena_workgroup_encryption import ( athena_workgroup_encryption, @@ -50,15 +50,15 @@ class Test_athena_workgroup_encryption: def test_primary_workgroup_not_encrypted_ignoring(self): from prowler.providers.aws.services.athena.athena_service import Athena - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - current_audit_info.ignore_unused_services = True + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + aws_provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.athena.athena_workgroup_encryption.athena_workgroup_encryption.athena_client", - new=Athena(current_audit_info), + new=Athena(aws_provider), ): from prowler.providers.aws.services.athena.athena_workgroup_encryption.athena_workgroup_encryption import ( athena_workgroup_encryption, @@ -75,14 +75,14 @@ class Test_athena_workgroup_encryption: def test_primary_workgroup_encrypted(self): from prowler.providers.aws.services.athena.athena_service import Athena - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.athena.athena_workgroup_encryption.athena_workgroup_encryption.athena_client", - new=Athena(current_audit_info), + new=Athena(aws_provider), ): from prowler.providers.aws.services.athena.athena_workgroup_encryption.athena_workgroup_encryption import ( athena_workgroup_encryption, diff --git a/tests/providers/aws/services/athena/athena_workgroup_enforce_configuration/athena_workgroup_enforce_configuration_test.py b/tests/providers/aws/services/athena/athena_workgroup_enforce_configuration/athena_workgroup_enforce_configuration_test.py index f7bc1c0da3..c73c06f830 100644 --- a/tests/providers/aws/services/athena/athena_workgroup_enforce_configuration/athena_workgroup_enforce_configuration_test.py +++ b/tests/providers/aws/services/athena/athena_workgroup_enforce_configuration/athena_workgroup_enforce_configuration_test.py @@ -3,12 +3,12 @@ from unittest import mock from mock import patch from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.services.athena.athena_service_test import mock_make_api_call +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) -from tests.providers.aws.services.athena.athena_service_test import mock_make_api_call ATHENA_PRIMARY_WORKGROUP = "primary" ATHENA_PRIMARY_WORKGROUP_ARN = f"arn:aws:athena:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:workgroup/{ATHENA_PRIMARY_WORKGROUP}" @@ -19,14 +19,14 @@ class Test_athena_workgroup_enforce_configuration: def test_primary_workgroup_configuration_not_enforced(self): from prowler.providers.aws.services.athena.athena_service import Athena - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.athena.athena_workgroup_enforce_configuration.athena_workgroup_enforce_configuration.athena_client", - new=Athena(current_audit_info), + new=Athena(aws_provider), ): from prowler.providers.aws.services.athena.athena_workgroup_enforce_configuration.athena_workgroup_enforce_configuration import ( athena_workgroup_enforce_configuration, @@ -50,15 +50,15 @@ class Test_athena_workgroup_enforce_configuration: def test_primary_workgroup_configuration_not_enforced_ignoring(self): from prowler.providers.aws.services.athena.athena_service import Athena - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - current_audit_info.ignore_unused_services = True + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + aws_provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.athena.athena_workgroup_enforce_configuration.athena_workgroup_enforce_configuration.athena_client", - new=Athena(current_audit_info), + new=Athena(aws_provider), ): from prowler.providers.aws.services.athena.athena_workgroup_enforce_configuration.athena_workgroup_enforce_configuration import ( athena_workgroup_enforce_configuration, @@ -75,14 +75,14 @@ class Test_athena_workgroup_enforce_configuration: def test_primary_workgroup_configuration_enforced(self): from prowler.providers.aws.services.athena.athena_service import Athena - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.athena.athena_workgroup_enforce_configuration.athena_workgroup_enforce_configuration.athena_client", - new=Athena(current_audit_info), + new=Athena(aws_provider), ): from prowler.providers.aws.services.athena.athena_workgroup_enforce_configuration.athena_workgroup_enforce_configuration import ( athena_workgroup_enforce_configuration, diff --git a/tests/providers/aws/services/autoscaling/autoscaling_find_secrets_ec2_launch_configuration/autoscaling_find_secrets_ec2_launch_configuration_test.py b/tests/providers/aws/services/autoscaling/autoscaling_find_secrets_ec2_launch_configuration/autoscaling_find_secrets_ec2_launch_configuration_test.py index 6a40b3416e..08e46865b0 100644 --- a/tests/providers/aws/services/autoscaling/autoscaling_find_secrets_ec2_launch_configuration/autoscaling_find_secrets_ec2_launch_configuration_test.py +++ b/tests/providers/aws/services/autoscaling/autoscaling_find_secrets_ec2_launch_configuration/autoscaling_find_secrets_ec2_launch_configuration_test.py @@ -5,10 +5,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider ACTUAL_DIRECTORY = Path(path.dirname(path.realpath(__file__))) FIXTURES_DIR_NAME = "fixtures" @@ -24,14 +21,14 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration: AutoScaling, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_client", - new=AutoScaling(current_audit_info), + new=AutoScaling(aws_provider), ): # Test Check from prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration import ( @@ -64,14 +61,14 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration: AutoScaling, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_client", - new=AutoScaling(current_audit_info), + new=AutoScaling(aws_provider), ): from prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration import ( autoscaling_find_secrets_ec2_launch_configuration, @@ -111,14 +108,14 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration: AutoScaling, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_client", - new=AutoScaling(current_audit_info), + new=AutoScaling(aws_provider), ): from prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration import ( autoscaling_find_secrets_ec2_launch_configuration, @@ -163,14 +160,14 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration: AutoScaling, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_client", - new=AutoScaling(current_audit_info), + new=AutoScaling(aws_provider), ): from prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration import ( autoscaling_find_secrets_ec2_launch_configuration, @@ -209,14 +206,14 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration: AutoScaling, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_client", - new=AutoScaling(current_audit_info), + new=AutoScaling(aws_provider), ): from prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration import ( autoscaling_find_secrets_ec2_launch_configuration, @@ -262,14 +259,14 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration: AutoScaling, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_client", - new=AutoScaling(current_audit_info), + new=AutoScaling(aws_provider), ): from prowler.providers.aws.services.autoscaling.autoscaling_find_secrets_ec2_launch_configuration.autoscaling_find_secrets_ec2_launch_configuration import ( autoscaling_find_secrets_ec2_launch_configuration, diff --git a/tests/providers/aws/services/autoscaling/autoscaling_group_multiple_az/autoscaling_group_multiple_az_test.py b/tests/providers/aws/services/autoscaling/autoscaling_group_multiple_az/autoscaling_group_multiple_az_test.py index 604ed90eaf..c87bd40823 100644 --- a/tests/providers/aws/services/autoscaling/autoscaling_group_multiple_az/autoscaling_group_multiple_az_test.py +++ b/tests/providers/aws/services/autoscaling/autoscaling_group_multiple_az/autoscaling_group_multiple_az_test.py @@ -3,10 +3,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_autoscaling_group_multiple_az: @@ -19,14 +16,14 @@ class Test_autoscaling_group_multiple_az: AutoScaling, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az.autoscaling_client", - new=AutoScaling(current_audit_info), + new=AutoScaling(aws_provider), ): # Test Check from prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az import ( @@ -66,14 +63,14 @@ class Test_autoscaling_group_multiple_az: AutoScaling, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az.autoscaling_client", - new=AutoScaling(current_audit_info), + new=AutoScaling(aws_provider), ): # Test Check from prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az import ( @@ -122,14 +119,14 @@ class Test_autoscaling_group_multiple_az: AutoScaling, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az.autoscaling_client", - new=AutoScaling(current_audit_info), + new=AutoScaling(aws_provider), ): # Test Check from prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az import ( @@ -189,14 +186,14 @@ class Test_autoscaling_group_multiple_az: AutoScaling, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az.autoscaling_client", - new=AutoScaling(current_audit_info), + new=AutoScaling(aws_provider), ): # Test Check from prowler.providers.aws.services.autoscaling.autoscaling_group_multiple_az.autoscaling_group_multiple_az import ( diff --git a/tests/providers/aws/services/autoscaling/autoscaling_service_test.py b/tests/providers/aws/services/autoscaling/autoscaling_service_test.py index 230181436e..1b743ef2bf 100644 --- a/tests/providers/aws/services/autoscaling/autoscaling_service_test.py +++ b/tests/providers/aws/services/autoscaling/autoscaling_service_test.py @@ -4,10 +4,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.autoscaling.autoscaling_service import AutoScaling -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -16,16 +16,16 @@ class Test_AutoScaling_Service: @mock_aws def test_service(self): # AutoScaling client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - autoscaling = AutoScaling(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + autoscaling = AutoScaling(aws_provider) assert autoscaling.service == "autoscaling" # Test AutoScaling Client @mock_aws def test_client(self): # AutoScaling client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - autoscaling = AutoScaling(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + autoscaling = AutoScaling(aws_provider) for regional_client in autoscaling.regional_clients.values(): assert regional_client.__class__.__name__ == "AutoScaling" @@ -33,16 +33,16 @@ class Test_AutoScaling_Service: @mock_aws def test__get_session__(self): # AutoScaling client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - autoscaling = AutoScaling(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + autoscaling = AutoScaling(aws_provider) assert autoscaling.session.__class__.__name__ == "Session" # Test AutoScaling Session @mock_aws def test_audited_account(self): # AutoScaling client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - autoscaling = AutoScaling(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + autoscaling = AutoScaling(aws_provider) assert autoscaling.audited_account == AWS_ACCOUNT_NUMBER # Test AutoScaling Get APIs @@ -67,8 +67,8 @@ class Test_AutoScaling_Service: SecurityGroups=["default", "default2"], ) # AutoScaling client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - autoscaling = AutoScaling(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + autoscaling = AutoScaling(aws_provider) assert len(autoscaling.launch_configurations) == 2 assert autoscaling.launch_configurations[0].name == "tester1" assert ( @@ -107,8 +107,8 @@ class Test_AutoScaling_Service: ) # AutoScaling client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - autoscaling = AutoScaling(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + autoscaling = AutoScaling(aws_provider) print("asg", asg) assert len(autoscaling.groups) == 1 # create_auto_scaling_group doesn't return the ARN, can't check it diff --git a/tests/providers/aws/services/awslambda/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled_test.py b/tests/providers/aws/services/awslambda/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled_test.py index 90a06de20d..9b6946d2d4 100644 --- a/tests/providers/aws/services/awslambda/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled_test.py +++ b/tests/providers/aws/services/awslambda/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled_test.py @@ -5,16 +5,16 @@ from mock import patch from moto import mock_aws from prowler.providers.aws.services.awslambda.awslambda_service import Function -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -23,7 +23,7 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled: @@ -37,14 +37,14 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_client", new=lambda_client, ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.cloudtrail_client", - new=Cloudtrail(set_mocked_aws_audit_info()), + new=Cloudtrail(set_mocked_aws_provider()), ): # Test Check from prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled import ( @@ -90,14 +90,14 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_client", new=lambda_client, ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.cloudtrail_client", - new=Cloudtrail(set_mocked_aws_audit_info()), + new=Cloudtrail(set_mocked_aws_provider()), ): # Test Check from prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled import ( @@ -164,14 +164,14 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_client", new=lambda_client, ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.cloudtrail_client", - new=Cloudtrail(set_mocked_aws_audit_info()), + new=Cloudtrail(set_mocked_aws_provider()), ): # Test Check from prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled import ( @@ -241,14 +241,14 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_client", new=lambda_client, ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.cloudtrail_client", - new=Cloudtrail(set_mocked_aws_audit_info()), + new=Cloudtrail(set_mocked_aws_provider()), ): # Test Check from prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled import ( @@ -315,14 +315,14 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_client", new=lambda_client, ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.cloudtrail_client", - new=Cloudtrail(set_mocked_aws_audit_info()), + new=Cloudtrail(set_mocked_aws_provider()), ): # Test Check from prowler.providers.aws.services.awslambda.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.awslambda_function_invoke_api_operations_cloudtrail_logging_enabled import ( diff --git a/tests/providers/aws/services/awslambda/awslambda_function_no_secrets_in_code/awslambda_function_no_secrets_in_code_test.py b/tests/providers/aws/services/awslambda/awslambda_function_no_secrets_in_code/awslambda_function_no_secrets_in_code_test.py index fa0ec88c63..0de1fab18a 100644 --- a/tests/providers/aws/services/awslambda/awslambda_function_no_secrets_in_code/awslambda_function_no_secrets_in_code_test.py +++ b/tests/providers/aws/services/awslambda/awslambda_function_no_secrets_in_code/awslambda_function_no_secrets_in_code_test.py @@ -5,14 +5,14 @@ from prowler.providers.aws.services.awslambda.awslambda_service import ( Function, LambdaCode, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) from tests.providers.aws.services.awslambda.awslambda_service_test import ( create_zip_file, ) +from tests.providers.aws.utils import ( + AWS_ACCOUNT_NUMBER, + AWS_REGION_US_EAST_1, + set_mocked_aws_provider, +) LAMBDA_FUNCTION_NAME = "test-lambda" LAMBDA_FUNCTION_RUNTIME = "nodejs4.3" @@ -65,8 +65,8 @@ class Test_awslambda_function_no_secrets_in_code: lambda_client.functions = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_code.awslambda_function_no_secrets_in_code.awslambda_client", new=lambda_client, @@ -86,8 +86,8 @@ class Test_awslambda_function_no_secrets_in_code: lambda_client.functions = {LAMBDA_FUNCTION_ARN: create_lambda_function()} lambda_client.__get_function_code__ = mock__get_function_code__with_secrets with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_code.awslambda_function_no_secrets_in_code.awslambda_client", new=lambda_client, @@ -118,8 +118,8 @@ class Test_awslambda_function_no_secrets_in_code: lambda_client.__get_function_code__ = mock__get_function_code__without_secrets with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_code.awslambda_function_no_secrets_in_code.awslambda_client", new=lambda_client, diff --git a/tests/providers/aws/services/awslambda/awslambda_function_no_secrets_in_variables/awslambda_function_no_secrets_in_variables_test.py b/tests/providers/aws/services/awslambda/awslambda_function_no_secrets_in_variables/awslambda_function_no_secrets_in_variables_test.py index 97ba6e7ed6..790967f546 100644 --- a/tests/providers/aws/services/awslambda/awslambda_function_no_secrets_in_variables/awslambda_function_no_secrets_in_variables_test.py +++ b/tests/providers/aws/services/awslambda/awslambda_function_no_secrets_in_variables/awslambda_function_no_secrets_in_variables_test.py @@ -1,10 +1,10 @@ from unittest import mock from prowler.providers.aws.services.awslambda.awslambda_service import Function -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -14,8 +14,8 @@ class Test_awslambda_function_no_secrets_in_variables: lambda_client.functions = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_variables.awslambda_function_no_secrets_in_variables.awslambda_client", new=lambda_client, @@ -47,8 +47,8 @@ class Test_awslambda_function_no_secrets_in_variables: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_variables.awslambda_function_no_secrets_in_variables.awslambda_client", new=lambda_client, @@ -90,8 +90,8 @@ class Test_awslambda_function_no_secrets_in_variables: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_variables.awslambda_function_no_secrets_in_variables.awslambda_client", new=lambda_client, @@ -133,8 +133,8 @@ class Test_awslambda_function_no_secrets_in_variables: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_no_secrets_in_variables.awslambda_function_no_secrets_in_variables.awslambda_client", new=lambda_client, diff --git a/tests/providers/aws/services/awslambda/awslambda_function_not_publicly_accessible/awslambda_function_not_publicly_accessible_test.py b/tests/providers/aws/services/awslambda/awslambda_function_not_publicly_accessible/awslambda_function_not_publicly_accessible_test.py index 0d08cad4a7..b81faf38cb 100644 --- a/tests/providers/aws/services/awslambda/awslambda_function_not_publicly_accessible/awslambda_function_not_publicly_accessible_test.py +++ b/tests/providers/aws/services/awslambda/awslambda_function_not_publicly_accessible/awslambda_function_not_publicly_accessible_test.py @@ -1,10 +1,10 @@ from unittest import mock from prowler.providers.aws.services.awslambda.awslambda_service import Function -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -14,8 +14,8 @@ class Test_awslambda_function_not_publicly_accessible: lambda_client.functions = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_not_publicly_accessible.awslambda_function_not_publicly_accessible.awslambda_client", new=lambda_client, @@ -62,8 +62,8 @@ class Test_awslambda_function_not_publicly_accessible: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_not_publicly_accessible.awslambda_function_not_publicly_accessible.awslambda_client", new=lambda_client, @@ -119,8 +119,8 @@ class Test_awslambda_function_not_publicly_accessible: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_not_publicly_accessible.awslambda_function_not_publicly_accessible.awslambda_client", new=lambda_client, @@ -176,8 +176,8 @@ class Test_awslambda_function_not_publicly_accessible: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_not_publicly_accessible.awslambda_function_not_publicly_accessible.awslambda_client", new=lambda_client, diff --git a/tests/providers/aws/services/awslambda/awslambda_function_url_cors_policy/awslambda_function_url_cors_policy_test.py b/tests/providers/aws/services/awslambda/awslambda_function_url_cors_policy/awslambda_function_url_cors_policy_test.py index e7d63f671c..eafdea5e49 100644 --- a/tests/providers/aws/services/awslambda/awslambda_function_url_cors_policy/awslambda_function_url_cors_policy_test.py +++ b/tests/providers/aws/services/awslambda/awslambda_function_url_cors_policy/awslambda_function_url_cors_policy_test.py @@ -1,26 +1,29 @@ from unittest import mock +from moto import mock_aws + from prowler.providers.aws.services.awslambda.awslambda_service import ( AuthType, Function, URLConfig, URLConfigCORS, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) +@mock_aws class Test_awslambda_function_url_cors_policy: def test_no_functions(self): lambda_client = mock.MagicMock lambda_client.functions = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_url_cors_policy.awslambda_function_url_cors_policy.awslambda_client", new=lambda_client, @@ -56,8 +59,8 @@ class Test_awslambda_function_url_cors_policy: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_url_cors_policy.awslambda_function_url_cors_policy.awslambda_client", new=lambda_client, @@ -102,8 +105,8 @@ class Test_awslambda_function_url_cors_policy: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_url_cors_policy.awslambda_function_url_cors_policy.awslambda_client", new=lambda_client, @@ -150,8 +153,8 @@ class Test_awslambda_function_url_cors_policy: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_url_cors_policy.awslambda_function_url_cors_policy.awslambda_client", new=lambda_client, diff --git a/tests/providers/aws/services/awslambda/awslambda_function_url_public/awslambda_function_url_public_test.py b/tests/providers/aws/services/awslambda/awslambda_function_url_public/awslambda_function_url_public_test.py index 56a6d7414b..d276684841 100644 --- a/tests/providers/aws/services/awslambda/awslambda_function_url_public/awslambda_function_url_public_test.py +++ b/tests/providers/aws/services/awslambda/awslambda_function_url_public/awslambda_function_url_public_test.py @@ -6,10 +6,10 @@ from prowler.providers.aws.services.awslambda.awslambda_service import ( URLConfig, URLConfigCORS, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,8 +19,8 @@ class Test_awslambda_function_url_public: lambda_client.functions = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_url_public.awslambda_function_url_public.awslambda_client", new=lambda_client, @@ -56,8 +56,8 @@ class Test_awslambda_function_url_public: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_url_public.awslambda_function_url_public.awslambda_client", new=lambda_client, @@ -102,8 +102,8 @@ class Test_awslambda_function_url_public: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_url_public.awslambda_function_url_public.awslambda_client", new=lambda_client, diff --git a/tests/providers/aws/services/awslambda/awslambda_function_using_supported_runtimes/awslambda_function_using_supported_runtimes_test.py b/tests/providers/aws/services/awslambda/awslambda_function_using_supported_runtimes/awslambda_function_using_supported_runtimes_test.py index 773d02898a..5134343f2f 100644 --- a/tests/providers/aws/services/awslambda/awslambda_function_using_supported_runtimes/awslambda_function_using_supported_runtimes_test.py +++ b/tests/providers/aws/services/awslambda/awslambda_function_using_supported_runtimes/awslambda_function_using_supported_runtimes_test.py @@ -1,10 +1,10 @@ from unittest import mock from prowler.providers.aws.services.awslambda.awslambda_service import Function -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -14,8 +14,8 @@ class Test_awslambda_function_using_supported_runtimes: lambda_client.functions = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_using_supported_runtimes.awslambda_function_using_supported_runtimes.awslambda_client", new=lambda_client, @@ -64,8 +64,8 @@ class Test_awslambda_function_using_supported_runtimes: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_using_supported_runtimes.awslambda_function_using_supported_runtimes.awslambda_client", new=lambda_client, @@ -123,8 +123,8 @@ class Test_awslambda_function_using_supported_runtimes: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_using_supported_runtimes.awslambda_function_using_supported_runtimes.awslambda_client", new=lambda_client, @@ -180,8 +180,8 @@ class Test_awslambda_function_using_supported_runtimes: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.awslambda.awslambda_function_using_supported_runtimes.awslambda_function_using_supported_runtimes.awslambda_client", new=lambda_client, diff --git a/tests/providers/aws/services/awslambda/awslambda_service_test.py b/tests/providers/aws/services/awslambda/awslambda_service_test.py index 07e6ef175d..c324b5d746 100644 --- a/tests/providers/aws/services/awslambda/awslambda_service_test.py +++ b/tests/providers/aws/services/awslambda/awslambda_service_test.py @@ -10,11 +10,11 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.awslambda.awslambda_service import AuthType, Lambda -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) LAMBDA_FUNCTION_CODE = """def lambda_handler(event, context): @@ -47,11 +47,11 @@ def mock_request_get(_): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client_eu_west_1 = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client_eu_west_1 = provider.session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) - regional_client_us_east_1 = audit_info.audit_session.client( + regional_client_us_east_1 = provider.session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client_eu_west_1.region = AWS_REGION_EU_WEST_1 @@ -63,13 +63,13 @@ def mock_generate_regional_clients(service, audit_info): @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_Lambda_Service: # Test Lambda Client def test__get_client__(self): - awslambda = Lambda(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + awslambda = Lambda(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert ( awslambda.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ == "Lambda" @@ -77,12 +77,12 @@ class Test_Lambda_Service: # Test Lambda Session def test__get_session__(self): - awslambda = Lambda(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + awslambda = Lambda(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert awslambda.session.__class__.__name__ == "Session" # Test Lambda Service def test__get_service__(self): - awslambda = Lambda(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + awslambda = Lambda(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert awslambda.service == "lambda" @mock_aws @@ -192,7 +192,7 @@ class Test_Lambda_Service: new=mock_request_get, ): awslambda = Lambda( - set_mocked_aws_audit_info(audited_regions=[AWS_REGION_US_EAST_1]) + set_mocked_aws_provider(audited_regions=[AWS_REGION_US_EAST_1]) ) assert awslambda.functions assert len(awslambda.functions) == 2 diff --git a/tests/providers/aws/services/backup/backup_service_test.py b/tests/providers/aws/services/backup/backup_service_test.py index 760d995b2e..ff5d0d9897 100644 --- a/tests/providers/aws/services/backup/backup_service_test.py +++ b/tests/providers/aws/services/backup/backup_service_test.py @@ -2,12 +2,10 @@ from datetime import datetime from unittest.mock import patch import botocore +from moto import mock_aws from prowler.providers.aws.services.backup.backup_service import Backup -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider # Mocking Backup Calls make_api_call = botocore.client.BaseClient._make_api_call @@ -58,45 +56,46 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 return {AWS_REGION_EU_WEST_1: regional_client} +@mock_aws # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_Backup_Service: # Test Backup Client def test__get_client__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - backup = Backup(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + backup = Backup(aws_provider) assert ( backup.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ == "Backup" ) # Test Backup Session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - access_analyzer = Backup(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + access_analyzer = Backup(aws_provider) assert access_analyzer.session.__class__.__name__ == "Session" # Test Backup Service def test__get_service__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - access_analyzer = Backup(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + access_analyzer = Backup(aws_provider) assert access_analyzer.service == "backup" # Test Backup List Backup Vaults def test__list_backup_vaults__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - backup = Backup(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + backup = Backup(aws_provider) assert len(backup.backup_vaults) == 1 assert backup.backup_vaults[0].arn == "ARN" assert backup.backup_vaults[0].name == "Test Vault" @@ -109,8 +108,8 @@ class Test_Backup_Service: # Test Backup List Backup Plans def test__list_backup_plans__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - backup = Backup(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + backup = Backup(aws_provider) assert len(backup.backup_plans) == 1 assert backup.backup_plans[0].arn == "ARN" assert backup.backup_plans[0].id == "ID" @@ -122,8 +121,8 @@ class Test_Backup_Service: # Test Backup List Report Plans def test__list_backup_report_plans__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - backup = Backup(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + backup = Backup(aws_provider) assert len(backup.backup_report_plans) == 1 assert backup.backup_report_plans[0].arn == "ARN" assert backup.backup_report_plans[0].region == AWS_REGION_EU_WEST_1 diff --git a/tests/providers/aws/services/cloudformation/cloudformation_service_test.py b/tests/providers/aws/services/cloudformation/cloudformation_service_test.py index 6519f0b2a8..cd39a6aa22 100644 --- a/tests/providers/aws/services/cloudformation/cloudformation_service_test.py +++ b/tests/providers/aws/services/cloudformation/cloudformation_service_test.py @@ -10,10 +10,10 @@ from moto import mock_aws from prowler.providers.aws.services.cloudformation.cloudformation_service import ( CloudFormation, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Dummy CloudFormation Template @@ -119,8 +119,8 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -130,16 +130,14 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_CloudFormation_Service: # Test CloudFormation Client @mock_aws def test__get_client__(self): - cloudformation = CloudFormation( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - ) + cloudformation = CloudFormation(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])) assert ( cloudformation.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ == "CloudFormation" @@ -148,9 +146,7 @@ class Test_CloudFormation_Service: # Test CloudFormation Service @mock_aws def test__get_service__(self): - cloudformation = CloudFormation( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - ) + cloudformation = CloudFormation(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])) assert ( cloudformation.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ == "CloudFormation" @@ -159,9 +155,7 @@ class Test_CloudFormation_Service: # Test CloudFormation Session @mock_aws def test__get_session__(self): - cloudformation = CloudFormation( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - ) + cloudformation = CloudFormation(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])) assert cloudformation.session.__class__.__name__ == "Session" @mock_aws @@ -187,9 +181,7 @@ class Test_CloudFormation_Service: ], ) - cloudformation = CloudFormation( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - ) + cloudformation = CloudFormation(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])) assert len(cloudformation.stacks) == 1 assert cloudformation.stacks[0].arn == stack_arn["StackId"] assert cloudformation.stacks[0].name == "Test-Stack" diff --git a/tests/providers/aws/services/cloudfront/cloudfront_distributions_field_level_encryption_enabled/cloudfront_distributions_field_level_encryption_enabled_test.py b/tests/providers/aws/services/cloudfront/cloudfront_distributions_field_level_encryption_enabled/cloudfront_distributions_field_level_encryption_enabled_test.py index c474a6ae46..7325dfbe23 100644 --- a/tests/providers/aws/services/cloudfront/cloudfront_distributions_field_level_encryption_enabled/cloudfront_distributions_field_level_encryption_enabled_test.py +++ b/tests/providers/aws/services/cloudfront/cloudfront_distributions_field_level_encryption_enabled/cloudfront_distributions_field_level_encryption_enabled_test.py @@ -5,7 +5,7 @@ from prowler.providers.aws.services.cloudfront.cloudfront_service import ( Distribution, ViewerProtocolPolicy, ) -from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER DISTRIBUTION_ID = "E27LVI50CSW06W" DISTRIBUTION_ARN = ( diff --git a/tests/providers/aws/services/cloudfront/cloudfront_distributions_geo_restrictions_enabled/cloudfront_distributions_geo_restrictions_enabled_test.py b/tests/providers/aws/services/cloudfront/cloudfront_distributions_geo_restrictions_enabled/cloudfront_distributions_geo_restrictions_enabled_test.py index eeec708709..381a73bbca 100644 --- a/tests/providers/aws/services/cloudfront/cloudfront_distributions_geo_restrictions_enabled/cloudfront_distributions_geo_restrictions_enabled_test.py +++ b/tests/providers/aws/services/cloudfront/cloudfront_distributions_geo_restrictions_enabled/cloudfront_distributions_geo_restrictions_enabled_test.py @@ -4,7 +4,7 @@ from prowler.providers.aws.services.cloudfront.cloudfront_service import ( Distribution, GeoRestrictionType, ) -from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER DISTRIBUTION_ID = "E27LVI50CSW06W" DISTRIBUTION_ARN = ( diff --git a/tests/providers/aws/services/cloudfront/cloudfront_distributions_https_enabled/cloudfront_distributions_https_enabled_test.py b/tests/providers/aws/services/cloudfront/cloudfront_distributions_https_enabled/cloudfront_distributions_https_enabled_test.py index 70b5966820..6aa47e8b8a 100644 --- a/tests/providers/aws/services/cloudfront/cloudfront_distributions_https_enabled/cloudfront_distributions_https_enabled_test.py +++ b/tests/providers/aws/services/cloudfront/cloudfront_distributions_https_enabled/cloudfront_distributions_https_enabled_test.py @@ -5,7 +5,7 @@ from prowler.providers.aws.services.cloudfront.cloudfront_service import ( Distribution, ViewerProtocolPolicy, ) -from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER DISTRIBUTION_ID = "E27LVI50CSW06W" DISTRIBUTION_ARN = ( diff --git a/tests/providers/aws/services/cloudfront/cloudfront_distributions_logging_enabled/cloudfront_distributions_logging_enabled_test.py b/tests/providers/aws/services/cloudfront/cloudfront_distributions_logging_enabled/cloudfront_distributions_logging_enabled_test.py index 23db912d9e..764959fa8c 100644 --- a/tests/providers/aws/services/cloudfront/cloudfront_distributions_logging_enabled/cloudfront_distributions_logging_enabled_test.py +++ b/tests/providers/aws/services/cloudfront/cloudfront_distributions_logging_enabled/cloudfront_distributions_logging_enabled_test.py @@ -5,7 +5,7 @@ from prowler.providers.aws.services.cloudfront.cloudfront_service import ( Distribution, ViewerProtocolPolicy, ) -from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER DISTRIBUTION_ID = "E27LVI50CSW06W" DISTRIBUTION_ARN = ( diff --git a/tests/providers/aws/services/cloudfront/cloudfront_distributions_using_deprecated_ssl_protocols/cloudfront_distributions_using_deprecated_ssl_protocols_test.py b/tests/providers/aws/services/cloudfront/cloudfront_distributions_using_deprecated_ssl_protocols/cloudfront_distributions_using_deprecated_ssl_protocols_test.py index 6f70e746cf..8a39ba63e3 100644 --- a/tests/providers/aws/services/cloudfront/cloudfront_distributions_using_deprecated_ssl_protocols/cloudfront_distributions_using_deprecated_ssl_protocols_test.py +++ b/tests/providers/aws/services/cloudfront/cloudfront_distributions_using_deprecated_ssl_protocols/cloudfront_distributions_using_deprecated_ssl_protocols_test.py @@ -1,7 +1,7 @@ from unittest import mock from prowler.providers.aws.services.cloudfront.cloudfront_service import Distribution -from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER DISTRIBUTION_ID = "E27LVI50CSW06W" DISTRIBUTION_ARN = ( diff --git a/tests/providers/aws/services/cloudfront/cloudfront_distributions_using_waf/cloudfront_distributions_using_waf_test.py b/tests/providers/aws/services/cloudfront/cloudfront_distributions_using_waf/cloudfront_distributions_using_waf_test.py index f408ebdc53..c73fcc830a 100644 --- a/tests/providers/aws/services/cloudfront/cloudfront_distributions_using_waf/cloudfront_distributions_using_waf_test.py +++ b/tests/providers/aws/services/cloudfront/cloudfront_distributions_using_waf/cloudfront_distributions_using_waf_test.py @@ -1,7 +1,7 @@ from unittest import mock from prowler.providers.aws.services.cloudfront.cloudfront_service import Distribution -from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER DISTRIBUTION_ID = "E27LVI50CSW06W" DISTRIBUTION_ARN = ( diff --git a/tests/providers/aws/services/cloudfront/cloudfront_service_test.py b/tests/providers/aws/services/cloudfront/cloudfront_service_test.py index 0718c02d7a..12fc76acce 100644 --- a/tests/providers/aws/services/cloudfront/cloudfront_service_test.py +++ b/tests/providers/aws/services/cloudfront/cloudfront_service_test.py @@ -9,10 +9,7 @@ from prowler.providers.aws.services.cloudfront.cloudfront_service import ( GeoRestrictionType, ViewerProtocolPolicy, ) -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider def example_distribution_config(ref): @@ -153,24 +150,24 @@ class Test_CloudFront_Service: # Test CloudFront Client @mock_aws def test__get_client__(self): - cloudfront = CloudFront(set_mocked_aws_audit_info()) + cloudfront = CloudFront(set_mocked_aws_provider()) assert cloudfront.client.__class__.__name__ == "CloudFront" # Test CloudFront Session @mock_aws def test__get_session__(self): - cloudfront = CloudFront(set_mocked_aws_audit_info()) + cloudfront = CloudFront(set_mocked_aws_provider()) assert cloudfront.session.__class__.__name__ == "Session" # Test CloudFront Service @mock_aws def test__get_service__(self): - cloudfront = CloudFront(set_mocked_aws_audit_info()) + cloudfront = CloudFront(set_mocked_aws_provider()) assert cloudfront.service == "cloudfront" @mock_aws def test__list_distributions__zero(self): - cloudfront = CloudFront(set_mocked_aws_audit_info()) + cloudfront = CloudFront(set_mocked_aws_provider()) assert len(cloudfront.distributions) == 0 @@ -181,7 +178,7 @@ class Test_CloudFront_Service: response = cloudfront_client.create_distribution(DistributionConfig=config) cloudfront_distribution_id = response["Distribution"]["Id"] cloudfront_distribution_arn = response["Distribution"]["ARN"] - cloudfront = CloudFront(set_mocked_aws_audit_info()) + cloudfront = CloudFront(set_mocked_aws_provider()) assert len(cloudfront.distributions) == 1 assert ( diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_bucket_requires_mfa_delete/cloudtrail_bucket_requires_mfa_delete_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_bucket_requires_mfa_delete/cloudtrail_bucket_requires_mfa_delete_test.py index 0be7e0988f..84fd3c4ecf 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_bucket_requires_mfa_delete/cloudtrail_bucket_requires_mfa_delete_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_bucket_requires_mfa_delete/cloudtrail_bucket_requires_mfa_delete_test.py @@ -7,10 +7,10 @@ from moto import mock_aws from prowler.providers.aws.services.cloudtrail.cloudtrail_service import Cloudtrail from prowler.providers.aws.services.s3.s3_service import S3 -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking Backup Calls @@ -20,16 +20,16 @@ make_api_call = botocore.client.BaseClient._make_api_call class Test_cloudtrail_bucket_requires_mfa_delete: @mock_aws def test_no_trails(self): - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete import ( @@ -42,7 +42,7 @@ class Test_cloudtrail_bucket_requires_mfa_delete: @mock_aws def test_trails_with_no_mfa_bucket(self): - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) @@ -60,14 +60,14 @@ class Test_cloudtrail_bucket_requires_mfa_delete: cloudtrail_client_us_east_1.get_trail_status(Name=trail_name_us) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete import ( @@ -105,7 +105,7 @@ class Test_cloudtrail_bucket_requires_mfa_delete: new=mock_make_api_call_getbucketversioning_mfadelete_enabled, ) def test_trails_with_mfa_bucket(self): - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) @@ -123,14 +123,14 @@ class Test_cloudtrail_bucket_requires_mfa_delete: cloudtrail_client_us_east_1.get_trail_status(Name=trail_name_us) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete import ( @@ -152,7 +152,7 @@ class Test_cloudtrail_bucket_requires_mfa_delete: @mock_aws def test_trails_with_no_mfa_bucket_cross(self): - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) @@ -170,14 +170,14 @@ class Test_cloudtrail_bucket_requires_mfa_delete: cloudtrail_client_us_east_1.get_trail_status(Name=trail_name_us) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ) as s3_client: # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete import ( @@ -207,7 +207,7 @@ class Test_cloudtrail_bucket_requires_mfa_delete: new=mock_make_api_call_getbucketversioning_mfadelete_enabled, ) def test_trails_with_mfa_bucket_cross(self): - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) @@ -225,14 +225,14 @@ class Test_cloudtrail_bucket_requires_mfa_delete: cloudtrail_client_us_east_1.get_trail_status(Name=trail_name_us) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ) as s3_client: # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_bucket_requires_mfa_delete.cloudtrail_bucket_requires_mfa_delete import ( diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_cloudwatch_logging_enabled/cloudtrail_cloudwatch_logging_enabled_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_cloudwatch_logging_enabled/cloudtrail_cloudwatch_logging_enabled_test.py index b79997dd9f..9be47576ac 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_cloudwatch_logging_enabled/cloudtrail_cloudwatch_logging_enabled_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_cloudwatch_logging_enabled/cloudtrail_cloudwatch_logging_enabled_test.py @@ -5,17 +5,17 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) class Test_cloudtrail_cloudwatch_logging_enabled: @mock_aws def test_no_trails(self): - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) @@ -24,12 +24,12 @@ class Test_cloudtrail_cloudwatch_logging_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_cloudwatch_logging_enabled.cloudtrail_cloudwatch_logging_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_cloudwatch_logging_enabled.cloudtrail_cloudwatch_logging_enabled import ( @@ -71,13 +71,15 @@ class Test_cloudtrail_cloudwatch_logging_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_cloudwatch_logging_enabled.cloudtrail_cloudwatch_logging_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info( + set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) ), @@ -158,13 +160,15 @@ class Test_cloudtrail_cloudwatch_logging_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_cloudwatch_logging_enabled.cloudtrail_cloudwatch_logging_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info( + set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) ), @@ -246,13 +250,15 @@ class Test_cloudtrail_cloudwatch_logging_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_cloudwatch_logging_enabled.cloudtrail_cloudwatch_logging_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info( + set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) ), diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_insights_exist/cloudtrail_insights_exist_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_insights_exist/cloudtrail_insights_exist_test.py index 828bd6ed8a..a74e621c44 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_insights_exist/cloudtrail_insights_exist_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_insights_exist/cloudtrail_insights_exist_test.py @@ -4,27 +4,27 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.cloudtrail.cloudtrail_service import Cloudtrail -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) class Test_cloudtrail_insights_exist: @mock_aws def test_no_trails(self): - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_insights_exist.cloudtrail_insights_exist.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_insights_exist.cloudtrail_insights_exist import ( @@ -37,7 +37,7 @@ class Test_cloudtrail_insights_exist: @mock_aws def test_trails_with_no_insight_selector(self): - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) @@ -55,12 +55,12 @@ class Test_cloudtrail_insights_exist: cloudtrail_client_us_east_1.get_trail_status(Name=trail_name_us) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_insights_exist.cloudtrail_insights_exist.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_insights_exist.cloudtrail_insights_exist import ( @@ -82,7 +82,7 @@ class Test_cloudtrail_insights_exist: @mock_aws def test_trails_with_insight_selector(self): - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) @@ -104,12 +104,12 @@ class Test_cloudtrail_insights_exist: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_insights_exist.cloudtrail_insights_exist.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_insights_exist.cloudtrail_insights_exist import ( diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_kms_encryption_enabled/cloudtrail_kms_encryption_enabled_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_kms_encryption_enabled/cloudtrail_kms_encryption_enabled_test.py index d8e971e879..5afd6f62d6 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_kms_encryption_enabled/cloudtrail_kms_encryption_enabled_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_kms_encryption_enabled/cloudtrail_kms_encryption_enabled_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,12 +19,14 @@ class Test_cloudtrail_kms_encryption_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_kms_encryption_enabled.cloudtrail_kms_encryption_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ): # Test Check @@ -55,12 +57,14 @@ class Test_cloudtrail_kms_encryption_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_kms_encryption_enabled.cloudtrail_kms_encryption_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ): # Test Check @@ -105,12 +109,14 @@ class Test_cloudtrail_kms_encryption_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_kms_encryption_enabled.cloudtrail_kms_encryption_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ): # Test Check diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_log_file_validation_enabled/cloudtrail_log_file_validation_enabled_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_log_file_validation_enabled/cloudtrail_log_file_validation_enabled_test.py index 360009793b..077f942014 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_log_file_validation_enabled/cloudtrail_log_file_validation_enabled_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_log_file_validation_enabled/cloudtrail_log_file_validation_enabled_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,12 +19,14 @@ class Test_cloudtrail_log_file_validation_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_log_file_validation_enabled.cloudtrail_log_file_validation_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ): # Test Check @@ -54,12 +56,14 @@ class Test_cloudtrail_log_file_validation_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_log_file_validation_enabled.cloudtrail_log_file_validation_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ): # Test Check @@ -112,12 +116,14 @@ class Test_cloudtrail_log_file_validation_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_log_file_validation_enabled.cloudtrail_log_file_validation_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ) as service_client: # Test Check diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_logs_s3_bucket_access_logging_enabled/cloudtrail_logs_s3_bucket_access_logging_enabled_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_logs_s3_bucket_access_logging_enabled/cloudtrail_logs_s3_bucket_access_logging_enabled_test.py index bf6b149dba..538208416b 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_logs_s3_bucket_access_logging_enabled/cloudtrail_logs_s3_bucket_access_logging_enabled_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_logs_s3_bucket_access_logging_enabled/cloudtrail_logs_s3_bucket_access_logging_enabled_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,17 +20,19 @@ class Test_cloudtrail_logs_s3_bucket_access_logging_enabled: from prowler.providers.aws.services.s3.s3_service import S3 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.s3_client", new=S3( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ): # Test Check @@ -62,17 +64,19 @@ class Test_cloudtrail_logs_s3_bucket_access_logging_enabled: from prowler.providers.aws.services.s3.s3_service import S3 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.s3_client", new=S3( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ): # Test Check @@ -133,17 +137,19 @@ class Test_cloudtrail_logs_s3_bucket_access_logging_enabled: from prowler.providers.aws.services.s3.s3_service import S3 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.s3_client", new=S3( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ): # Test Check @@ -184,17 +190,19 @@ class Test_cloudtrail_logs_s3_bucket_access_logging_enabled: from prowler.providers.aws.services.s3.s3_service import S3 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.s3_client", new=S3( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ) as s3_client: # Test Check diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_logs_s3_bucket_is_not_publicly_accessible/cloudtrail_logs_s3_bucket_is_not_publicly_accessible_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_logs_s3_bucket_is_not_publicly_accessible/cloudtrail_logs_s3_bucket_is_not_publicly_accessible_test.py index 19655f959e..081772eeb2 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_logs_s3_bucket_is_not_publicly_accessible/cloudtrail_logs_s3_bucket_is_not_publicly_accessible_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_logs_s3_bucket_is_not_publicly_accessible/cloudtrail_logs_s3_bucket_is_not_publicly_accessible_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,17 +20,19 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible: from prowler.providers.aws.services.s3.s3_service import S3 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.s3_client", new=S3( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ): # Test Check @@ -60,17 +62,19 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible: from prowler.providers.aws.services.s3.s3_service import S3 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.s3_client", new=S3( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ): # Test Check @@ -129,17 +133,19 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible: from prowler.providers.aws.services.s3.s3_service import S3 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.s3_client", new=S3( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ): # Test Check @@ -196,17 +202,19 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible: from prowler.providers.aws.services.s3.s3_service import S3 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.s3_client", new=S3( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ): # Test Check @@ -245,17 +253,19 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible: from prowler.providers.aws.services.s3.s3_service import S3 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] + ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_client", new=Cloudtrail( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.cloudtrail_logs_s3_bucket_is_not_publicly_accessible.s3_client", new=S3( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) + set_mocked_aws_provider([AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1]) ), ) as s3_client: # Test Check 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 c53356785f..abbc851c68 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 @@ -4,11 +4,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,17 +19,17 @@ class Test_cloudtrail_multi_region_enabled: Cloudtrail, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled import ( @@ -38,7 +38,7 @@ class Test_cloudtrail_multi_region_enabled: check = cloudtrail_multi_region_enabled() result = check.execute() - assert len(result) == len(current_audit_info.audited_regions) + assert len(result) == len(aws_provider.identity.audited_regions) for report in result: if report.region == AWS_REGION_US_EAST_1: assert report.status == "FAIL" @@ -95,17 +95,17 @@ class Test_cloudtrail_multi_region_enabled: Cloudtrail, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled import ( @@ -114,7 +114,7 @@ class Test_cloudtrail_multi_region_enabled: check = cloudtrail_multi_region_enabled() result = check.execute() - assert len(result) == len(current_audit_info.audited_regions) + assert len(result) == len(aws_provider.identity.audited_regions) for report in result: if report.region == AWS_REGION_US_EAST_1: assert report.status == "FAIL" @@ -173,17 +173,17 @@ class Test_cloudtrail_multi_region_enabled: Cloudtrail, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled import ( @@ -192,7 +192,7 @@ class Test_cloudtrail_multi_region_enabled: check = cloudtrail_multi_region_enabled() result = check.execute() - assert len(result) == len(current_audit_info.audited_regions) + assert len(result) == len(aws_provider.identity.audited_regions) for report in result: if report.resource_id == trail_name_us: assert report.status == "PASS" @@ -250,17 +250,17 @@ class Test_cloudtrail_multi_region_enabled: Cloudtrail, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled.cloudtrail_multi_region_enabled import ( @@ -269,7 +269,7 @@ class Test_cloudtrail_multi_region_enabled: check = cloudtrail_multi_region_enabled() result = check.execute() - assert len(result) == len(current_audit_info.audited_regions) + assert len(result) == len(aws_provider.identity.audited_regions) for report in result: if report.region == AWS_REGION_US_EAST_1: assert report.status == "PASS" diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_multi_region_enabled_logging_management_events/cloudtrail_multi_region_enabled_logging_management_events_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_multi_region_enabled_logging_management_events/cloudtrail_multi_region_enabled_logging_management_events_test.py index 8f32e0c0cd..a0a67f6c53 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_multi_region_enabled_logging_management_events/cloudtrail_multi_region_enabled_logging_management_events_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_multi_region_enabled_logging_management_events/cloudtrail_multi_region_enabled_logging_management_events_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -17,15 +17,15 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events: Cloudtrail, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events import ( @@ -76,15 +76,15 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events: Cloudtrail, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events import ( @@ -133,15 +133,15 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events: Cloudtrail, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events import ( @@ -190,15 +190,15 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events: Cloudtrail, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events import ( @@ -245,15 +245,15 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events: Cloudtrail, ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_multi_region_enabled_logging_management_events.cloudtrail_multi_region_enabled_logging_management_events import ( diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_s3_dataevents_read_enabled/cloudtrail_s3_dataevents_read_enabled_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_s3_dataevents_read_enabled/cloudtrail_s3_dataevents_read_enabled_test.py index 13a151405b..89ac4ed02b 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_s3_dataevents_read_enabled/cloudtrail_s3_dataevents_read_enabled_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_s3_dataevents_read_enabled/cloudtrail_s3_dataevents_read_enabled_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -29,17 +29,17 @@ class Test_cloudtrail_s3_dataevents_read_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() + aws_provider = set_mocked_aws_provider() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import ( @@ -70,18 +70,18 @@ class Test_cloudtrail_s3_dataevents_read_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() - current_audit_info.ignore_unused_services = True + aws_provider = set_mocked_aws_provider() + aws_provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import ( @@ -104,18 +104,18 @@ class Test_cloudtrail_s3_dataevents_read_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() - current_audit_info.ignore_unused_services = True + aws_provider = set_mocked_aws_provider() + aws_provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import ( @@ -169,17 +169,17 @@ class Test_cloudtrail_s3_dataevents_read_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() + aws_provider = set_mocked_aws_provider() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import ( @@ -233,17 +233,17 @@ class Test_cloudtrail_s3_dataevents_read_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() + aws_provider = set_mocked_aws_provider() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import ( @@ -294,17 +294,17 @@ class Test_cloudtrail_s3_dataevents_read_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() + aws_provider = set_mocked_aws_provider() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import ( @@ -361,17 +361,17 @@ class Test_cloudtrail_s3_dataevents_read_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() + aws_provider = set_mocked_aws_provider() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_read_enabled.cloudtrail_s3_dataevents_read_enabled import ( diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_s3_dataevents_write_enabled/cloudtrail_s3_dataevents_write_enabled_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_s3_dataevents_write_enabled/cloudtrail_s3_dataevents_write_enabled_test.py index 379ba1876b..a7f0323b15 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_s3_dataevents_write_enabled/cloudtrail_s3_dataevents_write_enabled_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_s3_dataevents_write_enabled/cloudtrail_s3_dataevents_write_enabled_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -29,17 +29,17 @@ class Test_cloudtrail_s3_dataevents_write_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() + aws_provider = set_mocked_aws_provider() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import ( @@ -93,17 +93,17 @@ class Test_cloudtrail_s3_dataevents_write_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() + aws_provider = set_mocked_aws_provider() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import ( @@ -134,18 +134,18 @@ class Test_cloudtrail_s3_dataevents_write_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() - current_audit_info.ignore_unused_services = True + aws_provider = set_mocked_aws_provider() + aws_provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import ( @@ -167,18 +167,18 @@ class Test_cloudtrail_s3_dataevents_write_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() - current_audit_info.ignore_unused_services = True + aws_provider = set_mocked_aws_provider() + aws_provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import ( @@ -232,17 +232,17 @@ class Test_cloudtrail_s3_dataevents_write_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() + aws_provider = set_mocked_aws_provider() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import ( @@ -292,17 +292,17 @@ class Test_cloudtrail_s3_dataevents_write_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() + aws_provider = set_mocked_aws_provider() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import ( @@ -359,17 +359,17 @@ class Test_cloudtrail_s3_dataevents_write_enabled: ) from prowler.providers.aws.services.s3.s3_service import S3 - current_audit_info = set_mocked_aws_audit_info() + aws_provider = set_mocked_aws_provider() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled.s3_client", - new=S3(current_audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudtrail.cloudtrail_s3_dataevents_write_enabled.cloudtrail_s3_dataevents_write_enabled import ( diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_service_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_service_test.py index 37470b4767..02305ba3c4 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_service_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_service_test.py @@ -2,11 +2,11 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.cloudtrail.cloudtrail_service import Cloudtrail -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -14,38 +14,38 @@ class Test_Cloudtrail_Service: # Test Cloudtrail Service @mock_aws def test_service(self): - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - cloudtrail = Cloudtrail(audit_info) + cloudtrail = Cloudtrail(aws_provider) assert cloudtrail.service == "cloudtrail" # Test Cloudtrail client @mock_aws def test_client(self): - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - cloudtrail = Cloudtrail(audit_info) + cloudtrail = Cloudtrail(aws_provider) for regional_client in cloudtrail.regional_clients.values(): assert regional_client.__class__.__name__ == "CloudTrail" # Test Cloudtrail session @mock_aws def test__get_session__(self): - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - cloudtrail = Cloudtrail(audit_info) + cloudtrail = Cloudtrail(aws_provider) assert cloudtrail.session.__class__.__name__ == "Session" # Test Cloudtrail Session @mock_aws def test_audited_account(self): - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - cloudtrail = Cloudtrail(audit_info) + cloudtrail = Cloudtrail(aws_provider) assert cloudtrail.audited_account == AWS_ACCOUNT_NUMBER @mock_aws @@ -83,10 +83,10 @@ class Test_Cloudtrail_Service: {"Key": "test", "Value": "test"}, ], ) - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - cloudtrail = Cloudtrail(audit_info) + cloudtrail = Cloudtrail(aws_provider) assert len(cloudtrail.trails) == 2 for trail in cloudtrail.trails: if trail.name: @@ -140,11 +140,11 @@ class Test_Cloudtrail_Service: cloudtrail_client_eu_west_1.create_trail( Name=trail_name_eu, S3BucketName=bucket_name_eu, IsMultiRegionTrail=False ) - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - cloudtrail = Cloudtrail(audit_info) - assert len(cloudtrail.trails) == len(audit_info.audited_regions) + cloudtrail = Cloudtrail(aws_provider) + assert len(cloudtrail.trails) == len(aws_provider.identity.audited_regions) for trail in cloudtrail.trails: if trail.name: if trail.name == trail_name_us: @@ -184,11 +184,11 @@ class Test_Cloudtrail_Service: } ], )["EventSelectors"] - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - cloudtrail = Cloudtrail(audit_info) - assert len(cloudtrail.trails) == len(audit_info.audited_regions) + cloudtrail = Cloudtrail(aws_provider) + assert len(cloudtrail.trails) == len(aws_provider.identity.audited_regions) for trail in cloudtrail.trails: if trail.name: if trail.name == trail_name_us: @@ -232,11 +232,11 @@ class Test_Cloudtrail_Service: }, ], )["AdvancedEventSelectors"] - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - cloudtrail = Cloudtrail(audit_info) - assert len(cloudtrail.trails) == len(audit_info.audited_regions) + cloudtrail = Cloudtrail(aws_provider) + assert len(cloudtrail.trails) == len(aws_provider.identity.audited_regions) for trail in cloudtrail.trails: if trail.name: if trail.name == trail_name_us: diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_acls_alarm_configured/cloudwatch_changes_to_network_acls_alarm_configured_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_acls_alarm_configured/cloudwatch_changes_to_network_acls_alarm_configured_test.py index 6b0d63ecf0..8b45c232fc 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_acls_alarm_configured/cloudwatch_changes_to_network_acls_alarm_configured_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_acls_alarm_configured/cloudwatch_changes_to_network_acls_alarm_configured_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import ( @@ -85,13 +85,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -100,17 +100,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import ( @@ -154,13 +154,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -169,17 +169,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import ( @@ -235,13 +235,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -250,17 +250,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import ( @@ -328,13 +328,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -343,17 +343,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import ( @@ -421,13 +421,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -436,17 +436,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import ( @@ -514,13 +514,13 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -529,17 +529,17 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_acls_alarm_configured.cloudwatch_changes_to_network_acls_alarm_configured import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_gateways_alarm_configured/cloudwatch_changes_to_network_gateways_alarm_configured_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_gateways_alarm_configured/cloudwatch_changes_to_network_gateways_alarm_configured_test.py index 83f2eaaac9..33cded7dcd 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_gateways_alarm_configured/cloudwatch_changes_to_network_gateways_alarm_configured_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_gateways_alarm_configured/cloudwatch_changes_to_network_gateways_alarm_configured_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import ( @@ -85,13 +85,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -100,17 +100,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import ( @@ -154,13 +154,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -169,17 +169,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import ( @@ -235,13 +235,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -250,17 +250,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import ( @@ -328,13 +328,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -343,17 +343,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import ( @@ -421,13 +421,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -436,17 +436,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import ( @@ -514,13 +514,13 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -529,17 +529,17 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_gateways_alarm_configured.cloudwatch_changes_to_network_gateways_alarm_configured import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_route_tables_alarm_configured/cloudwatch_changes_to_network_route_tables_alarm_configured_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_route_tables_alarm_configured/cloudwatch_changes_to_network_route_tables_alarm_configured_test.py index beba23b4b5..a00bae4986 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_route_tables_alarm_configured/cloudwatch_changes_to_network_route_tables_alarm_configured_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_route_tables_alarm_configured/cloudwatch_changes_to_network_route_tables_alarm_configured_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import ( @@ -85,13 +85,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -100,17 +100,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import ( @@ -154,13 +154,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -169,17 +169,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import ( @@ -235,13 +235,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -250,17 +250,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import ( @@ -328,13 +328,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -343,17 +343,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import ( @@ -421,13 +421,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -436,17 +436,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import ( @@ -514,13 +514,13 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -529,17 +529,17 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_network_route_tables_alarm_configured.cloudwatch_changes_to_network_route_tables_alarm_configured import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_vpcs_alarm_configured/cloudwatch_changes_to_vpcs_alarm_configured_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_vpcs_alarm_configured/cloudwatch_changes_to_vpcs_alarm_configured_test.py index 70c5215c15..91408d15c5 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_vpcs_alarm_configured/cloudwatch_changes_to_vpcs_alarm_configured_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_changes_to_vpcs_alarm_configured/cloudwatch_changes_to_vpcs_alarm_configured_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import ( @@ -85,13 +85,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -100,17 +100,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import ( @@ -154,13 +154,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -169,17 +169,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import ( @@ -235,13 +235,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -250,17 +250,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import ( @@ -328,13 +328,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -343,17 +343,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import ( @@ -421,13 +421,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -436,17 +436,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import ( @@ -514,13 +514,13 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -529,17 +529,17 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_changes_to_vpcs_alarm_configured.cloudwatch_changes_to_vpcs_alarm_configured import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_cross_account_sharing_disabled/cloudwatch_cross_account_sharing_disabled_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_cross_account_sharing_disabled/cloudwatch_cross_account_sharing_disabled_test.py index 9655786863..c37bd7930d 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_cross_account_sharing_disabled/cloudwatch_cross_account_sharing_disabled_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_cross_account_sharing_disabled/cloudwatch_cross_account_sharing_disabled_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -16,13 +16,13 @@ class Test_cloudwatch_cross_account_sharing_disabled: def test_cloudwatch_without_cross_account_role(self): from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -31,11 +31,11 @@ class Test_cloudwatch_cross_account_sharing_disabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_cross_account_sharing_disabled.cloudwatch_cross_account_sharing_disabled.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_cross_account_sharing_disabled.cloudwatch_cross_account_sharing_disabled import ( @@ -63,13 +63,13 @@ class Test_cloudwatch_cross_account_sharing_disabled: ) from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -78,11 +78,11 @@ class Test_cloudwatch_cross_account_sharing_disabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_cross_account_sharing_disabled.cloudwatch_cross_account_sharing_disabled.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_cross_account_sharing_disabled.cloudwatch_cross_account_sharing_disabled import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_group_kms_encryption_enabled/cloudwatch_log_group_kms_encryption_enabled_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_group_kms_encryption_enabled/cloudwatch_log_group_kms_encryption_enabled_test.py index 106c309448..06246d4283 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_group_kms_encryption_enabled/cloudwatch_log_group_kms_encryption_enabled_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_group_kms_encryption_enabled/cloudwatch_log_group_kms_encryption_enabled_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -14,13 +14,13 @@ class Test_cloudwatch_log_group_kms_encryption_enabled: def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -29,11 +29,11 @@ class Test_cloudwatch_log_group_kms_encryption_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_kms_encryption_enabled.cloudwatch_log_group_kms_encryption_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_kms_encryption_enabled.cloudwatch_log_group_kms_encryption_enabled import ( @@ -56,13 +56,13 @@ class Test_cloudwatch_log_group_kms_encryption_enabled: from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -71,11 +71,11 @@ class Test_cloudwatch_log_group_kms_encryption_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_kms_encryption_enabled.cloudwatch_log_group_kms_encryption_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_kms_encryption_enabled.cloudwatch_log_group_kms_encryption_enabled import ( @@ -102,13 +102,13 @@ class Test_cloudwatch_log_group_kms_encryption_enabled: from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -117,11 +117,11 @@ class Test_cloudwatch_log_group_kms_encryption_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_kms_encryption_enabled.cloudwatch_log_group_kms_encryption_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_kms_encryption_enabled.cloudwatch_log_group_kms_encryption_enabled import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_group_no_secrets_in_logs/cloudwatch_log_group_no_secrets_in_logs_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_group_no_secrets_in_logs/cloudwatch_log_group_no_secrets_in_logs_test.py index eeb6720c01..b253c97d29 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_group_no_secrets_in_logs/cloudwatch_log_group_no_secrets_in_logs_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_group_no_secrets_in_logs/cloudwatch_log_group_no_secrets_in_logs_test.py @@ -5,10 +5,10 @@ from boto3 import client from moto import mock_aws from moto.core.utils import unix_time_millis -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -16,13 +16,13 @@ class Test_cloudwatch_log_group_no_secrets_in_logs: def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -31,11 +31,11 @@ class Test_cloudwatch_log_group_no_secrets_in_logs: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_no_secrets_in_logs.cloudwatch_log_group_no_secrets_in_logs.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_no_secrets_in_logs.cloudwatch_log_group_no_secrets_in_logs import ( @@ -66,13 +66,13 @@ class Test_cloudwatch_log_group_no_secrets_in_logs: ) from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -81,11 +81,11 @@ class Test_cloudwatch_log_group_no_secrets_in_logs: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_no_secrets_in_logs.cloudwatch_log_group_no_secrets_in_logs.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_no_secrets_in_logs.cloudwatch_log_group_no_secrets_in_logs import ( @@ -119,13 +119,13 @@ class Test_cloudwatch_log_group_no_secrets_in_logs: ) from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -134,11 +134,11 @@ class Test_cloudwatch_log_group_no_secrets_in_logs: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_no_secrets_in_logs.cloudwatch_log_group_no_secrets_in_logs.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_no_secrets_in_logs.cloudwatch_log_group_no_secrets_in_logs import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_group_retention_policy_specific_days_enabled/cloudwatch_log_group_retention_policy_specific_days_enabled_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_group_retention_policy_specific_days_enabled/cloudwatch_log_group_retention_policy_specific_days_enabled_test.py index ba77b98489..cd17a773fb 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_group_retention_policy_specific_days_enabled/cloudwatch_log_group_retention_policy_specific_days_enabled_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_group_retention_policy_specific_days_enabled/cloudwatch_log_group_retention_policy_specific_days_enabled_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -15,14 +15,14 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled: def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - current_audit_info.audit_config = {"log_group_retention_days": 365} + aws_provider._audit_config = {"log_group_retention_days": 365} from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -31,11 +31,11 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled import ( @@ -57,14 +57,14 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled: ) from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - current_audit_info.audit_config = {"log_group_retention_days": 365} + aws_provider._audit_config = {"log_group_retention_days": 365} from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -73,11 +73,11 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled import ( @@ -111,14 +111,14 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled: logs_client.put_retention_policy(logGroupName="test", retentionInDays=400) from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - current_audit_info.audit_config = {"log_group_retention_days": 365} + aws_provider._audit_config = {"log_group_retention_days": 365} from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -127,11 +127,11 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled import ( @@ -165,14 +165,14 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled: logs_client.put_retention_policy(logGroupName="test", retentionInDays=7) from prowler.providers.aws.services.cloudwatch.cloudwatch_service import Logs - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - current_audit_info.audit_config = {"log_group_retention_days": 365} + aws_provider._audit_config = {"log_group_retention_days": 365} from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -181,11 +181,11 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_group_retention_policy_specific_days_enabled.cloudwatch_log_group_retention_policy_specific_days_enabled import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled_test.py index 65c306e558..9374aca3bf 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import ( @@ -87,13 +87,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -102,17 +102,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import ( @@ -158,13 +158,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -173,17 +173,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import ( @@ -241,13 +241,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -256,17 +256,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import ( @@ -336,13 +336,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -351,17 +351,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import ( @@ -431,13 +431,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -446,17 +446,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import ( @@ -526,13 +526,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -541,17 +541,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled_test.py index 270d74aca9..0a01d15c14 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import ( @@ -87,13 +87,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -102,17 +102,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import ( @@ -158,13 +158,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -173,17 +173,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import ( @@ -241,13 +241,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -256,17 +256,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import ( @@ -336,13 +336,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -351,17 +351,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import ( @@ -431,13 +431,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -446,17 +446,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import ( @@ -526,13 +526,13 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -541,17 +541,17 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_authentication_failures/cloudwatch_log_metric_filter_authentication_failures_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_authentication_failures/cloudwatch_log_metric_filter_authentication_failures_test.py index d530a9b535..d0da5e07d5 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_authentication_failures/cloudwatch_log_metric_filter_authentication_failures_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_authentication_failures/cloudwatch_log_metric_filter_authentication_failures_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import ( @@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import ( @@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import ( @@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import ( @@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import ( @@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import ( @@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_authentication_failures.cloudwatch_log_metric_filter_authentication_failures import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_aws_organizations_changes/cloudwatch_log_metric_filter_aws_organizations_changes_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_aws_organizations_changes/cloudwatch_log_metric_filter_aws_organizations_changes_test.py index 7a71c67d41..95a2d16639 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_aws_organizations_changes/cloudwatch_log_metric_filter_aws_organizations_changes_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_aws_organizations_changes/cloudwatch_log_metric_filter_aws_organizations_changes_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import ( @@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import ( @@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import ( @@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import ( @@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import ( @@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import ( @@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_aws_organizations_changes.cloudwatch_log_metric_filter_aws_organizations_changes import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk_test.py index a97687e6b6..b549b5a878 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import ( @@ -87,13 +87,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -102,17 +102,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import ( @@ -158,13 +158,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -173,17 +173,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import ( @@ -241,13 +241,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -256,17 +256,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import ( @@ -336,13 +336,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -351,17 +351,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import ( @@ -431,13 +431,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -446,17 +446,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import ( @@ -526,13 +526,13 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -541,17 +541,17 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes_test.py index af7eddc5ff..d291161a1d 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import ( @@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import ( @@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import ( @@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import ( @@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import ( @@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import ( @@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.cloudwatch_log_metric_filter_for_s3_bucket_policy_changes import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_policy_changes/cloudwatch_log_metric_filter_policy_changes_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_policy_changes/cloudwatch_log_metric_filter_policy_changes_test.py index e976f31677..931f99b055 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_policy_changes/cloudwatch_log_metric_filter_policy_changes_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_policy_changes/cloudwatch_log_metric_filter_policy_changes_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import ( @@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import ( @@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import ( @@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import ( @@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import ( @@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import ( @@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_policy_changes.cloudwatch_log_metric_filter_policy_changes import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_root_usage/cloudwatch_log_metric_filter_root_usage_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_root_usage/cloudwatch_log_metric_filter_root_usage_test.py index 1c692e11f7..00f85fff1b 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_root_usage/cloudwatch_log_metric_filter_root_usage_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_root_usage/cloudwatch_log_metric_filter_root_usage_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_root_usage: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_root_usage: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import ( @@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_root_usage: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_root_usage: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import ( @@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_root_usage: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_root_usage: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import ( @@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_root_usage: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_root_usage: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import ( @@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_root_usage: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_root_usage: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import ( @@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_root_usage: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_root_usage: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import ( @@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_root_usage: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_root_usage: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_root_usage.cloudwatch_log_metric_filter_root_usage import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_security_group_changes/cloudwatch_log_metric_filter_security_group_changes_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_security_group_changes/cloudwatch_log_metric_filter_security_group_changes_test.py index 8a6d77e715..90fb928774 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_security_group_changes/cloudwatch_log_metric_filter_security_group_changes_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_security_group_changes/cloudwatch_log_metric_filter_security_group_changes_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import ( @@ -86,13 +86,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -101,17 +101,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import ( @@ -156,13 +156,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -171,17 +171,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import ( @@ -238,13 +238,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -253,17 +253,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import ( @@ -331,13 +331,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -346,17 +346,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import ( @@ -424,13 +424,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -439,17 +439,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import ( @@ -517,13 +517,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -532,17 +532,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_security_group_changes.cloudwatch_log_metric_filter_security_group_changes import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_sign_in_without_mfa/cloudwatch_log_metric_filter_sign_in_without_mfa_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_sign_in_without_mfa/cloudwatch_log_metric_filter_sign_in_without_mfa_test.py index bf26879fe3..44108314bb 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_sign_in_without_mfa/cloudwatch_log_metric_filter_sign_in_without_mfa_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_sign_in_without_mfa/cloudwatch_log_metric_filter_sign_in_without_mfa_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import ( @@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import ( @@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import ( @@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import ( @@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import ( @@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import ( @@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_sign_in_without_mfa.cloudwatch_log_metric_filter_sign_in_without_mfa import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_unauthorized_api_calls/cloudwatch_log_metric_filter_unauthorized_api_calls_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_unauthorized_api_calls/cloudwatch_log_metric_filter_unauthorized_api_calls_test.py index 1240d2309c..c386951b87 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_unauthorized_api_calls/cloudwatch_log_metric_filter_unauthorized_api_calls_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_unauthorized_api_calls/cloudwatch_log_metric_filter_unauthorized_api_calls_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,13 +22,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -37,17 +37,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import ( @@ -85,13 +85,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -100,17 +100,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import ( @@ -154,13 +154,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -169,17 +169,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import ( @@ -235,13 +235,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -250,17 +250,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import ( @@ -328,13 +328,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -343,17 +343,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import ( @@ -421,13 +421,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -436,17 +436,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import ( @@ -514,13 +514,13 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: Logs, ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) from prowler.providers.common.models import Audit_Metadata - current_audit_info.audit_metadata = Audit_Metadata( + aws_provider.audit_metadata = Audit_Metadata( services_scanned=0, # We need to set this check to call __describe_log_groups__ expected_checks=["cloudwatch_log_group_no_secrets_in_logs"], @@ -529,17 +529,17 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.logs_client", - new=Logs(current_audit_info), + new=Logs(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_client", - new=CloudWatch(current_audit_info), + new=CloudWatch(aws_provider), ), mock.patch( "prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudtrail_client", - new=Cloudtrail(current_audit_info), + new=Cloudtrail(aws_provider), ): # Test Check from prowler.providers.aws.services.cloudwatch.cloudwatch_log_metric_filter_unauthorized_api_calls.cloudwatch_log_metric_filter_unauthorized_api_calls import ( diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_service_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_service_test.py index b339c6c06e..5f44b7c877 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_service_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_service_test.py @@ -5,10 +5,10 @@ from prowler.providers.aws.services.cloudwatch.cloudwatch_service import ( CloudWatch, Logs, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -17,20 +17,20 @@ class Test_CloudWatch_Service: @mock_aws def test_service(self): # CloudWatch client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( expected_checks=["cloudwatch_log_group_no_secrets_in_logs"] ) - cloudwatch = CloudWatch(audit_info) + cloudwatch = CloudWatch(aws_provider) assert cloudwatch.service == "cloudwatch" # Test CloudWatch Client @mock_aws def test_client(self): # CloudWatch client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( expected_checks=["cloudwatch_log_group_no_secrets_in_logs"] ) - cloudwatch = CloudWatch(audit_info) + cloudwatch = CloudWatch(aws_provider) for client_ in cloudwatch.regional_clients.values(): assert client_.__class__.__name__ == "CloudWatch" @@ -38,40 +38,40 @@ class Test_CloudWatch_Service: @mock_aws def test__get_session__(self): # CloudWatch client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( expected_checks=["cloudwatch_log_group_no_secrets_in_logs"] ) - cloudwatch = CloudWatch(audit_info) + cloudwatch = CloudWatch(aws_provider) assert cloudwatch.session.__class__.__name__ == "Session" # Test CloudWatch Session @mock_aws def test_audited_account(self): # CloudWatch client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( expected_checks=["cloudwatch_log_group_no_secrets_in_logs"] ) - cloudwatch = CloudWatch(audit_info) + cloudwatch = CloudWatch(aws_provider) assert cloudwatch.audited_account == AWS_ACCOUNT_NUMBER # Test Logs Service @mock_aws def test_logs_service(self): # Logs client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( expected_checks=["cloudwatch_log_group_no_secrets_in_logs"] ) - logs = Logs(audit_info) + logs = Logs(aws_provider) assert logs.service == "logs" # Test Logs Client @mock_aws def test_logs_client(self): # Logs client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( expected_checks=["cloudwatch_log_group_no_secrets_in_logs"] ) - logs = Logs(audit_info) + logs = Logs(aws_provider) for client_ in logs.regional_clients.values(): assert client_.__class__.__name__ == "CloudWatchLogs" @@ -79,20 +79,20 @@ class Test_CloudWatch_Service: @mock_aws def test__logs_get_session__(self): # Logs client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( expected_checks=["cloudwatch_log_group_no_secrets_in_logs"] ) - logs = Logs(audit_info) + logs = Logs(aws_provider) assert logs.session.__class__.__name__ == "Session" # Test Logs Session @mock_aws def test_logs_audited_account(self): # Logs client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( expected_checks=["cloudwatch_log_group_no_secrets_in_logs"] ) - logs = Logs(audit_info) + logs = Logs(aws_provider) assert logs.audited_account == AWS_ACCOUNT_NUMBER # Test CloudWatch Alarms @@ -117,10 +117,10 @@ class Test_CloudWatch_Service: Unit="Seconds", Tags=[{"Key": "key-1", "Value": "value-1"}], ) - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( expected_checks=["cloudwatch_log_group_no_secrets_in_logs"] ) - cloudwatch = CloudWatch(audit_info) + cloudwatch = CloudWatch(aws_provider) assert len(cloudwatch.metric_alarms) == 1 assert ( cloudwatch.metric_alarms[0].arn @@ -151,10 +151,10 @@ class Test_CloudWatch_Service: } ], ) - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( expected_checks=["cloudwatch_log_group_no_secrets_in_logs"] ) - logs = Logs(audit_info) + logs = Logs(aws_provider) assert len(logs.metric_filters) == 1 assert logs.metric_filters[0].log_group == "/log-group/test" assert logs.metric_filters[0].name == "test-filter" @@ -175,10 +175,10 @@ class Test_CloudWatch_Service: logs_client.put_retention_policy( logGroupName="/log-group/test", retentionInDays=400 ) - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( expected_checks=["cloudwatch_log_group_no_secrets_in_logs"] ) - logs = Logs(audit_info) + logs = Logs(aws_provider) assert len(logs.log_groups) == 1 assert ( logs.log_groups[0].arn @@ -203,10 +203,10 @@ class Test_CloudWatch_Service: tags={"tag_key_1": "tag_value_1", "tag_key_2": "tag_value_2"}, ) - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( expected_checks=["cloudwatch_log_group_no_secrets_in_logs"] ) - logs = Logs(audit_info) + logs = Logs(aws_provider) assert len(logs.log_groups) == 1 assert ( logs.log_groups[0].arn diff --git a/tests/providers/aws/services/codeartifact/codeartifact_packages_external_public_publishing_disabled/codeartifact_packages_external_public_publishing_disabled_test.py b/tests/providers/aws/services/codeartifact/codeartifact_packages_external_public_publishing_disabled/codeartifact_packages_external_public_publishing_disabled_test.py index 4e652ceefd..9fb655b21a 100644 --- a/tests/providers/aws/services/codeartifact/codeartifact_packages_external_public_publishing_disabled/codeartifact_packages_external_public_publishing_disabled_test.py +++ b/tests/providers/aws/services/codeartifact/codeartifact_packages_external_public_publishing_disabled/codeartifact_packages_external_public_publishing_disabled_test.py @@ -11,7 +11,7 @@ from prowler.providers.aws.services.codeartifact.codeartifact_service import ( Restrictions, RestrictionValues, ) -from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER AWS_REGION = "eu-west-1" diff --git a/tests/providers/aws/services/codeartifact/codeartifact_service_test.py b/tests/providers/aws/services/codeartifact/codeartifact_service_test.py index 94326d59ef..766009e8b0 100644 --- a/tests/providers/aws/services/codeartifact/codeartifact_service_test.py +++ b/tests/providers/aws/services/codeartifact/codeartifact_service_test.py @@ -8,11 +8,11 @@ from prowler.providers.aws.services.codeartifact.codeartifact_service import ( OriginInformationValues, RestrictionValues, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking Access Analyzer Calls @@ -86,8 +86,8 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -97,14 +97,14 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_CodeArtifact_Service: # Test CodeArtifact Client def test__get_client__(self): codeartifact = CodeArtifact( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert ( codeartifact.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ @@ -114,21 +114,21 @@ class Test_CodeArtifact_Service: # Test CodeArtifact Session def test__get_session__(self): codeartifact = CodeArtifact( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert codeartifact.session.__class__.__name__ == "Session" # Test CodeArtifact Service def test__get_service__(self): codeartifact = CodeArtifact( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert codeartifact.service == "codeartifact" def test__list_repositories__(self): # Set partition for the service codeartifact = CodeArtifact( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert len(codeartifact.repositories) == 1 diff --git a/tests/providers/aws/services/codebuild/codebuild_service_test.py b/tests/providers/aws/services/codebuild/codebuild_service_test.py index a3c600ff42..350e923e7b 100644 --- a/tests/providers/aws/services/codebuild/codebuild_service_test.py +++ b/tests/providers/aws/services/codebuild/codebuild_service_test.py @@ -4,10 +4,7 @@ from unittest.mock import patch import botocore from prowler.providers.aws.services.codebuild.codebuild_service import Codebuild -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider # last time invoked time last_invoked_time = datetime.now() - timedelta(days=2) @@ -38,8 +35,8 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -48,28 +45,28 @@ def mock_generate_regional_clients(service, audit_info): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_Codebuild_Service: # Test Codebuild Session def test__get_session__(self): - codebuild = Codebuild(set_mocked_aws_audit_info()) + codebuild = Codebuild(set_mocked_aws_provider()) assert codebuild.session.__class__.__name__ == "Session" # Test Codebuild Service def test__get_service__(self): - codebuild = Codebuild(set_mocked_aws_audit_info()) + codebuild = Codebuild(set_mocked_aws_provider()) assert codebuild.service == "codebuild" def test__list_projects__(self): - codebuild = Codebuild(set_mocked_aws_audit_info()) + codebuild = Codebuild(set_mocked_aws_provider()) assert len(codebuild.projects) == 1 assert codebuild.projects[0].name == "test" assert codebuild.projects[0].region == AWS_REGION_EU_WEST_1 def test__list_builds_for_project__(self): - codebuild = Codebuild(set_mocked_aws_audit_info()) + codebuild = Codebuild(set_mocked_aws_provider()) assert len(codebuild.projects) == 1 assert codebuild.projects[0].name == "test" assert codebuild.projects[0].region == AWS_REGION_EU_WEST_1 diff --git a/tests/providers/aws/services/cognito/cognito_service_test.py b/tests/providers/aws/services/cognito/cognito_service_test.py index 6128c0700d..ac9fd19169 100644 --- a/tests/providers/aws/services/cognito/cognito_service_test.py +++ b/tests/providers/aws/services/cognito/cognito_service_test.py @@ -2,11 +2,11 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.cognito.cognito_service import CognitoIDP -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -14,52 +14,52 @@ class Test_Cognito_Service: # Test Cognito Service @mock_aws def test_service(self): - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - cognito = CognitoIDP(audit_info) + cognito = CognitoIDP(aws_provider) assert cognito.service == "cognito-idp" # Test Cognito client @mock_aws def test_client(self): - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - cognito = CognitoIDP(audit_info) + cognito = CognitoIDP(aws_provider) for regional_client in cognito.regional_clients.values(): assert regional_client.__class__.__name__ == "CognitoIdentityProvider" # Test Cognito session @mock_aws def test__get_session__(self): - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - cognito = CognitoIDP(audit_info) + cognito = CognitoIDP(aws_provider) assert cognito.session.__class__.__name__ == "Session" # Test Cognito Session @mock_aws def test_audited_account(self): - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - cognito = CognitoIDP(audit_info) + cognito = CognitoIDP(aws_provider) assert cognito.audited_account == AWS_ACCOUNT_NUMBER @mock_aws def test_list_user_pools(self): user_pool_name_1 = "user_pool_test_1" user_pool_name_2 = "user_pool_test_2" - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) cognito_client_eu_west_1 = client("cognito-idp", region_name="eu-west-1") cognito_client_us_east_1 = client("cognito-idp", region_name="us-east-1") cognito_client_eu_west_1.create_user_pool(PoolName=user_pool_name_1) cognito_client_us_east_1.create_user_pool(PoolName=user_pool_name_2) - cognito = CognitoIDP(audit_info) + cognito = CognitoIDP(aws_provider) assert len(cognito.user_pools) == 2 for user_pool in cognito.user_pools.values(): assert ( @@ -70,14 +70,14 @@ class Test_Cognito_Service: @mock_aws def test_describe_user_pools(self): user_pool_name_1 = "user_pool_test_1" - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) cognito_client_eu_west_1 = client("cognito-idp", region_name="eu-west-1") user_pool_id = cognito_client_eu_west_1.create_user_pool( PoolName=user_pool_name_1 )["UserPool"]["Id"] - cognito = CognitoIDP(audit_info) + cognito = CognitoIDP(aws_provider) assert len(cognito.user_pools) == 1 for user_pool in cognito.user_pools.values(): assert user_pool.name == user_pool_name_1 @@ -91,7 +91,7 @@ class Test_Cognito_Service: @mock_aws def test_get_user_pool_mfa_config(self): user_pool_name_1 = "user_pool_test_1" - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) cognito_client_eu_west_1 = client("cognito-idp", region_name="eu-west-1") @@ -103,7 +103,7 @@ class Test_Cognito_Service: SoftwareTokenMfaConfiguration={"Enabled": True}, MfaConfiguration="ON", ) - cognito = CognitoIDP(audit_info) + cognito = CognitoIDP(aws_provider) assert len(cognito.user_pools) == 1 for user_pool in cognito.user_pools.values(): assert user_pool.name == user_pool_name_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 a5913e0e02..d0dec52d20 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 @@ -3,12 +3,12 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_SOUTH_2, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -17,16 +17,16 @@ class Test_config_recorder_all_regions_enabled: def test_config_no_recorders(self): from prowler.providers.aws.services.config.config_service import Config - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled.config_client", - new=Config(current_audit_info), + new=Config(aws_provider), ): # Test Check from prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled import ( @@ -72,14 +72,14 @@ class Test_config_recorder_all_regions_enabled: ) from prowler.providers.aws.services.config.config_service import Config - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled.config_client", - new=Config(current_audit_info), + new=Config(aws_provider), ): # Test Check from prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled import ( @@ -119,14 +119,14 @@ class Test_config_recorder_all_regions_enabled: config_client.start_configuration_recorder(ConfigurationRecorderName="default") from prowler.providers.aws.services.config.config_service import Config - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled.config_client", - new=Config(current_audit_info), + new=Config(aws_provider), ): # Test Check from prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled import ( @@ -152,7 +152,7 @@ class Test_config_recorder_all_regions_enabled: assert recorder.region == AWS_REGION_US_EAST_1 @mock_aws - def test_config_one_recorder_disabled_allowlisted(self): + def test_config_one_recorder_disabled_muted(self): # Create Config Mocked Resources config_client = client("config", region_name=AWS_REGION_US_EAST_1) # Create Config Recorder @@ -161,18 +161,18 @@ class Test_config_recorder_all_regions_enabled: ) from prowler.providers.aws.services.config.config_service import Config - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=[AWS_REGION_EU_SOUTH_2, AWS_REGION_US_EAST_1], profile_region=AWS_REGION_EU_SOUTH_2, - audit_config={"allowlist_non_default_regions": True}, + audit_config={"mute_non_default_regions": True}, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled.config_client", - new=Config(current_audit_info), + new=Config(aws_provider), ): # Test Check from prowler.providers.aws.services.config.config_recorder_all_regions_enabled.config_recorder_all_regions_enabled import ( @@ -185,7 +185,7 @@ class Test_config_recorder_all_regions_enabled: # Search for the recorder just created for recorder in result: if recorder.region == AWS_REGION_US_EAST_1: - assert recorder.status == "WARNING" + assert recorder.status == "MUTED" assert ( recorder.status_extended == f"AWS Config recorder {AWS_ACCOUNT_NUMBER} is disabled." diff --git a/tests/providers/aws/services/config/config_service_test.py b/tests/providers/aws/services/config/config_service_test.py index 45606d9db9..07cd69fefd 100644 --- a/tests/providers/aws/services/config/config_service_test.py +++ b/tests/providers/aws/services/config/config_service_test.py @@ -2,11 +2,11 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.config.config_service import Config -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -15,20 +15,20 @@ class Test_Config_Service: @mock_aws def test_service(self): # Config client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - config = Config(audit_info) + config = Config(aws_provider) assert config.service == "config" # Test Config Client @mock_aws def test_client(self): # Config client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - config = Config(audit_info) + config = Config(aws_provider) for regional_client in config.regional_clients.values(): assert regional_client.__class__.__name__ == "ConfigService" @@ -36,20 +36,20 @@ class Test_Config_Service: @mock_aws def test__get_session__(self): # Config client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - config = Config(audit_info) + config = Config(aws_provider) assert config.session.__class__.__name__ == "Session" # Test Config Session @mock_aws def test_audited_account(self): # Config client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - config = Config(audit_info) + config = Config(aws_provider) assert config.audited_account == AWS_ACCOUNT_NUMBER # Test Config Get Rest APIs @@ -67,10 +67,10 @@ class Test_Config_Service: ) config_client.start_configuration_recorder(ConfigurationRecorderName="default") # Config client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - config = Config(audit_info) + config = Config(aws_provider) # One recorder per region assert len(config.recorders) == 2 # Check the active one diff --git a/tests/providers/aws/services/directoryservice/directoryservice_directory_monitor_notifications/directoryservice_directory_monitor_notifications_test.py b/tests/providers/aws/services/directoryservice/directoryservice_directory_monitor_notifications/directoryservice_directory_monitor_notifications_test.py index ca7e02c19a..129ec09634 100644 --- a/tests/providers/aws/services/directoryservice/directoryservice_directory_monitor_notifications/directoryservice_directory_monitor_notifications_test.py +++ b/tests/providers/aws/services/directoryservice/directoryservice_directory_monitor_notifications/directoryservice_directory_monitor_notifications_test.py @@ -7,7 +7,7 @@ from prowler.providers.aws.services.directoryservice.directoryservice_service im EventTopics, EventTopicStatus, ) -from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_NUMBER +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER AWS_REGION = "eu-west-1" diff --git a/tests/providers/aws/services/directoryservice/directoryservice_service_test.py b/tests/providers/aws/services/directoryservice/directoryservice_service_test.py index bde1964f39..e6a031c3b1 100644 --- a/tests/providers/aws/services/directoryservice/directoryservice_service_test.py +++ b/tests/providers/aws/services/directoryservice/directoryservice_service_test.py @@ -13,11 +13,11 @@ from prowler.providers.aws.services.directoryservice.directoryservice_service im EventTopicStatus, RadiusStatus, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking Access Analyzer Calls @@ -103,8 +103,8 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -114,7 +114,7 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_DirectoryService_Service: @@ -122,7 +122,7 @@ class Test_DirectoryService_Service: @mock_aws def test__get_client__(self): directoryservice = DirectoryService( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert ( directoryservice.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ @@ -133,7 +133,7 @@ class Test_DirectoryService_Service: @mock_aws def test__get_session__(self): directoryservice = DirectoryService( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert directoryservice.session.__class__.__name__ == "Session" @@ -141,7 +141,7 @@ class Test_DirectoryService_Service: @mock_aws def test__get_service__(self): directoryservice = DirectoryService( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert directoryservice.service == "ds" @@ -149,7 +149,7 @@ class Test_DirectoryService_Service: def test__describe_directories__(self): # Set partition for the service directoryservice = DirectoryService( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) # __describe_directories__ 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 c06860f826..1b8ead85cf 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 @@ -4,11 +4,11 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.dlm.dlm_service import LifecyclePolicy -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) LIFECYCLE_POLICY_ID = "policy-XXXXXXXXXXXX" @@ -23,7 +23,7 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists: dlm_client.audited_account_arn = AWS_ACCOUNT_ARN dlm_client.lifecycle_policies = {} - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -31,11 +31,11 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists: "prowler.providers.aws.services.dlm.dlm_service.DLM", new=dlm_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_service.EC2", - return_value=EC2(audit_info), + return_value=EC2(aws_provider), ) as ec2_client, mock.patch( "prowler.providers.aws.services.ec2.ec2_client.ec2_client", new=ec2_client, @@ -91,16 +91,16 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists: 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]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.ec2.ec2_service import EC2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.dlm.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_ebs_snapshot_lifecycle_policy_exists.ec2_client", - new=EC2(audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.dlm.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_client", new=dlm_client, @@ -152,16 +152,16 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists: # from prowler.providers.aws.services.ec2.ec2_service import EC2 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.ec2.ec2_service import EC2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.dlm.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_ebs_snapshot_lifecycle_policy_exists.ec2_client", - new=EC2(audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.dlm.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_client", new=dlm_client, @@ -193,16 +193,16 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists: # from prowler.providers.aws.services.ec2.ec2_service import EC2 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.ec2.ec2_service import EC2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.dlm.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_ebs_snapshot_lifecycle_policy_exists.ec2_client", - new=EC2(audit_info), + new=EC2(aws_provider), ) as ec2_client, mock.patch( "prowler.providers.aws.services.dlm.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_ebs_snapshot_lifecycle_policy_exists.dlm_client", new=dlm_client, diff --git a/tests/providers/aws/services/dlm/dlm_service_test.py b/tests/providers/aws/services/dlm/dlm_service_test.py index 42a354800f..38307c508c 100644 --- a/tests/providers/aws/services/dlm/dlm_service_test.py +++ b/tests/providers/aws/services/dlm/dlm_service_test.py @@ -2,10 +2,10 @@ import botocore from mock import patch from prowler.providers.aws.services.dlm.dlm_service import DLM, LifecyclePolicy -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) LIFECYCLE_POLICY_ID = "policy-XXXXXXXXXXXX" @@ -38,8 +38,8 @@ def mock_make_api_call(self, operation_name, kwargs): return make_api_call(self, operation_name, kwargs) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -47,7 +47,7 @@ def mock_generate_regional_clients(service, audit_info): @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) # Patch every AWS call using Boto3 @@ -55,33 +55,33 @@ def mock_generate_regional_clients(service, audit_info): class Test_DLM_Service: # Test DLM Service def test_service(self): - audit_info = set_mocked_aws_audit_info() - dlm = DLM(audit_info) + aws_provider = set_mocked_aws_provider() + dlm = DLM(aws_provider) assert dlm.service == "dlm" # Test DLM Client def test_client(self): - audit_info = set_mocked_aws_audit_info() - dlm = DLM(audit_info) + aws_provider = set_mocked_aws_provider() + dlm = DLM(aws_provider) assert dlm.client.__class__.__name__ == "DLM" # Test DLM Session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info() - dlm = DLM(audit_info) + aws_provider = set_mocked_aws_provider() + dlm = DLM(aws_provider) assert dlm.session.__class__.__name__ == "Session" # Test DLM Session def test_audited_account(self): - audit_info = set_mocked_aws_audit_info() - dlm = DLM(audit_info) + aws_provider = set_mocked_aws_provider() + dlm = DLM(aws_provider) assert dlm.audited_account == AWS_ACCOUNT_NUMBER # Test DLM Get DLM Contacts def test_get_lifecycle_policies(self): # DLM client for this test class - audit_info = set_mocked_aws_audit_info() - dlm = DLM(audit_info) + aws_provider = set_mocked_aws_provider() + dlm = DLM(aws_provider) assert dlm.lifecycle_policies == { AWS_REGION_US_EAST_1: { LIFECYCLE_POLICY_ID: LifecyclePolicy( diff --git a/tests/providers/aws/services/documentdb/documentdb_service_test.py b/tests/providers/aws/services/documentdb/documentdb_service_test.py index bc7e9c28d6..e2452e29f2 100644 --- a/tests/providers/aws/services/documentdb/documentdb_service_test.py +++ b/tests/providers/aws/services/documentdb/documentdb_service_test.py @@ -5,10 +5,10 @@ from prowler.providers.aws.services.documentdb.documentdb_service import ( DocumentDB, Instance, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) DOC_DB_CLUSTER_ID = "test-cluster" @@ -58,8 +58,8 @@ def mock_make_api_call(self, operation_name, kwargs): return make_api_call(self, operation_name, kwargs) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -67,7 +67,7 @@ def mock_generate_regional_clients(service, audit_info): @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) # Patch every AWS call using Boto3 @@ -75,32 +75,32 @@ def mock_generate_regional_clients(service, audit_info): class Test_DocumentDB_Service: # Test DocumentDB Service def test_service(self): - audit_info = set_mocked_aws_audit_info() - docdb = DocumentDB(audit_info) + aws_provider = set_mocked_aws_provider() + docdb = DocumentDB(aws_provider) assert docdb.service == "docdb" # Test DocumentDB Client def test_client(self): - audit_info = set_mocked_aws_audit_info() - docdb = DocumentDB(audit_info) + aws_provider = set_mocked_aws_provider() + docdb = DocumentDB(aws_provider) assert docdb.client.__class__.__name__ == "DocDB" # Test DocumentDB Session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info() - docdb = DocumentDB(audit_info) + aws_provider = set_mocked_aws_provider() + docdb = DocumentDB(aws_provider) assert docdb.session.__class__.__name__ == "Session" # Test DocumentDB Session def test_audited_account(self): - audit_info = set_mocked_aws_audit_info() - docdb = DocumentDB(audit_info) + aws_provider = set_mocked_aws_provider() + docdb = DocumentDB(aws_provider) assert docdb.audited_account == AWS_ACCOUNT_NUMBER # Test DocumentDB Get DocumentDB Contacts def test_describe_db_instances(self): - audit_info = set_mocked_aws_audit_info() - docdb = DocumentDB(audit_info) + aws_provider = set_mocked_aws_provider() + docdb = DocumentDB(aws_provider) assert docdb.db_instances == { DOC_DB_INSTANCE_ARN: Instance( id=DOC_DB_INSTANCE_NAME, diff --git a/tests/providers/aws/services/drs/drs_service_test.py b/tests/providers/aws/services/drs/drs_service_test.py index 6fbc69d689..54ea8db90e 100644 --- a/tests/providers/aws/services/drs/drs_service_test.py +++ b/tests/providers/aws/services/drs/drs_service_test.py @@ -4,10 +4,7 @@ from unittest.mock import patch import botocore from prowler.providers.aws.services.drs.drs_service import DRS -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider # Mocking Calls make_api_call = botocore.client.BaseClient._make_api_call @@ -41,8 +38,8 @@ def mock_make_api_call(self, operation_name, kwargs): return make_api_call(self, operation_name, kwargs) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -52,23 +49,23 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_DRS_Service: def test__get_client__(self): - audit_info = set_mocked_aws_audit_info() - drs = DRS(audit_info) + aws_provider = set_mocked_aws_provider() + drs = DRS(aws_provider) assert drs.regional_clients[AWS_REGION_US_EAST_1].__class__.__name__ == "drs" def test__get_service__(self): - audit_info = set_mocked_aws_audit_info() - drs = DRS(audit_info) + aws_provider = set_mocked_aws_provider() + drs = DRS(aws_provider) assert drs.service == "drs" def test__describe_jobs__(self): - audit_info = set_mocked_aws_audit_info() - drs = DRS(audit_info) + aws_provider = set_mocked_aws_provider() + drs = DRS(aws_provider) assert len(drs.drs_services) == 1 assert drs.drs_services[0].id == "DRS" assert drs.drs_services[0].region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/dynamodb/dynamodb_accelerator_cluster_encryption_enabled/dynamodb_accelerator_cluster_encryption_enabled_test.py b/tests/providers/aws/services/dynamodb/dynamodb_accelerator_cluster_encryption_enabled/dynamodb_accelerator_cluster_encryption_enabled_test.py index 0175b52c3e..d0785f28d9 100644 --- a/tests/providers/aws/services/dynamodb/dynamodb_accelerator_cluster_encryption_enabled/dynamodb_accelerator_cluster_encryption_enabled_test.py +++ b/tests/providers/aws/services/dynamodb/dynamodb_accelerator_cluster_encryption_enabled/dynamodb_accelerator_cluster_encryption_enabled_test.py @@ -4,11 +4,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -17,16 +17,16 @@ class Test_dynamodb_accelerator_cluster_encryption_enabled: def test_dax_no_clusters(self): from prowler.providers.aws.services.dynamodb.dynamodb_service import DAX - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.dynamodb.dynamodb_accelerator_cluster_encryption_enabled.dynamodb_accelerator_cluster_encryption_enabled.dax_client", - new=DAX(current_audit_info), + new=DAX(aws_provider), ): # Test Check from prowler.providers.aws.services.dynamodb.dynamodb_accelerator_cluster_encryption_enabled.dynamodb_accelerator_cluster_encryption_enabled import ( @@ -50,16 +50,16 @@ class Test_dynamodb_accelerator_cluster_encryption_enabled: )["Cluster"] from prowler.providers.aws.services.dynamodb.dynamodb_service import DAX - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.dynamodb.dynamodb_accelerator_cluster_encryption_enabled.dynamodb_accelerator_cluster_encryption_enabled.dax_client", - new=DAX(current_audit_info), + new=DAX(aws_provider), ): # Test Check from prowler.providers.aws.services.dynamodb.dynamodb_accelerator_cluster_encryption_enabled.dynamodb_accelerator_cluster_encryption_enabled import ( @@ -93,16 +93,16 @@ class Test_dynamodb_accelerator_cluster_encryption_enabled: )["Cluster"] from prowler.providers.aws.services.dynamodb.dynamodb_service import DAX - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.dynamodb.dynamodb_accelerator_cluster_encryption_enabled.dynamodb_accelerator_cluster_encryption_enabled.dax_client", - new=DAX(current_audit_info), + new=DAX(aws_provider), ): # Test Check from prowler.providers.aws.services.dynamodb.dynamodb_accelerator_cluster_encryption_enabled.dynamodb_accelerator_cluster_encryption_enabled import ( diff --git a/tests/providers/aws/services/dynamodb/dynamodb_service_test.py b/tests/providers/aws/services/dynamodb/dynamodb_service_test.py index eb4558a618..8e78b86a74 100644 --- a/tests/providers/aws/services/dynamodb/dynamodb_service_test.py +++ b/tests/providers/aws/services/dynamodb/dynamodb_service_test.py @@ -2,10 +2,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.dynamodb.dynamodb_service import DAX, DynamoDB -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -14,16 +14,16 @@ class Test_DynamoDB_Service: @mock_aws def test_service(self): # Dynamo client for this test class - audit_info = set_mocked_aws_audit_info() - dynamodb = DynamoDB(audit_info) + aws_provider = set_mocked_aws_provider() + dynamodb = DynamoDB(aws_provider) assert dynamodb.service == "dynamodb" # Test Dynamo Client @mock_aws def test_client(self): # Dynamo client for this test class - audit_info = set_mocked_aws_audit_info() - dynamodb = DynamoDB(audit_info) + aws_provider = set_mocked_aws_provider() + dynamodb = DynamoDB(aws_provider) for regional_client in dynamodb.regional_clients.values(): assert regional_client.__class__.__name__ == "DynamoDB" @@ -31,16 +31,16 @@ class Test_DynamoDB_Service: @mock_aws def test__get_session__(self): # Dynamo client for this test class - audit_info = set_mocked_aws_audit_info() - dynamodb = DynamoDB(audit_info) + aws_provider = set_mocked_aws_provider() + dynamodb = DynamoDB(aws_provider) assert dynamodb.session.__class__.__name__ == "Session" # Test Dynamo Session @mock_aws def test_audited_account(self): # Dynamo client for this test class - audit_info = set_mocked_aws_audit_info() - dynamodb = DynamoDB(audit_info) + aws_provider = set_mocked_aws_provider() + dynamodb = DynamoDB(aws_provider) assert dynamodb.audited_account == AWS_ACCOUNT_NUMBER # Test DynamoDB List Tables @@ -74,8 +74,8 @@ class Test_DynamoDB_Service: BillingMode="PAY_PER_REQUEST", ) # DynamoDB client for this test class - audit_info = set_mocked_aws_audit_info() - dynamo = DynamoDB(audit_info) + aws_provider = set_mocked_aws_provider() + dynamo = DynamoDB(aws_provider) assert len(dynamo.tables) == 2 assert dynamo.tables[0].name == "test1" assert dynamo.tables[1].name == "test2" @@ -104,8 +104,8 @@ class Test_DynamoDB_Service: ], )["TableDescription"] # DynamoDB client for this test class - audit_info = set_mocked_aws_audit_info() - dynamo = DynamoDB(audit_info) + aws_provider = set_mocked_aws_provider() + dynamo = DynamoDB(aws_provider) assert len(dynamo.tables) == 1 assert dynamo.tables[0].arn == table["TableArn"] assert dynamo.tables[0].name == "test1" @@ -137,8 +137,8 @@ class Test_DynamoDB_Service: PointInTimeRecoverySpecification={"PointInTimeRecoveryEnabled": True}, ) # DynamoDB client for this test class - audit_info = set_mocked_aws_audit_info() - dynamo = DynamoDB(audit_info) + aws_provider = set_mocked_aws_provider() + dynamo = DynamoDB(aws_provider) assert len(dynamo.tables) == 1 assert dynamo.tables[0].arn == table["TableArn"] assert dynamo.tables[0].name == "test1" @@ -173,8 +173,8 @@ class Test_DynamoDB_Service: ], ) # DAX client for this test class - audit_info = set_mocked_aws_audit_info() - dax = DAX(audit_info) + aws_provider = set_mocked_aws_provider() + dax = DAX(aws_provider) assert len(dax.clusters) == 2 assert dax.clusters[0].name == "daxcluster1" diff --git a/tests/providers/aws/services/dynamodb/dynamodb_tables_kms_cmk_encryption_enabled/dynamodb_tables_kms_cmk_encryption_enabled_test.py b/tests/providers/aws/services/dynamodb/dynamodb_tables_kms_cmk_encryption_enabled/dynamodb_tables_kms_cmk_encryption_enabled_test.py index 25f6cf4a1c..087794facf 100644 --- a/tests/providers/aws/services/dynamodb/dynamodb_tables_kms_cmk_encryption_enabled/dynamodb_tables_kms_cmk_encryption_enabled_test.py +++ b/tests/providers/aws/services/dynamodb/dynamodb_tables_kms_cmk_encryption_enabled/dynamodb_tables_kms_cmk_encryption_enabled_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -16,16 +16,16 @@ class Test_dynamodb_tables_kms_cmk_encryption_enabled: def test_dynamodb_no_tables(self): from prowler.providers.aws.services.dynamodb.dynamodb_service import DynamoDB - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.dynamodb.dynamodb_tables_kms_cmk_encryption_enabled.dynamodb_tables_kms_cmk_encryption_enabled.dynamodb_client", - new=DynamoDB(current_audit_info), + new=DynamoDB(aws_provider), ): # Test Check from prowler.providers.aws.services.dynamodb.dynamodb_tables_kms_cmk_encryption_enabled.dynamodb_tables_kms_cmk_encryption_enabled import ( @@ -55,16 +55,16 @@ class Test_dynamodb_tables_kms_cmk_encryption_enabled: )["TableDescription"] from prowler.providers.aws.services.dynamodb.dynamodb_service import DynamoDB - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.dynamodb.dynamodb_tables_kms_cmk_encryption_enabled.dynamodb_tables_kms_cmk_encryption_enabled.dynamodb_client", - new=DynamoDB(current_audit_info), + new=DynamoDB(aws_provider), ): # Test Check from prowler.providers.aws.services.dynamodb.dynamodb_tables_kms_cmk_encryption_enabled.dynamodb_tables_kms_cmk_encryption_enabled import ( @@ -99,16 +99,16 @@ class Test_dynamodb_tables_kms_cmk_encryption_enabled: )["TableDescription"] from prowler.providers.aws.services.dynamodb.dynamodb_service import DynamoDB - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.dynamodb.dynamodb_tables_kms_cmk_encryption_enabled.dynamodb_tables_kms_cmk_encryption_enabled.dynamodb_client", - new=DynamoDB(current_audit_info), + new=DynamoDB(aws_provider), ): # Test Check from prowler.providers.aws.services.dynamodb.dynamodb_tables_kms_cmk_encryption_enabled.dynamodb_tables_kms_cmk_encryption_enabled import ( diff --git a/tests/providers/aws/services/dynamodb/dynamodb_tables_pitr_enabled/dynamodb_tables_pitr_enabled_test.py b/tests/providers/aws/services/dynamodb/dynamodb_tables_pitr_enabled/dynamodb_tables_pitr_enabled_test.py index 5da92896f6..7a7dbd0389 100644 --- a/tests/providers/aws/services/dynamodb/dynamodb_tables_pitr_enabled/dynamodb_tables_pitr_enabled_test.py +++ b/tests/providers/aws/services/dynamodb/dynamodb_tables_pitr_enabled/dynamodb_tables_pitr_enabled_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -16,16 +16,16 @@ class Test_dynamodb_tables_pitr_enabled: def test_dynamodb_no_tables(self): from prowler.providers.aws.services.dynamodb.dynamodb_service import DynamoDB - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.dynamodb.dynamodb_tables_pitr_enabled.dynamodb_tables_pitr_enabled.dynamodb_client", - new=DynamoDB(current_audit_info), + new=DynamoDB(aws_provider), ): # Test Check from prowler.providers.aws.services.dynamodb.dynamodb_tables_pitr_enabled.dynamodb_tables_pitr_enabled import ( @@ -54,16 +54,16 @@ class Test_dynamodb_tables_pitr_enabled: )["TableDescription"] from prowler.providers.aws.services.dynamodb.dynamodb_service import DynamoDB - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.dynamodb.dynamodb_tables_pitr_enabled.dynamodb_tables_pitr_enabled.dynamodb_client", - new=DynamoDB(current_audit_info), + new=DynamoDB(aws_provider), ): # Test Check from prowler.providers.aws.services.dynamodb.dynamodb_tables_pitr_enabled.dynamodb_tables_pitr_enabled import ( @@ -105,16 +105,16 @@ class Test_dynamodb_tables_pitr_enabled: ) from prowler.providers.aws.services.dynamodb.dynamodb_service import DynamoDB - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.dynamodb.dynamodb_tables_pitr_enabled.dynamodb_tables_pitr_enabled.dynamodb_client", - new=DynamoDB(current_audit_info), + new=DynamoDB(aws_provider), ): # Test Check from prowler.providers.aws.services.dynamodb.dynamodb_tables_pitr_enabled.dynamodb_tables_pitr_enabled import ( diff --git a/tests/providers/aws/services/ec2/ec2_ami_public/ec2_ami_public_test.py b/tests/providers/aws/services/ec2/ec2_ami_public/ec2_ami_public_test.py index 69419791f6..73d981cb80 100644 --- a/tests/providers/aws/services/ec2/ec2_ami_public/ec2_ami_public_test.py +++ b/tests/providers/aws/services/ec2/ec2_ami_public/ec2_ami_public_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -17,16 +17,16 @@ class Test_ec2_ami_public: def test_no_amis(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ami_public.ec2_ami_public.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ami_public.ec2_ami_public import ( @@ -52,16 +52,16 @@ class Test_ec2_ami_public: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ami_public.ec2_ami_public.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_ami_public.ec2_ami_public import ( ec2_ami_public, @@ -76,7 +76,7 @@ class Test_ec2_ami_public: assert result[0].resource_id == image_id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:image/{image_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:image/{image_id}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] @@ -104,16 +104,16 @@ class Test_ec2_ami_public: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ami_public.ec2_ami_public.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_ami_public.ec2_ami_public import ( ec2_ami_public, @@ -130,7 +130,7 @@ class Test_ec2_ami_public: assert result[0].resource_id == image_id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:image/{image_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:image/{image_id}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] 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 fb258c2922..bd3734ad9a 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 @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -22,16 +22,16 @@ class Test_ec2_ebs_default_encryption: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_default_encryption.ec2_ebs_default_encryption.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_default_encryption.ec2_ebs_default_encryption import ( @@ -70,16 +70,16 @@ class Test_ec2_ebs_default_encryption: def test_ec2_ebs_encryption_disabled(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_default_encryption.ec2_ebs_default_encryption.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_default_encryption.ec2_ebs_default_encryption import ( @@ -119,17 +119,17 @@ class Test_ec2_ebs_default_encryption: def test_ec2_ebs_encryption_disabled_ignored(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_default_encryption.ec2_ebs_default_encryption.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_default_encryption.ec2_ebs_default_encryption import ( @@ -149,17 +149,17 @@ class Test_ec2_ebs_default_encryption: ec2.create_volume(Size=36, AvailabilityZone=f"{AWS_REGION_US_EAST_1}a") from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_default_encryption.ec2_ebs_default_encryption.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_default_encryption.ec2_ebs_default_encryption import ( diff --git a/tests/providers/aws/services/ec2/ec2_ebs_public_snapshot/ec2_ebs_public_snapshot_test.py b/tests/providers/aws/services/ec2/ec2_ebs_public_snapshot/ec2_ebs_public_snapshot_test.py index 4a29f7e0c4..78dac981a8 100644 --- a/tests/providers/aws/services/ec2/ec2_ebs_public_snapshot/ec2_ebs_public_snapshot_test.py +++ b/tests/providers/aws/services/ec2/ec2_ebs_public_snapshot/ec2_ebs_public_snapshot_test.py @@ -4,15 +4,15 @@ from boto3 import client, resource from mock import patch from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -20,7 +20,7 @@ def mock_generate_regional_clients(service, audit_info): @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_ec2_ebs_public_snapshot: @@ -28,16 +28,16 @@ class Test_ec2_ebs_public_snapshot: def test_ec2_default_snapshots(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_public_snapshot.ec2_ebs_public_snapshot.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_public_snapshot.ec2_ebs_public_snapshot import ( @@ -66,16 +66,16 @@ class Test_ec2_ebs_public_snapshot: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_public_snapshot.ec2_ebs_public_snapshot.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_public_snapshot.ec2_ebs_public_snapshot import ( @@ -99,7 +99,7 @@ class Test_ec2_ebs_public_snapshot: ) assert ( snap.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:snapshot/{snapshot.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:snapshot/{snapshot.id}" ) @mock_aws @@ -113,16 +113,16 @@ class Test_ec2_ebs_public_snapshot: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_public_snapshot.ec2_ebs_public_snapshot.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_public_snapshot.ec2_ebs_public_snapshot import ( @@ -146,5 +146,5 @@ class Test_ec2_ebs_public_snapshot: ) assert ( snap.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:snapshot/{snapshot.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:snapshot/{snapshot.id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_ebs_snapshots_encrypted/ec2_ebs_snapshots_encrypted_test.py b/tests/providers/aws/services/ec2/ec2_ebs_snapshots_encrypted/ec2_ebs_snapshots_encrypted_test.py index e55f93e8e0..f703d60c93 100644 --- a/tests/providers/aws/services/ec2/ec2_ebs_snapshots_encrypted/ec2_ebs_snapshots_encrypted_test.py +++ b/tests/providers/aws/services/ec2/ec2_ebs_snapshots_encrypted/ec2_ebs_snapshots_encrypted_test.py @@ -4,15 +4,15 @@ from boto3 import resource from mock import patch from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -20,7 +20,7 @@ def mock_generate_regional_clients(service, audit_info): @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_ec2_ebs_snapshots_encrypted: @@ -28,16 +28,16 @@ class Test_ec2_ebs_snapshots_encrypted: def test_ec2_default_snapshots(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_snapshots_encrypted.ec2_ebs_snapshots_encrypted.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_snapshots_encrypted.ec2_ebs_snapshots_encrypted import ( @@ -59,16 +59,16 @@ class Test_ec2_ebs_snapshots_encrypted: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_snapshots_encrypted.ec2_ebs_snapshots_encrypted.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_snapshots_encrypted.ec2_ebs_snapshots_encrypted import ( @@ -92,7 +92,7 @@ class Test_ec2_ebs_snapshots_encrypted: ) assert ( snap.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:snapshot/{snapshot.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:snapshot/{snapshot.id}" ) @mock_aws @@ -106,16 +106,16 @@ class Test_ec2_ebs_snapshots_encrypted: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_snapshots_encrypted.ec2_ebs_snapshots_encrypted.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_snapshots_encrypted.ec2_ebs_snapshots_encrypted import ( @@ -139,5 +139,5 @@ class Test_ec2_ebs_snapshots_encrypted: ) assert ( snap.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:snapshot/{snapshot.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:snapshot/{snapshot.id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_ebs_volume_encryption/ec2_ebs_volume_encryption_test.py b/tests/providers/aws/services/ec2/ec2_ebs_volume_encryption/ec2_ebs_volume_encryption_test.py index 1124be9088..de92287b20 100644 --- a/tests/providers/aws/services/ec2/ec2_ebs_volume_encryption/ec2_ebs_volume_encryption_test.py +++ b/tests/providers/aws/services/ec2/ec2_ebs_volume_encryption/ec2_ebs_volume_encryption_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -15,16 +15,16 @@ class Test_ec2_ebs_volume_encryption: def test_ec2_no_volumes(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_volume_encryption.ec2_ebs_volume_encryption.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_volume_encryption.ec2_ebs_volume_encryption import ( @@ -44,16 +44,16 @@ class Test_ec2_ebs_volume_encryption: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_volume_encryption.ec2_ebs_volume_encryption.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_volume_encryption.ec2_ebs_volume_encryption import ( @@ -74,7 +74,7 @@ class Test_ec2_ebs_volume_encryption: ) assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:volume/{volume.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:volume/{volume.id}" ) @mock_aws @@ -87,16 +87,16 @@ class Test_ec2_ebs_volume_encryption: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_volume_encryption.ec2_ebs_volume_encryption.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_volume_encryption.ec2_ebs_volume_encryption import ( @@ -117,5 +117,5 @@ class Test_ec2_ebs_volume_encryption: ) assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:volume/{volume.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:volume/{volume.id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_ebs_volume_snapshots_exists/ec2_ebs_volume_snapshots_exists_test.py b/tests/providers/aws/services/ec2/ec2_ebs_volume_snapshots_exists/ec2_ebs_volume_snapshots_exists_test.py index d4e8b2843b..a8fd3fe2dd 100644 --- a/tests/providers/aws/services/ec2/ec2_ebs_volume_snapshots_exists/ec2_ebs_volume_snapshots_exists_test.py +++ b/tests/providers/aws/services/ec2/ec2_ebs_volume_snapshots_exists/ec2_ebs_volume_snapshots_exists_test.py @@ -4,17 +4,17 @@ from boto3 import resource from mock import patch from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, AWS_REGION_US_EAST_1_AZA, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -22,7 +22,7 @@ def mock_generate_regional_clients(service, audit_info): @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_ec2_ebs_volume_snapshots_exists: @@ -30,16 +30,16 @@ class Test_ec2_ebs_volume_snapshots_exists: def test_no_volumes(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_volume_snapshots_exists.ec2_ebs_volume_snapshots_exists.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_volume_snapshots_exists.ec2_ebs_volume_snapshots_exists import ( @@ -58,16 +58,16 @@ class Test_ec2_ebs_volume_snapshots_exists: volume_arn = f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:volume/{volume.id}" from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_volume_snapshots_exists.ec2_ebs_volume_snapshots_exists.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_volume_snapshots_exists.ec2_ebs_volume_snapshots_exists import ( @@ -98,16 +98,16 @@ class Test_ec2_ebs_volume_snapshots_exists: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_volume_snapshots_exists.ec2_ebs_volume_snapshots_exists.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_volume_snapshots_exists.ec2_ebs_volume_snapshots_exists import ( @@ -142,16 +142,16 @@ class Test_ec2_ebs_volume_snapshots_exists: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_ebs_volume_snapshots_exists.ec2_ebs_volume_snapshots_exists.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_ebs_volume_snapshots_exists.ec2_ebs_volume_snapshots_exists import ( diff --git a/tests/providers/aws/services/ec2/ec2_elastic_ip_shodan/ec2_elastic_ip_shodan_test.py b/tests/providers/aws/services/ec2/ec2_elastic_ip_shodan/ec2_elastic_ip_shodan_test.py index 794cc204e9..5c7b248509 100644 --- a/tests/providers/aws/services/ec2/ec2_elastic_ip_shodan/ec2_elastic_ip_shodan_test.py +++ b/tests/providers/aws/services/ec2/ec2_elastic_ip_shodan/ec2_elastic_ip_shodan_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -23,17 +23,17 @@ class Test_ec2_elastic_ip_shodan: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], audit_config={"shodan_api_key": ""}, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_elastic_ip_shodan.ec2_elastic_ip_shodan.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_elastic_ip_shodan.ec2_elastic_ip_shodan import ( @@ -54,17 +54,17 @@ class Test_ec2_elastic_ip_shodan: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], audit_config={"shodan_api_key": ""}, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_elastic_ip_shodan.ec2_elastic_ip_shodan.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_elastic_ip_shodan.ec2_elastic_ip_shodan import ( @@ -92,17 +92,17 @@ class Test_ec2_elastic_ip_shodan: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], audit_config={"shodan_api_key": ""}, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_elastic_ip_shodan.ec2_elastic_ip_shodan.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_elastic_ip_shodan.ec2_elastic_ip_shodan import ( @@ -133,7 +133,7 @@ class Test_ec2_elastic_ip_shodan: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], audit_config={"shodan_api_key": "XXXXXXX"}, ) @@ -143,11 +143,11 @@ class Test_ec2_elastic_ip_shodan: country = "france" with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_elastic_ip_shodan.ec2_elastic_ip_shodan.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_elastic_ip_shodan.ec2_elastic_ip_shodan.shodan.Shodan.host", return_value={"ports": ports, "isp": isp, "country_name": country}, diff --git a/tests/providers/aws/services/ec2/ec2_elastic_ip_unassigned/ec2_elastic_ip_unassigned_test.py b/tests/providers/aws/services/ec2/ec2_elastic_ip_unassigned/ec2_elastic_ip_unassigned_test.py index 19d21f3422..90b41374c8 100644 --- a/tests/providers/aws/services/ec2/ec2_elastic_ip_unassigned/ec2_elastic_ip_unassigned_test.py +++ b/tests/providers/aws/services/ec2/ec2_elastic_ip_unassigned/ec2_elastic_ip_unassigned_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -18,16 +18,16 @@ class Test_ec2_elastic_ip_unassigned: def test_no_eips(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_elastic_ip_unassigned.ec2_elastic_ip_unassigned.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_elastic_ip_unassigned.ec2_elastic_ip_unassigned import ( @@ -49,16 +49,16 @@ class Test_ec2_elastic_ip_unassigned: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_elastic_ip_unassigned.ec2_elastic_ip_unassigned.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_elastic_ip_unassigned.ec2_elastic_ip_unassigned import ( @@ -78,7 +78,7 @@ class Test_ec2_elastic_ip_unassigned: ) assert ( results[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:eip-allocation/{allocation_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:eip-allocation/{allocation_id}" ) @mock_aws @@ -102,16 +102,16 @@ class Test_ec2_elastic_ip_unassigned: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_elastic_ip_unassigned.ec2_elastic_ip_unassigned.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_elastic_ip_unassigned.ec2_elastic_ip_unassigned import ( @@ -131,5 +131,5 @@ class Test_ec2_elastic_ip_unassigned: ) assert ( results[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:eip-allocation/{eip.allocation_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:eip-allocation/{eip.allocation_id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_instance_detailed_monitoring_enabled/ec2_instance_detailed_monitoring_enabled_test.py b/tests/providers/aws/services/ec2/ec2_instance_detailed_monitoring_enabled/ec2_instance_detailed_monitoring_enabled_test.py index c47e133d8e..fce1c7c2ae 100644 --- a/tests/providers/aws/services/ec2/ec2_instance_detailed_monitoring_enabled/ec2_instance_detailed_monitoring_enabled_test.py +++ b/tests/providers/aws/services/ec2/ec2_instance_detailed_monitoring_enabled/ec2_instance_detailed_monitoring_enabled_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -17,16 +17,16 @@ class Test_ec2_instance_detailed_monitoring_enabled: def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_detailed_monitoring_enabled.ec2_instance_detailed_monitoring_enabled.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_instance_detailed_monitoring_enabled.ec2_instance_detailed_monitoring_enabled import ( @@ -50,16 +50,16 @@ class Test_ec2_instance_detailed_monitoring_enabled: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_detailed_monitoring_enabled.ec2_instance_detailed_monitoring_enabled.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_detailed_monitoring_enabled.ec2_instance_detailed_monitoring_enabled import ( ec2_instance_detailed_monitoring_enabled, @@ -80,7 +80,7 @@ class Test_ec2_instance_detailed_monitoring_enabled: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) @mock_aws @@ -95,16 +95,16 @@ class Test_ec2_instance_detailed_monitoring_enabled: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_detailed_monitoring_enabled.ec2_instance_detailed_monitoring_enabled.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ) as ec2_service: from prowler.providers.aws.services.ec2.ec2_instance_detailed_monitoring_enabled.ec2_instance_detailed_monitoring_enabled import ( ec2_instance_detailed_monitoring_enabled, @@ -128,5 +128,5 @@ class Test_ec2_instance_detailed_monitoring_enabled: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_instance_imdsv2_enabled/ec2_instance_imdsv2_enabled_test.py b/tests/providers/aws/services/ec2/ec2_instance_imdsv2_enabled/ec2_instance_imdsv2_enabled_test.py index c4050dd70a..6d5e86f377 100644 --- a/tests/providers/aws/services/ec2/ec2_instance_imdsv2_enabled/ec2_instance_imdsv2_enabled_test.py +++ b/tests/providers/aws/services/ec2/ec2_instance_imdsv2_enabled/ec2_instance_imdsv2_enabled_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -18,16 +18,16 @@ class Test_ec2_instance_imdsv2_enabled: def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_imdsv2_enabled.ec2_instance_imdsv2_enabled.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_instance_imdsv2_enabled.ec2_instance_imdsv2_enabled import ( @@ -54,16 +54,16 @@ class Test_ec2_instance_imdsv2_enabled: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_imdsv2_enabled.ec2_instance_imdsv2_enabled.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ) as service_client: from prowler.providers.aws.services.ec2.ec2_instance_imdsv2_enabled.ec2_instance_imdsv2_enabled import ( ec2_instance_imdsv2_enabled, @@ -87,7 +87,7 @@ class Test_ec2_instance_imdsv2_enabled: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) @mock_aws @@ -105,16 +105,16 @@ class Test_ec2_instance_imdsv2_enabled: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_imdsv2_enabled.ec2_instance_imdsv2_enabled.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ) as service_client: from prowler.providers.aws.services.ec2.ec2_instance_imdsv2_enabled.ec2_instance_imdsv2_enabled import ( ec2_instance_imdsv2_enabled, @@ -138,7 +138,7 @@ class Test_ec2_instance_imdsv2_enabled: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) @mock_aws @@ -156,16 +156,16 @@ class Test_ec2_instance_imdsv2_enabled: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_imdsv2_enabled.ec2_instance_imdsv2_enabled.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ) as service_client: from prowler.providers.aws.services.ec2.ec2_instance_imdsv2_enabled.ec2_instance_imdsv2_enabled import ( ec2_instance_imdsv2_enabled, @@ -189,5 +189,5 @@ class Test_ec2_instance_imdsv2_enabled: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_instance_internet_facing_with_instance_profile/ec2_instance_internet_facing_with_instance_profile_test.py b/tests/providers/aws/services/ec2/ec2_instance_internet_facing_with_instance_profile/ec2_instance_internet_facing_with_instance_profile_test.py index c94bdaebde..084fa14bcd 100644 --- a/tests/providers/aws/services/ec2/ec2_instance_internet_facing_with_instance_profile/ec2_instance_internet_facing_with_instance_profile_test.py +++ b/tests/providers/aws/services/ec2/ec2_instance_internet_facing_with_instance_profile/ec2_instance_internet_facing_with_instance_profile_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -18,16 +18,16 @@ class Test_ec2_instance_internet_facing_with_instance_profile: def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_internet_facing_with_instance_profile.ec2_instance_internet_facing_with_instance_profile.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_instance_internet_facing_with_instance_profile.ec2_instance_internet_facing_with_instance_profile import ( @@ -65,16 +65,16 @@ class Test_ec2_instance_internet_facing_with_instance_profile: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_internet_facing_with_instance_profile.ec2_instance_internet_facing_with_instance_profile.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_internet_facing_with_instance_profile.ec2_instance_internet_facing_with_instance_profile import ( ec2_instance_internet_facing_with_instance_profile, @@ -93,7 +93,7 @@ class Test_ec2_instance_internet_facing_with_instance_profile: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) @mock_aws @@ -122,16 +122,16 @@ class Test_ec2_instance_internet_facing_with_instance_profile: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_internet_facing_with_instance_profile.ec2_instance_internet_facing_with_instance_profile.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_internet_facing_with_instance_profile.ec2_instance_internet_facing_with_instance_profile import ( ec2_instance_internet_facing_with_instance_profile, @@ -150,5 +150,5 @@ class Test_ec2_instance_internet_facing_with_instance_profile: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_instance_managed_by_ssm/ec2_instance_managed_by_ssm_test.py b/tests/providers/aws/services/ec2/ec2_instance_managed_by_ssm/ec2_instance_managed_by_ssm_test.py index 9d17ec4de7..80bc3fa011 100644 --- a/tests/providers/aws/services/ec2/ec2_instance_managed_by_ssm/ec2_instance_managed_by_ssm_test.py +++ b/tests/providers/aws/services/ec2/ec2_instance_managed_by_ssm/ec2_instance_managed_by_ssm_test.py @@ -4,11 +4,11 @@ from boto3 import resource from moto import mock_aws from prowler.providers.aws.services.ssm.ssm_service import ManagedInstance -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -19,7 +19,7 @@ class Test_ec2_instance_managed_by_ssm_test: def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) @@ -27,8 +27,8 @@ class Test_ec2_instance_managed_by_ssm_test: ssm_client.managed_instances = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ssm.ssm_service.SSM", new=ssm_client, @@ -37,7 +37,7 @@ class Test_ec2_instance_managed_by_ssm_test: new=ssm_client, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_managed_by_ssm.ec2_instance_managed_by_ssm.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_instance_managed_by_ssm.ec2_instance_managed_by_ssm import ( @@ -67,13 +67,13 @@ class Test_ec2_instance_managed_by_ssm_test: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ssm.ssm_service.SSM", new=ssm_client, @@ -82,7 +82,7 @@ class Test_ec2_instance_managed_by_ssm_test: new=ssm_client, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_managed_by_ssm.ec2_instance_managed_by_ssm.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_instance_managed_by_ssm.ec2_instance_managed_by_ssm import ( @@ -123,13 +123,13 @@ class Test_ec2_instance_managed_by_ssm_test: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ssm.ssm_service.SSM", new=ssm_client, @@ -138,7 +138,7 @@ class Test_ec2_instance_managed_by_ssm_test: new=ssm_client, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_managed_by_ssm.ec2_instance_managed_by_ssm.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_instance_managed_by_ssm.ec2_instance_managed_by_ssm import ( diff --git a/tests/providers/aws/services/ec2/ec2_instance_older_than_specific_days/ec2_instance_older_than_specific_days_test.py b/tests/providers/aws/services/ec2/ec2_instance_older_than_specific_days/ec2_instance_older_than_specific_days_test.py index c5afd5fe4f..b15331f263 100644 --- a/tests/providers/aws/services/ec2/ec2_instance_older_than_specific_days/ec2_instance_older_than_specific_days_test.py +++ b/tests/providers/aws/services/ec2/ec2_instance_older_than_specific_days/ec2_instance_older_than_specific_days_test.py @@ -6,10 +6,10 @@ from boto3 import resource from dateutil.tz import tzutc from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -20,17 +20,17 @@ class Test_ec2_instance_older_than_specific_days: def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - current_audit_info.audit_config = {"max_ec2_instance_age_in_days": 180} + aws_provider._audit_config = {"max_ec2_instance_age_in_days": 180} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_older_than_specific_days.ec2_instance_older_than_specific_days.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_instance_older_than_specific_days.ec2_instance_older_than_specific_days import ( @@ -54,17 +54,17 @@ class Test_ec2_instance_older_than_specific_days: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - current_audit_info.audit_config = {"max_ec2_instance_age_in_days": 180} + aws_provider._audit_config = {"max_ec2_instance_age_in_days": 180} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_older_than_specific_days.ec2_instance_older_than_specific_days.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_older_than_specific_days.ec2_instance_older_than_specific_days import ( ec2_instance_older_than_specific_days, @@ -83,7 +83,7 @@ class Test_ec2_instance_older_than_specific_days: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) @mock_aws @@ -98,17 +98,17 @@ class Test_ec2_instance_older_than_specific_days: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - current_audit_info.audit_config = {"max_ec2_instance_age_in_days": 180} + aws_provider._audit_config = {"max_ec2_instance_age_in_days": 180} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_older_than_specific_days.ec2_instance_older_than_specific_days.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ) as service_client: from prowler.providers.aws.services.ec2.ec2_instance_older_than_specific_days.ec2_instance_older_than_specific_days import ( ec2_instance_older_than_specific_days, @@ -131,5 +131,5 @@ class Test_ec2_instance_older_than_specific_days: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_instance_profile_attached/ec2_instance_profile_attached_test.py b/tests/providers/aws/services/ec2/ec2_instance_profile_attached/ec2_instance_profile_attached_test.py index 107f430b11..93fd3fbefe 100644 --- a/tests/providers/aws/services/ec2/ec2_instance_profile_attached/ec2_instance_profile_attached_test.py +++ b/tests/providers/aws/services/ec2/ec2_instance_profile_attached/ec2_instance_profile_attached_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -18,16 +18,16 @@ class Test_ec2_instance_profile_attached: def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_profile_attached.ec2_instance_profile_attached.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_instance_profile_attached.ec2_instance_profile_attached import ( @@ -65,16 +65,16 @@ class Test_ec2_instance_profile_attached: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_profile_attached.ec2_instance_profile_attached.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_profile_attached.ec2_instance_profile_attached import ( ec2_instance_profile_attached, @@ -94,7 +94,7 @@ class Test_ec2_instance_profile_attached: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) @mock_aws @@ -117,16 +117,16 @@ class Test_ec2_instance_profile_attached: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_profile_attached.ec2_instance_profile_attached.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_profile_attached.ec2_instance_profile_attached import ( ec2_instance_profile_attached, @@ -145,5 +145,5 @@ class Test_ec2_instance_profile_attached: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_instance_public_ip/ec2_instance_public_ip_test.py b/tests/providers/aws/services/ec2/ec2_instance_public_ip/ec2_instance_public_ip_test.py index 08771f6531..1cd121bee7 100644 --- a/tests/providers/aws/services/ec2/ec2_instance_public_ip/ec2_instance_public_ip_test.py +++ b/tests/providers/aws/services/ec2/ec2_instance_public_ip/ec2_instance_public_ip_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -18,16 +18,16 @@ class Test_ec2_instance_public_ip: def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_public_ip.ec2_instance_public_ip.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_instance_public_ip.ec2_instance_public_ip import ( @@ -59,16 +59,16 @@ class Test_ec2_instance_public_ip: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_public_ip.ec2_instance_public_ip.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_public_ip.ec2_instance_public_ip import ( ec2_instance_public_ip, @@ -88,7 +88,7 @@ class Test_ec2_instance_public_ip: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) @mock_aws @@ -111,16 +111,16 @@ class Test_ec2_instance_public_ip: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_public_ip.ec2_instance_public_ip.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_public_ip.ec2_instance_public_ip import ( ec2_instance_public_ip, @@ -140,5 +140,5 @@ class Test_ec2_instance_public_ip: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_instance_secrets_user_data/ec2_instance_secrets_user_data_test.py b/tests/providers/aws/services/ec2/ec2_instance_secrets_user_data/ec2_instance_secrets_user_data_test.py index 5361698c36..749659920c 100644 --- a/tests/providers/aws/services/ec2/ec2_instance_secrets_user_data/ec2_instance_secrets_user_data_test.py +++ b/tests/providers/aws/services/ec2/ec2_instance_secrets_user_data/ec2_instance_secrets_user_data_test.py @@ -5,10 +5,10 @@ from unittest import mock from boto3 import resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -22,16 +22,16 @@ class Test_ec2_instance_secrets_user_data: def test_no_ec2(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_secrets_user_data.ec2_instance_secrets_user_data.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_instance_secrets_user_data.ec2_instance_secrets_user_data import ( @@ -55,16 +55,16 @@ class Test_ec2_instance_secrets_user_data: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_secrets_user_data.ec2_instance_secrets_user_data.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_secrets_user_data.ec2_instance_secrets_user_data import ( ec2_instance_secrets_user_data, @@ -82,7 +82,7 @@ class Test_ec2_instance_secrets_user_data: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) assert result[0].resource_tags is None assert result[0].region == AWS_REGION_US_EAST_1 @@ -99,16 +99,16 @@ class Test_ec2_instance_secrets_user_data: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_secrets_user_data.ec2_instance_secrets_user_data.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_secrets_user_data.ec2_instance_secrets_user_data import ( ec2_instance_secrets_user_data, @@ -126,7 +126,7 @@ class Test_ec2_instance_secrets_user_data: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) assert result[0].resource_tags is None assert result[0].region == AWS_REGION_US_EAST_1 @@ -146,16 +146,16 @@ class Test_ec2_instance_secrets_user_data: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_secrets_user_data.ec2_instance_secrets_user_data.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_secrets_user_data.ec2_instance_secrets_user_data import ( ec2_instance_secrets_user_data, @@ -173,7 +173,7 @@ class Test_ec2_instance_secrets_user_data: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) assert result[0].resource_tags is None assert result[0].region == AWS_REGION_US_EAST_1 @@ -187,16 +187,16 @@ class Test_ec2_instance_secrets_user_data: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_secrets_user_data.ec2_instance_secrets_user_data.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_secrets_user_data.ec2_instance_secrets_user_data import ( ec2_instance_secrets_user_data, @@ -214,7 +214,7 @@ class Test_ec2_instance_secrets_user_data: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) assert result[0].resource_tags is None assert result[0].region == AWS_REGION_US_EAST_1 @@ -234,16 +234,16 @@ class Test_ec2_instance_secrets_user_data: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_instance_secrets_user_data.ec2_instance_secrets_user_data.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): from prowler.providers.aws.services.ec2.ec2_instance_secrets_user_data.ec2_instance_secrets_user_data import ( ec2_instance_secrets_user_data, @@ -261,7 +261,7 @@ class Test_ec2_instance_secrets_user_data: assert result[0].resource_id == instance.id assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:instance/{instance.id}" ) assert result[0].resource_tags is None assert result[0].region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/ec2/ec2_networkacl_allow_ingress_any_port/ec2_networkacl_allow_ingress_any_port_test.py b/tests/providers/aws/services/ec2/ec2_networkacl_allow_ingress_any_port/ec2_networkacl_allow_ingress_any_port_test.py index e1621af923..bcbcd56f1f 100644 --- a/tests/providers/aws/services/ec2/ec2_networkacl_allow_ingress_any_port/ec2_networkacl_allow_ingress_any_port_test.py +++ b/tests/providers/aws/services/ec2/ec2_networkacl_allow_ingress_any_port/ec2_networkacl_allow_ingress_any_port_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -15,16 +15,16 @@ class Test_ec2_networkacl_allow_ingress_any_port: def test_ec2_default_nacls(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_any_port.ec2_networkacl_allow_ingress_any_port.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_any_port.ec2_networkacl_allow_ingress_any_port import ( @@ -41,16 +41,16 @@ class Test_ec2_networkacl_allow_ingress_any_port: def test_ec2_non_default_compliant_nacl(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_any_port.ec2_networkacl_allow_ingress_any_port.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_any_port.ec2_networkacl_allow_ingress_any_port import ( @@ -91,16 +91,16 @@ class Test_ec2_networkacl_allow_ingress_any_port: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_any_port.ec2_networkacl_allow_ingress_any_port.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_any_port.ec2_networkacl_allow_ingress_any_port import ( @@ -124,7 +124,7 @@ class Test_ec2_networkacl_allow_ingress_any_port: ) assert ( nacl.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:network-acl/{nacl_id}" ) @mock_aws @@ -146,16 +146,16 @@ class Test_ec2_networkacl_allow_ingress_any_port: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_any_port.ec2_networkacl_allow_ingress_any_port.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_any_port.ec2_networkacl_allow_ingress_any_port import ( @@ -179,7 +179,7 @@ class Test_ec2_networkacl_allow_ingress_any_port: ) assert ( nacl.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:network-acl/{nacl_id}" ) @mock_aws @@ -201,17 +201,17 @@ class Test_ec2_networkacl_allow_ingress_any_port: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_any_port.ec2_networkacl_allow_ingress_any_port.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_any_port.ec2_networkacl_allow_ingress_any_port import ( @@ -243,17 +243,17 @@ class Test_ec2_networkacl_allow_ingress_any_port: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_any_port.ec2_networkacl_allow_ingress_any_port.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_any_port.ec2_networkacl_allow_ingress_any_port import ( @@ -277,5 +277,5 @@ class Test_ec2_networkacl_allow_ingress_any_port: ) assert ( nacl.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:network-acl/{nacl_id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_networkacl_allow_ingress_tcp_port_22/ec2_networkacl_allow_ingress_tcp_port_22_test.py b/tests/providers/aws/services/ec2/ec2_networkacl_allow_ingress_tcp_port_22/ec2_networkacl_allow_ingress_tcp_port_22_test.py index 5281f5e9d2..7b747373ba 100644 --- a/tests/providers/aws/services/ec2/ec2_networkacl_allow_ingress_tcp_port_22/ec2_networkacl_allow_ingress_tcp_port_22_test.py +++ b/tests/providers/aws/services/ec2/ec2_networkacl_allow_ingress_tcp_port_22/ec2_networkacl_allow_ingress_tcp_port_22_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -15,16 +15,16 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: def test_ec2_default_nacls(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_22.ec2_networkacl_allow_ingress_tcp_port_22.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_22.ec2_networkacl_allow_ingress_tcp_port_22 import ( @@ -41,16 +41,16 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: def test_ec2_non_default_compliant_nacl(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_22.ec2_networkacl_allow_ingress_tcp_port_22.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_22.ec2_networkacl_allow_ingress_tcp_port_22 import ( @@ -92,16 +92,16 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_22.ec2_networkacl_allow_ingress_tcp_port_22.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_22.ec2_networkacl_allow_ingress_tcp_port_22 import ( @@ -125,7 +125,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: ) assert ( nacl.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:network-acl/{nacl_id}" ) @mock_aws @@ -148,16 +148,16 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_22.ec2_networkacl_allow_ingress_tcp_port_22.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_22.ec2_networkacl_allow_ingress_tcp_port_22 import ( @@ -181,7 +181,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: ) assert ( nacl.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:network-acl/{nacl_id}" ) @mock_aws @@ -203,17 +203,17 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_22.ec2_networkacl_allow_ingress_tcp_port_22.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_22.ec2_networkacl_allow_ingress_tcp_port_22 import ( @@ -245,17 +245,17 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_22.ec2_networkacl_allow_ingress_tcp_port_22.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_22.ec2_networkacl_allow_ingress_tcp_port_22 import ( @@ -279,5 +279,5 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: ) assert ( nacl.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:network-acl/{nacl_id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_networkacl_allow_ingress_tcp_port_3389/ec2_networkacl_allow_ingress_tcp_port_3389_test.py b/tests/providers/aws/services/ec2/ec2_networkacl_allow_ingress_tcp_port_3389/ec2_networkacl_allow_ingress_tcp_port_3389_test.py index 610410868f..bec6b56515 100644 --- a/tests/providers/aws/services/ec2/ec2_networkacl_allow_ingress_tcp_port_3389/ec2_networkacl_allow_ingress_tcp_port_3389_test.py +++ b/tests/providers/aws/services/ec2/ec2_networkacl_allow_ingress_tcp_port_3389/ec2_networkacl_allow_ingress_tcp_port_3389_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -15,16 +15,16 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: def test_ec2_default_nacls(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_networkacl_allow_ingress_tcp_port_3389 import ( @@ -41,16 +41,16 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: def test_ec2_non_default_compliant_nacl(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_networkacl_allow_ingress_tcp_port_3389 import ( @@ -92,16 +92,16 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_networkacl_allow_ingress_tcp_port_3389 import ( @@ -125,7 +125,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: ) assert ( nacl.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:network-acl/{nacl_id}" ) @mock_aws @@ -148,16 +148,16 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_networkacl_allow_ingress_tcp_port_3389 import ( @@ -181,7 +181,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: ) assert ( nacl.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:network-acl/{nacl_id}" ) @mock_aws @@ -203,17 +203,17 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_networkacl_allow_ingress_tcp_port_3389 import ( @@ -245,17 +245,17 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_networkacl_allow_ingress_tcp_port_3389.ec2_networkacl_allow_ingress_tcp_port_3389 import ( @@ -279,5 +279,5 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: ) assert ( nacl.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:network-acl/{nacl_id}" ) diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_any_port/ec2_securitygroup_allow_ingress_from_internet_to_any_port_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_any_port/ec2_securitygroup_allow_ingress_from_internet_to_any_port_test.py index c815051e79..8c637add22 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_any_port/ec2_securitygroup_allow_ingress_from_internet_to_any_port_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_any_port/ec2_securitygroup_allow_ingress_from_internet_to_any_port_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,7 +20,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], expected_checks=[ "ec2_securitygroup_allow_ingress_from_internet_to_any_port" @@ -28,14 +28,14 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port import ( @@ -74,7 +74,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], expected_checks=[ "ec2_securitygroup_allow_ingress_from_internet_to_any_port" @@ -82,14 +82,14 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port import ( @@ -112,7 +112,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -139,7 +139,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], expected_checks=[ "ec2_securitygroup_allow_ingress_from_internet_to_any_port" @@ -147,14 +147,14 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port import ( @@ -177,7 +177,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -209,7 +209,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], expected_checks=[ "ec2_securitygroup_allow_ingress_from_internet_to_any_port" @@ -217,14 +217,14 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port import ( @@ -247,7 +247,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -260,7 +260,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], expected_checks=[ "ec2_securitygroup_allow_ingress_from_internet_to_any_port" @@ -269,14 +269,14 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port import ( @@ -303,7 +303,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], expected_checks=[ "ec2_securitygroup_allow_ingress_from_internet_to_any_port" @@ -312,14 +312,14 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_any_port.ec2_securitygroup_allow_ingress_from_internet_to_any_port import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018_test.py index 4295c3bd23..c75c531e87 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,19 +20,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_2 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018 import ( @@ -75,19 +75,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_2 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018 import ( @@ -112,7 +112,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_2 ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -141,19 +141,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_2 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018 import ( @@ -178,7 +178,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_2 ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -191,20 +191,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_2 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018 import ( @@ -233,20 +233,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_2 default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018 import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21_test.py index 4f683cb4e7..f64830fcd8 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,19 +20,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21 import ( @@ -75,19 +75,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21 import ( @@ -112,7 +112,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -141,19 +141,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21 import ( @@ -178,7 +178,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -191,20 +191,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21 import ( @@ -233,20 +233,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21: default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21 import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22_test.py index cbf0449282..b992ffe94c 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22_test.py @@ -5,10 +5,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -21,19 +21,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22 import ( @@ -74,19 +74,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22 import ( @@ -113,7 +113,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -142,19 +142,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22 import ( @@ -177,7 +177,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -190,20 +190,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22 import ( @@ -230,20 +230,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22: default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22 import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389_test.py index e60e76fbe2..703e9b22b8 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,19 +20,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389 import ( @@ -57,20 +57,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389 import ( @@ -97,20 +97,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389: default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389 import ( @@ -148,19 +148,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389 import ( @@ -183,7 +183,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -212,19 +212,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389 import ( @@ -247,7 +247,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888_test.py index a9edee7c18..505f5dd0e1 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,19 +20,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888 import ( @@ -75,19 +75,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888 import ( @@ -112,7 +112,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7 ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -141,19 +141,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888 import ( @@ -178,7 +178,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7 ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -191,20 +191,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888 import ( @@ -233,20 +233,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7 default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888 import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601_test.py index d085d91931..4e2db95f98 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,19 +20,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsear from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601 import ( @@ -75,19 +75,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsear from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601 import ( @@ -112,7 +112,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsear ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -141,19 +141,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsear from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601 import ( @@ -178,7 +178,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsear ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -191,20 +191,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsear from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601 import ( @@ -233,20 +233,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsear default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601 import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092_test.py index c007121892..bb1ab9fb47 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,19 +20,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092 import ( @@ -75,19 +75,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092 import ( @@ -112,7 +112,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -141,19 +141,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092 import ( @@ -178,7 +178,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -191,20 +191,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092 import ( @@ -233,20 +233,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092: default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092 import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211_test.py index d32fe6dcb1..6e2417cb13 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,19 +20,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_1 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211 import ( @@ -75,19 +75,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_1 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211 import ( @@ -112,7 +112,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_1 ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -141,19 +141,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_1 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211 import ( @@ -178,7 +178,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_1 ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -191,20 +191,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_1 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211 import ( @@ -233,20 +233,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_1 default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211 import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306_test.py index 773b5da88b..9064e2f99e 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,19 +20,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306 import ( @@ -75,19 +75,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306 import ( @@ -112,7 +112,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -141,19 +141,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306 import ( @@ -178,7 +178,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -191,20 +191,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306 import ( @@ -233,20 +233,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306: default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306 import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483_test.py index 5031055483..94acaa8f85 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,19 +20,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483 import ( @@ -75,19 +75,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483 import ( @@ -112,7 +112,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521 ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -141,19 +141,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483 import ( @@ -178,7 +178,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521 ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -191,20 +191,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483 import ( @@ -233,20 +233,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521 default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483 import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432_test.py index 53f185115e..bf1b440163 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,19 +20,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432 import ( @@ -75,19 +75,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432 import ( @@ -112,7 +112,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -141,19 +141,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432 import ( @@ -178,7 +178,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -212,19 +212,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432 import ( @@ -249,7 +249,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -262,20 +262,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432 import ( @@ -304,20 +304,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432 import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379_test.py index 32e8ae91e6..aa971e327c 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -27,7 +27,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: ] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=[ AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1, @@ -35,14 +35,14 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379 import ( @@ -70,7 +70,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: ) assert ( res.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{sg['GroupId']}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{sg['GroupId']}" ) assert res.resource_details == sg["GroupName"] assert res.resource_tags == [] @@ -87,7 +87,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: ) assert ( res.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_EU_WEST_1}:{current_audit_info.audited_account}:security-group/{sg['GroupId']}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_EU_WEST_1}:{aws_provider.identity.account}:security-group/{sg['GroupId']}" ) assert res.resource_details == sg["GroupName"] assert res.resource_tags == [] @@ -116,7 +116,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=[ AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1, @@ -124,14 +124,14 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379 import ( @@ -156,7 +156,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -185,21 +185,21 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=[ AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1, ] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379 import ( @@ -224,7 +224,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -237,23 +237,23 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=[ AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1, ] ) - current_audit_info.ignore_unused_services = True + aws_provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379 import ( @@ -280,18 +280,18 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info() - current_audit_info.ignore_unused_services = True + aws_provider = set_mocked_aws_provider() + aws_provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379 import ( @@ -315,7 +315,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: ) assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{sg['GroupId']}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{sg['GroupId']}" ) assert result[0].resource_details == sg["GroupName"] assert result[0].resource_tags == [] diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434_test.py index 0f348420d9..019afa89d3 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,19 +20,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_ from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434 import ( @@ -75,19 +75,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_ from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434 import ( @@ -112,7 +112,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_ ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -141,19 +141,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_ from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434 import ( @@ -178,7 +178,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_ ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -191,20 +191,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_ from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434 import ( @@ -233,20 +233,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_ default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434 import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23_test.py index fc4e6c0634..59f153a33d 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,19 +20,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23 import ( @@ -75,19 +75,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23 import ( @@ -112,7 +112,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -141,19 +141,19 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23 import ( @@ -178,7 +178,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -191,20 +191,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23 import ( @@ -233,20 +233,20 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23: default_sg["GroupName"] from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], ignore_unused_services=True, ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23 import ( diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_wide_open_public_ipv4/ec2_securitygroup_allow_wide_open_public_ipv4_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_wide_open_public_ipv4/ec2_securitygroup_allow_wide_open_public_ipv4_test.py index 16dd628198..f5c612070a 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_allow_wide_open_public_ipv4/ec2_securitygroup_allow_wide_open_public_ipv4_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_allow_wide_open_public_ipv4/ec2_securitygroup_allow_wide_open_public_ipv4_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,16 +19,16 @@ class Test_ec2_securitygroup_allow_wide_open_public_ipv4: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_wide_open_public_ipv4.ec2_securitygroup_allow_wide_open_public_ipv4.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_wide_open_public_ipv4.ec2_securitygroup_allow_wide_open_public_ipv4 import ( @@ -67,16 +67,16 @@ class Test_ec2_securitygroup_allow_wide_open_public_ipv4: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_wide_open_public_ipv4.ec2_securitygroup_allow_wide_open_public_ipv4.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_wide_open_public_ipv4.ec2_securitygroup_allow_wide_open_public_ipv4 import ( @@ -99,7 +99,7 @@ class Test_ec2_securitygroup_allow_wide_open_public_ipv4: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -126,16 +126,16 @@ class Test_ec2_securitygroup_allow_wide_open_public_ipv4: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_allow_wide_open_public_ipv4.ec2_securitygroup_allow_wide_open_public_ipv4.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_wide_open_public_ipv4.ec2_securitygroup_allow_wide_open_public_ipv4 import ( @@ -158,7 +158,7 @@ class Test_ec2_securitygroup_allow_wide_open_public_ipv4: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_default_restrict_traffic/ec2_securitygroup_default_restrict_traffic_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_default_restrict_traffic/ec2_securitygroup_default_restrict_traffic_test.py index 00514eca12..00decb9d11 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_default_restrict_traffic/ec2_securitygroup_default_restrict_traffic_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_default_restrict_traffic/ec2_securitygroup_default_restrict_traffic_test.py @@ -3,10 +3,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_ec2_securitygroup_default_restrict_traffic: @@ -34,14 +31,14 @@ class Test_ec2_securitygroup_default_restrict_traffic: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_default_restrict_traffic.ec2_securitygroup_default_restrict_traffic.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_default_restrict_traffic.ec2_securitygroup_default_restrict_traffic import ( @@ -60,7 +57,7 @@ class Test_ec2_securitygroup_default_restrict_traffic: ) assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert result[0].resource_details == default_sg_name assert result[0].resource_tags == [] @@ -97,14 +94,14 @@ class Test_ec2_securitygroup_default_restrict_traffic: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_default_restrict_traffic.ec2_securitygroup_default_restrict_traffic.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_default_restrict_traffic.ec2_securitygroup_default_restrict_traffic import ( @@ -123,7 +120,7 @@ class Test_ec2_securitygroup_default_restrict_traffic: ) assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert result[0].resource_details == default_sg_name assert result[0].resource_tags == [] @@ -142,14 +139,14 @@ class Test_ec2_securitygroup_default_restrict_traffic: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_default_restrict_traffic.ec2_securitygroup_default_restrict_traffic.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_default_restrict_traffic.ec2_securitygroup_default_restrict_traffic import ( @@ -168,7 +165,7 @@ class Test_ec2_securitygroup_default_restrict_traffic: ) assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert result[0].resource_details == default_sg_name assert result[0].resource_tags == [] diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_from_launch_wizard/ec2_securitygroup_from_launch_wizard_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_from_launch_wizard/ec2_securitygroup_from_launch_wizard_test.py index 48dc4e1301..01c8f98d39 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_from_launch_wizard/ec2_securitygroup_from_launch_wizard_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_from_launch_wizard/ec2_securitygroup_from_launch_wizard_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -21,16 +21,16 @@ class Test_ec2_securitygroup_from_launch_wizard: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_from_launch_wizard.ec2_securitygroup_from_launch_wizard.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_from_launch_wizard.ec2_securitygroup_from_launch_wizard import ( @@ -60,16 +60,16 @@ class Test_ec2_securitygroup_from_launch_wizard: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_from_launch_wizard.ec2_securitygroup_from_launch_wizard.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_from_launch_wizard.ec2_securitygroup_from_launch_wizard import ( @@ -92,7 +92,7 @@ class Test_ec2_securitygroup_from_launch_wizard: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{sg_id}" ) assert sg.resource_details == sg_name @@ -119,16 +119,16 @@ class Test_ec2_securitygroup_from_launch_wizard: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_from_launch_wizard.ec2_securitygroup_from_launch_wizard.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_from_launch_wizard.ec2_securitygroup_from_launch_wizard import ( @@ -151,7 +151,7 @@ class Test_ec2_securitygroup_from_launch_wizard: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_not_used/ec2_securitygroup_not_used_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_not_used/ec2_securitygroup_not_used_test.py index 24b74299c8..7a0b40a1ae 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_not_used/ec2_securitygroup_not_used_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_not_used/ec2_securitygroup_not_used_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -23,19 +23,19 @@ class Test_ec2_securitygroup_not_used: from prowler.providers.aws.services.awslambda.awslambda_service import Lambda from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=["us-east-1", "eu-west-1"] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used.awslambda_client", - new=Lambda(current_audit_info), + new=Lambda(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used import ( @@ -62,19 +62,19 @@ class Test_ec2_securitygroup_not_used: from prowler.providers.aws.services.awslambda.awslambda_service import Lambda from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=["us-east-1", "eu-west-1"] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used.awslambda_client", - new=Lambda(current_audit_info), + new=Lambda(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used import ( @@ -94,7 +94,7 @@ class Test_ec2_securitygroup_not_used: ) assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{sg.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{sg.id}" ) assert result[0].resource_id == sg.id assert result[0].resource_details == sg_name @@ -116,19 +116,19 @@ class Test_ec2_securitygroup_not_used: from prowler.providers.aws.services.awslambda.awslambda_service import Lambda from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=["us-east-1", "eu-west-1"] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used.awslambda_client", - new=Lambda(current_audit_info), + new=Lambda(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used import ( @@ -152,7 +152,7 @@ class Test_ec2_securitygroup_not_used: ) assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{sg.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{sg.id}" ) assert result[0].resource_id == sg.id assert result[0].resource_details == sg_name @@ -198,19 +198,19 @@ class Test_ec2_securitygroup_not_used: from prowler.providers.aws.services.awslambda.awslambda_service import Lambda from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=["us-east-1", "eu-west-1"] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used.awslambda_client", - new=Lambda(current_audit_info), + new=Lambda(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used import ( @@ -234,7 +234,7 @@ class Test_ec2_securitygroup_not_used: ) assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{sg.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{sg.id}" ) assert result[0].resource_id == sg.id assert result[0].resource_details == sg_name @@ -273,19 +273,19 @@ class Test_ec2_securitygroup_not_used: from prowler.providers.aws.services.awslambda.awslambda_service import Lambda from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( audited_regions=["us-east-1", "eu-west-1"] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used.awslambda_client", - new=Lambda(current_audit_info), + new=Lambda(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_not_used.ec2_securitygroup_not_used import ( @@ -305,7 +305,7 @@ class Test_ec2_securitygroup_not_used: ) assert ( result[0].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{sg.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{sg.id}" ) assert result[0].resource_id == sg.id assert result[0].resource_details == sg_name @@ -318,7 +318,7 @@ class Test_ec2_securitygroup_not_used: ) assert ( result[1].resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{sg1.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{sg1.id}" ) assert result[1].resource_id == sg1.id assert result[1].resource_details == sg_name1 diff --git a/tests/providers/aws/services/ec2/ec2_securitygroup_with_many_ingress_egress_rules/ec2_securitygroup_with_many_ingress_egress_rules_test.py b/tests/providers/aws/services/ec2/ec2_securitygroup_with_many_ingress_egress_rules/ec2_securitygroup_with_many_ingress_egress_rules_test.py index 513a9c2783..c737e299dc 100644 --- a/tests/providers/aws/services/ec2/ec2_securitygroup_with_many_ingress_egress_rules/ec2_securitygroup_with_many_ingress_egress_rules_test.py +++ b/tests/providers/aws/services/ec2/ec2_securitygroup_with_many_ingress_egress_rules/ec2_securitygroup_with_many_ingress_egress_rules_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,17 +19,17 @@ class Test_ec2_securitygroup_with_many_ingress_egress_rules: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - current_audit_info.audit_config = {"max_security_group_rules": 50} + aws_provider._audit_config = {"max_security_group_rules": 50} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_with_many_ingress_egress_rules.ec2_securitygroup_with_many_ingress_egress_rules.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_with_many_ingress_egress_rules.ec2_securitygroup_with_many_ingress_egress_rules import ( @@ -71,17 +71,17 @@ class Test_ec2_securitygroup_with_many_ingress_egress_rules: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - current_audit_info.audit_config = {"max_security_group_rules": 50} + aws_provider._audit_config = {"max_security_group_rules": 50} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_with_many_ingress_egress_rules.ec2_securitygroup_with_many_ingress_egress_rules.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_with_many_ingress_egress_rules.ec2_securitygroup_with_many_ingress_egress_rules import ( @@ -104,7 +104,7 @@ class Test_ec2_securitygroup_with_many_ingress_egress_rules: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] @@ -133,17 +133,17 @@ class Test_ec2_securitygroup_with_many_ingress_egress_rules: from prowler.providers.aws.services.ec2.ec2_service import EC2 - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - current_audit_info.audit_config = {"max_security_group_rules": 50} + aws_provider._audit_config = {"max_security_group_rules": 50} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.ec2.ec2_securitygroup_with_many_ingress_egress_rules.ec2_securitygroup_with_many_ingress_egress_rules.ec2_client", - new=EC2(current_audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.ec2.ec2_securitygroup_with_many_ingress_egress_rules.ec2_securitygroup_with_many_ingress_egress_rules import ( @@ -166,7 +166,7 @@ class Test_ec2_securitygroup_with_many_ingress_egress_rules: ) assert ( sg.resource_arn - == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:security-group/{default_sg_id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{aws_provider.identity.account}:security-group/{default_sg_id}" ) assert sg.resource_details == default_sg_name assert sg.resource_tags == [] diff --git a/tests/providers/aws/services/ec2/ec2_service_test.py b/tests/providers/aws/services/ec2/ec2_service_test.py index 95f3a2d335..936bcf5beb 100644 --- a/tests/providers/aws/services/ec2/ec2_service_test.py +++ b/tests/providers/aws/services/ec2/ec2_service_test.py @@ -9,11 +9,11 @@ from freezegun import freeze_time from moto import mock_aws from prowler.providers.aws.services.ec2.ec2_service import EC2 -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) EXAMPLE_AMI_ID = "ami-12c6146b" @@ -25,20 +25,20 @@ class Test_EC2_Service: @mock_aws def test_service(self): # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert ec2.service == "ec2" # Test EC2 Client @mock_aws def test_client(self): # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) for regional_client in ec2.regional_clients.values(): assert regional_client.__class__.__name__ == "EC2" @@ -46,20 +46,20 @@ class Test_EC2_Service: @mock_aws def test__get_session__(self): # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert ec2.session.__class__.__name__ == "Session" # Test EC2 Session @mock_aws def test_audited_account(self): # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert ec2.audited_account == AWS_ACCOUNT_NUMBER # Test EC2 Describe Instances @@ -79,15 +79,15 @@ class Test_EC2_Service: ImageId=image_id, ) # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert len(ec2.instances) == 1 assert re.match(r"i-[0-9a-z]{17}", ec2.instances[0].id) assert ( ec2.instances[0].arn - == f"arn:{audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:instance/{ec2.instances[0].id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:instance/{ec2.instances[0].id}" ) assert ec2.instances[0].type == "m1.small" assert ec2.instances[0].state == "running" @@ -136,13 +136,13 @@ class Test_EC2_Service: ], ) # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1], expected_checks=[ "ec2_securitygroup_allow_ingress_from_internet_to_any_port" ], ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert sg_id in str(ec2.security_groups) for security_group in ec2.security_groups: @@ -150,7 +150,7 @@ class Test_EC2_Service: assert security_group.name == "test-security-group" assert ( security_group.arn - == f"arn:{audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:security-group/{security_group.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:security-group/{security_group.id}" ) assert re.match(r"sg-[0-9a-z]{17}", security_group.id) assert security_group.region == AWS_REGION_US_EAST_1 @@ -198,10 +198,10 @@ class Test_EC2_Service: ], ).id # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert nacl_id in str(ec2.network_acls) for acl in ec2.network_acls: @@ -209,7 +209,7 @@ class Test_EC2_Service: assert re.match(r"acl-[0-9a-z]{8}", acl.id) assert ( acl.arn - == f"arn:{audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:network-acl/{acl.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:network-acl/{acl.id}" ) assert acl.entries == [] assert acl.tags == [ @@ -241,10 +241,10 @@ class Test_EC2_Service: )["SnapshotId"] snapshot_arn = f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:snapshot/{snapshot_id}" # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert snapshot_id in str(ec2.snapshots) assert ec2.volumes_with_snapshots[volume_id] is True @@ -284,10 +284,10 @@ class Test_EC2_Service: SnapshotId=snapshot_id, ) # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert snapshot_id in str(ec2.snapshots) for snapshot in ec2.snapshots: @@ -295,7 +295,7 @@ class Test_EC2_Service: assert re.match(r"snap-[0-9a-z]{8}", snapshot.id) assert ( snapshot.arn - == f"arn:{audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:snapshot/{snapshot.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:snapshot/{snapshot.id}" ) assert snapshot.region == AWS_REGION_US_EAST_1 assert not snapshot.encrypted @@ -313,10 +313,10 @@ class Test_EC2_Service: UserData="This is some user_data", ) # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert user_data == b64decode(ec2.instances[0].user_data).decode("utf-8") # Test EC2 Get EBS Encryption by default @@ -325,10 +325,10 @@ class Test_EC2_Service: ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) ec2_client.enable_ebs_encryption_by_default() # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) # One result per region assert len(ec2.ebs_encryption_by_default) == 2 @@ -354,10 +354,10 @@ class Test_EC2_Service: ], )["AllocationId"] # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert "127.38.43.222" in str(ec2.elastic_ips) assert ( ec2.elastic_ips[0].arn @@ -385,10 +385,10 @@ class Test_EC2_Service: ) # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert sg.id in str(ec2.security_groups) for security_group in ec2.security_groups: @@ -396,7 +396,7 @@ class Test_EC2_Service: assert security_group.name == "test-securitygroup" assert ( security_group.arn - == f"arn:{audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:security-group/{security_group.id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:security-group/{security_group.id}" ) assert re.match(r"sg-[0-9a-z]{17}", security_group.id) assert security_group.region == AWS_REGION_US_EAST_1 @@ -438,10 +438,10 @@ class Test_EC2_Service: ) # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert len(ec2.network_interfaces) == 1 assert ec2.network_interfaces[0].public_ip == eip["PublicIp"] @@ -484,17 +484,17 @@ class Test_EC2_Service: )["ImageId"] # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert len(ec2.images) == 1 assert ec2.images[0].id == image_id assert re.match(r"ami-[0-9a-z]{8}", ec2.images[0].id) assert ( ec2.images[0].arn - == f"arn:{audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:image/{ec2.images[0].id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:image/{ec2.images[0].id}" ) assert not ec2.images[0].public assert ec2.images[0].region == AWS_REGION_US_EAST_1 @@ -527,17 +527,17 @@ class Test_EC2_Service: )["VolumeId"] # EC2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - ec2 = EC2(audit_info) + ec2 = EC2(aws_provider) assert len(ec2.volumes) == 1 assert ec2.volumes[0].id == volume_id assert re.match(r"vol-[0-9a-z]{8}", ec2.volumes[0].id) assert ( ec2.volumes[0].arn - == f"arn:{audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:volume/{ec2.volumes[0].id}" + == f"arn:{aws_provider.identity.partition}:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:volume/{ec2.volumes[0].id}" ) assert ec2.volumes[0].region == AWS_REGION_US_EAST_1 assert not ec2.volumes[0].encrypted diff --git a/tests/providers/aws/services/ecr/ecr_registry_scan_images_on_push_enabled/ecr_registry_scan_images_on_push_enabled_test.py b/tests/providers/aws/services/ecr/ecr_registry_scan_images_on_push_enabled/ecr_registry_scan_images_on_push_enabled_test.py index 8220f3d41c..6b9389db21 100644 --- a/tests/providers/aws/services/ecr/ecr_registry_scan_images_on_push_enabled/ecr_registry_scan_images_on_push_enabled_test.py +++ b/tests/providers/aws/services/ecr/ecr_registry_scan_images_on_push_enabled/ecr_registry_scan_images_on_push_enabled_test.py @@ -6,10 +6,10 @@ from prowler.providers.aws.services.ecr.ecr_service import ( Repository, ScanningRule, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) repository_name = "test_repo" @@ -24,8 +24,8 @@ class Test_ecr_registry_scan_images_on_push_enabled: ecr_client.registries = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_registry_scan_images_on_push_enabled.ecr_registry_scan_images_on_push_enabled.ecr_client", ecr_client, @@ -50,8 +50,8 @@ class Test_ecr_registry_scan_images_on_push_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_registry_scan_images_on_push_enabled.ecr_registry_scan_images_on_push_enabled.ecr_client", ecr_client, @@ -91,8 +91,8 @@ class Test_ecr_registry_scan_images_on_push_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_registry_scan_images_on_push_enabled.ecr_registry_scan_images_on_push_enabled.ecr_client", ecr_client, @@ -136,8 +136,8 @@ class Test_ecr_registry_scan_images_on_push_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_registry_scan_images_on_push_enabled.ecr_registry_scan_images_on_push_enabled.ecr_client", ecr_client, @@ -179,8 +179,8 @@ class Test_ecr_registry_scan_images_on_push_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_registry_scan_images_on_push_enabled.ecr_registry_scan_images_on_push_enabled.ecr_client", ecr_client, diff --git a/tests/providers/aws/services/ecr/ecr_repositories_lifecycle_policy_enabled/ecr_repositories_lifecycle_policy_enabled_test.py b/tests/providers/aws/services/ecr/ecr_repositories_lifecycle_policy_enabled/ecr_repositories_lifecycle_policy_enabled_test.py index 779f177844..0ec58d199c 100644 --- a/tests/providers/aws/services/ecr/ecr_repositories_lifecycle_policy_enabled/ecr_repositories_lifecycle_policy_enabled_test.py +++ b/tests/providers/aws/services/ecr/ecr_repositories_lifecycle_policy_enabled/ecr_repositories_lifecycle_policy_enabled_test.py @@ -1,10 +1,10 @@ from unittest import mock from prowler.providers.aws.services.ecr.ecr_service import Registry, Repository -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) repository_name = "test_repo" @@ -32,8 +32,8 @@ class Test_ecr_repositories_lifecycle_policy_enabled: ecr_client.registries = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_lifecycle_policy_enabled.ecr_repositories_lifecycle_policy_enabled.ecr_client", ecr_client, @@ -58,8 +58,8 @@ class Test_ecr_repositories_lifecycle_policy_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_lifecycle_policy_enabled.ecr_repositories_lifecycle_policy_enabled.ecr_client", ecr_client, @@ -94,8 +94,8 @@ class Test_ecr_repositories_lifecycle_policy_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_lifecycle_policy_enabled.ecr_repositories_lifecycle_policy_enabled.ecr_client", ecr_client, @@ -138,8 +138,8 @@ class Test_ecr_repositories_lifecycle_policy_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_lifecycle_policy_enabled.ecr_repositories_lifecycle_policy_enabled.ecr_client", ecr_client, diff --git a/tests/providers/aws/services/ecr/ecr_repositories_not_publicly_accessible/ecr_repositories_not_publicly_accessible_test.py b/tests/providers/aws/services/ecr/ecr_repositories_not_publicly_accessible/ecr_repositories_not_publicly_accessible_test.py index e581408fb8..0433c47eb5 100644 --- a/tests/providers/aws/services/ecr/ecr_repositories_not_publicly_accessible/ecr_repositories_not_publicly_accessible_test.py +++ b/tests/providers/aws/services/ecr/ecr_repositories_not_publicly_accessible/ecr_repositories_not_publicly_accessible_test.py @@ -1,10 +1,10 @@ from unittest import mock from prowler.providers.aws.services.ecr.ecr_service import Registry, Repository -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) repository_name = "test_repo" @@ -44,8 +44,8 @@ class Test_ecr_repositories_not_publicly_accessible: ecr_client.registries = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_not_publicly_accessible.ecr_repositories_not_publicly_accessible.ecr_client", ecr_client, @@ -70,8 +70,8 @@ class Test_ecr_repositories_not_publicly_accessible: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_not_publicly_accessible.ecr_repositories_not_publicly_accessible.ecr_client", ecr_client, @@ -106,8 +106,8 @@ class Test_ecr_repositories_not_publicly_accessible: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_not_publicly_accessible.ecr_repositories_not_publicly_accessible.ecr_client", ecr_client, @@ -149,8 +149,8 @@ class Test_ecr_repositories_not_publicly_accessible: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_not_publicly_accessible.ecr_repositories_not_publicly_accessible.ecr_client", ecr_client, diff --git a/tests/providers/aws/services/ecr/ecr_repositories_scan_images_on_push_enabled/ecr_repositories_scan_images_on_push_enabled_test.py b/tests/providers/aws/services/ecr/ecr_repositories_scan_images_on_push_enabled/ecr_repositories_scan_images_on_push_enabled_test.py index 3b26963eb8..016409c26d 100644 --- a/tests/providers/aws/services/ecr/ecr_repositories_scan_images_on_push_enabled/ecr_repositories_scan_images_on_push_enabled_test.py +++ b/tests/providers/aws/services/ecr/ecr_repositories_scan_images_on_push_enabled/ecr_repositories_scan_images_on_push_enabled_test.py @@ -1,10 +1,10 @@ from unittest import mock from prowler.providers.aws.services.ecr.ecr_service import Registry, Repository -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) repository_name = "test_repo" @@ -32,8 +32,8 @@ class Test_ecr_repositories_scan_images_on_push_enabled: ecr_client.registries = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_images_on_push_enabled.ecr_repositories_scan_images_on_push_enabled.ecr_client", ecr_client, @@ -58,8 +58,8 @@ class Test_ecr_repositories_scan_images_on_push_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_images_on_push_enabled.ecr_repositories_scan_images_on_push_enabled.ecr_client", ecr_client, @@ -94,8 +94,8 @@ class Test_ecr_repositories_scan_images_on_push_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_images_on_push_enabled.ecr_repositories_scan_images_on_push_enabled.ecr_client", ecr_client, @@ -137,8 +137,8 @@ class Test_ecr_repositories_scan_images_on_push_enabled: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_images_on_push_enabled.ecr_repositories_scan_images_on_push_enabled.ecr_client", ecr_client, diff --git a/tests/providers/aws/services/ecr/ecr_repositories_scan_vulnerabilities_in_latest_image/ecr_repositories_scan_vulnerabilities_in_latest_image_test.py b/tests/providers/aws/services/ecr/ecr_repositories_scan_vulnerabilities_in_latest_image/ecr_repositories_scan_vulnerabilities_in_latest_image_test.py index a6bd756c96..dcf6dc6710 100644 --- a/tests/providers/aws/services/ecr/ecr_repositories_scan_vulnerabilities_in_latest_image/ecr_repositories_scan_vulnerabilities_in_latest_image_test.py +++ b/tests/providers/aws/services/ecr/ecr_repositories_scan_vulnerabilities_in_latest_image/ecr_repositories_scan_vulnerabilities_in_latest_image_test.py @@ -7,10 +7,10 @@ from prowler.providers.aws.services.ecr.ecr_service import ( Registry, Repository, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) repository_name = "test_repo" @@ -40,8 +40,8 @@ class Test_ecr_repositories_scan_vulnerabilities_in_latest_image: ecr_client.audit_config = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_client", ecr_client, @@ -67,8 +67,8 @@ class Test_ecr_repositories_scan_vulnerabilities_in_latest_image: ecr_client.audit_config = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_client", ecr_client, @@ -104,8 +104,8 @@ class Test_ecr_repositories_scan_vulnerabilities_in_latest_image: ecr_client.audit_config = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_client", ecr_client, @@ -151,8 +151,8 @@ class Test_ecr_repositories_scan_vulnerabilities_in_latest_image: ecr_client.audit_config = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_client", ecr_client, @@ -209,8 +209,8 @@ class Test_ecr_repositories_scan_vulnerabilities_in_latest_image: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_client", ecr_client, @@ -267,8 +267,8 @@ class Test_ecr_repositories_scan_vulnerabilities_in_latest_image: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_client", ecr_client, @@ -325,8 +325,8 @@ class Test_ecr_repositories_scan_vulnerabilities_in_latest_image: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_client", ecr_client, @@ -383,8 +383,8 @@ class Test_ecr_repositories_scan_vulnerabilities_in_latest_image: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_client", ecr_client, @@ -443,8 +443,8 @@ class Test_ecr_repositories_scan_vulnerabilities_in_latest_image: } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_client", ecr_client, @@ -497,8 +497,8 @@ class Test_ecr_repositories_scan_vulnerabilities_in_latest_image: ecr_client.audit_config = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_client", ecr_client, @@ -551,8 +551,8 @@ class Test_ecr_repositories_scan_vulnerabilities_in_latest_image: ecr_client.audit_config = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.ecr.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_repositories_scan_vulnerabilities_in_latest_image.ecr_client", ecr_client, diff --git a/tests/providers/aws/services/ecr/ecr_service_test.py b/tests/providers/aws/services/ecr/ecr_service_test.py index 7e3605fd41..e31b651314 100644 --- a/tests/providers/aws/services/ecr/ecr_service_test.py +++ b/tests/providers/aws/services/ecr/ecr_service_test.py @@ -6,10 +6,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.ecr.ecr_service import ECR, ScanningRule -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) repo_arn = f"arn:aws:ecr:eu-west-1:{AWS_ACCOUNT_NUMBER}:repository/test-repo" @@ -82,8 +82,8 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -93,27 +93,27 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_ECR_Service: # Test ECR Service def test_service(self): - audit_info = set_mocked_aws_audit_info() - ecr = ECR(audit_info) + aws_provider = set_mocked_aws_provider() + ecr = ECR(aws_provider) assert ecr.service == "ecr" # Test ECR client def test_client(self): - audit_info = set_mocked_aws_audit_info() - ecr = ECR(audit_info) + aws_provider = set_mocked_aws_provider() + ecr = ECR(aws_provider) for regional_client in ecr.regional_clients.values(): assert regional_client.__class__.__name__ == "ECR" # Test ECR session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info() - ecr = ECR(audit_info) + aws_provider = set_mocked_aws_provider() + ecr = ECR(aws_provider) assert ecr.session.__class__.__name__ == "Session" # Test describe ECR repositories @@ -127,8 +127,8 @@ class Test_ECR_Service: {"Key": "test", "Value": "test"}, ], ) - audit_info = set_mocked_aws_audit_info() - ecr = ECR(audit_info) + aws_provider = set_mocked_aws_provider() + ecr = ECR(aws_provider) assert len(ecr.registries) == 1 assert ecr.registries[AWS_REGION_EU_WEST_1].id == AWS_ACCOUNT_NUMBER @@ -150,8 +150,8 @@ class Test_ECR_Service: repositoryName=repo_name, imageScanningConfiguration={"scanOnPush": True}, ) - audit_info = set_mocked_aws_audit_info() - ecr = ECR(audit_info) + aws_provider = set_mocked_aws_provider() + ecr = ECR(aws_provider) assert len(ecr.registries) == 1 assert len(ecr.registries[AWS_REGION_EU_WEST_1].repositories) == 1 assert ecr.registries[AWS_REGION_EU_WEST_1].repositories[0].name == repo_name @@ -196,8 +196,8 @@ class Test_ECR_Service: repositoryName=repo_name, imageScanningConfiguration={"scanOnPush": True}, ) - audit_info = set_mocked_aws_audit_info() - ecr = ECR(audit_info) + aws_provider = set_mocked_aws_provider() + ecr = ECR(aws_provider) assert len(ecr.registries) == 1 assert len(ecr.registries[AWS_REGION_EU_WEST_1].repositories) == 1 assert ecr.registries[AWS_REGION_EU_WEST_1].repositories[0].name == repo_name @@ -213,8 +213,8 @@ class Test_ECR_Service: repositoryName=repo_name, imageScanningConfiguration={"scanOnPush": True}, ) - audit_info = set_mocked_aws_audit_info() - ecr = ECR(audit_info) + aws_provider = set_mocked_aws_provider() + ecr = ECR(aws_provider) assert len(ecr.registries) == 1 assert len(ecr.registries[AWS_REGION_EU_WEST_1].repositories) == 1 assert ecr.registries[AWS_REGION_EU_WEST_1].repositories[0].name == repo_name @@ -321,8 +321,8 @@ class Test_ECR_Service: # Test get ECR Registries Scanning Configuration @mock_aws def test__get_registry_scanning_configuration__(self): - audit_info = set_mocked_aws_audit_info() - ecr = ECR(audit_info) + aws_provider = set_mocked_aws_provider() + ecr = ECR(aws_provider) assert len(ecr.registries) == 1 assert ecr.registries[AWS_REGION_EU_WEST_1].id == AWS_ACCOUNT_NUMBER assert ecr.registries[AWS_REGION_EU_WEST_1].scan_type == "BASIC" diff --git a/tests/providers/aws/services/ecs/ecs_service_test.py b/tests/providers/aws/services/ecs/ecs_service_test.py index 807ed4bb0c..1b2142cc36 100644 --- a/tests/providers/aws/services/ecs/ecs_service_test.py +++ b/tests/providers/aws/services/ecs/ecs_service_test.py @@ -4,14 +4,11 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.ecs.ecs_service import ECS -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -19,27 +16,27 @@ def mock_generate_regional_clients(service, audit_info): @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_ECS_Service: # Test ECS Service def test_service(self): - audit_info = set_mocked_aws_audit_info() - ecs = ECS(audit_info) + aws_provider = set_mocked_aws_provider() + ecs = ECS(aws_provider) assert ecs.service == "ecs" # Test ECS client def test_client(self): - audit_info = set_mocked_aws_audit_info() - ecs = ECS(audit_info) + aws_provider = set_mocked_aws_provider() + ecs = ECS(aws_provider) for reg_client in ecs.regional_clients.values(): assert reg_client.__class__.__name__ == "ECS" # Test ECS session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info() - ecs = ECS(audit_info) + aws_provider = set_mocked_aws_provider() + ecs = ECS(aws_provider) assert ecs.session.__class__.__name__ == "Session" # Test list ECS task definitions @@ -59,8 +56,8 @@ class Test_ECS_Service: ) task_definition = ecs_client.register_task_definition(**definition) - audit_info = set_mocked_aws_audit_info() - ecs = ECS(audit_info) + aws_provider = set_mocked_aws_provider() + ecs = ECS(aws_provider) assert len(ecs.task_definitions) == 1 assert ( @@ -96,8 +93,8 @@ class Test_ECS_Service: ) task_definition = ecs_client.register_task_definition(**definition) - audit_info = set_mocked_aws_audit_info() - ecs = ECS(audit_info) + aws_provider = set_mocked_aws_provider() + ecs = ECS(aws_provider) assert len(ecs.task_definitions) == 1 assert ( diff --git a/tests/providers/aws/services/efs/efs_service_test.py b/tests/providers/aws/services/efs/efs_service_test.py index 4f9a4026e5..c1bfd76285 100644 --- a/tests/providers/aws/services/efs/efs_service_test.py +++ b/tests/providers/aws/services/efs/efs_service_test.py @@ -6,10 +6,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.efs.efs_service import EFS -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking Access Analyzer Calls @@ -41,8 +41,8 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -52,18 +52,18 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_EFS: # Test EFS Session def test__get_session__(self): - access_analyzer = EFS(set_mocked_aws_audit_info()) + access_analyzer = EFS(set_mocked_aws_provider()) assert access_analyzer.session.__class__.__name__ == "Session" # Test EFS Service def test__get_service__(self): - access_analyzer = EFS(set_mocked_aws_audit_info()) + access_analyzer = EFS(set_mocked_aws_provider()) assert access_analyzer.service == "efs" @mock_aws @@ -77,7 +77,7 @@ class Test_EFS: {"Key": "test", "Value": "test"}, ], ) - filesystem = EFS(set_mocked_aws_audit_info()) + filesystem = EFS(set_mocked_aws_provider()) assert len(filesystem.filesystems) == 1 assert filesystem.filesystems[0].id == efs["FileSystemId"] assert filesystem.filesystems[0].encrypted == efs["Encrypted"] @@ -92,7 +92,7 @@ class Test_EFS: efs = efs_client.create_file_system( CreationToken=creation_token, Encrypted=True ) - filesystem = EFS(set_mocked_aws_audit_info()) + filesystem = EFS(set_mocked_aws_provider()) assert len(filesystem.filesystems) == 1 assert filesystem.filesystems[0].id == efs["FileSystemId"] assert filesystem.filesystems[0].encrypted == efs["Encrypted"] diff --git a/tests/providers/aws/services/eks/eks_cluster_kms_cmk_encryption_in_secrets_enabled/eks_cluster_kms_cmk_encryption_in_secrets_enabled_test.py b/tests/providers/aws/services/eks/eks_cluster_kms_cmk_encryption_in_secrets_enabled/eks_cluster_kms_cmk_encryption_in_secrets_enabled_test.py index f1edb2b70d..ee52928b70 100644 --- a/tests/providers/aws/services/eks/eks_cluster_kms_cmk_encryption_in_secrets_enabled/eks_cluster_kms_cmk_encryption_in_secrets_enabled_test.py +++ b/tests/providers/aws/services/eks/eks_cluster_kms_cmk_encryption_in_secrets_enabled/eks_cluster_kms_cmk_encryption_in_secrets_enabled_test.py @@ -2,10 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.eks.eks_service import EKSCluster -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 cluster_name = "cluster_test" cluster_arn = ( diff --git a/tests/providers/aws/services/eks/eks_cluster_network_policy_enabled/eks_cluster_network_policy_enabled_test.py b/tests/providers/aws/services/eks/eks_cluster_network_policy_enabled/eks_cluster_network_policy_enabled_test.py index d1264f637d..3639399aaf 100644 --- a/tests/providers/aws/services/eks/eks_cluster_network_policy_enabled/eks_cluster_network_policy_enabled_test.py +++ b/tests/providers/aws/services/eks/eks_cluster_network_policy_enabled/eks_cluster_network_policy_enabled_test.py @@ -1,10 +1,7 @@ from unittest import mock from prowler.providers.aws.services.eks.eks_service import EKSCluster -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 cluster_name = "cluster_test" cluster_arn = ( diff --git a/tests/providers/aws/services/eks/eks_cluster_private_nodes_enabled/eks_cluster_private_nodes_enabled_test.py b/tests/providers/aws/services/eks/eks_cluster_private_nodes_enabled/eks_cluster_private_nodes_enabled_test.py index 4598c05197..baca3e3111 100644 --- a/tests/providers/aws/services/eks/eks_cluster_private_nodes_enabled/eks_cluster_private_nodes_enabled_test.py +++ b/tests/providers/aws/services/eks/eks_cluster_private_nodes_enabled/eks_cluster_private_nodes_enabled_test.py @@ -1,10 +1,7 @@ from unittest import mock from prowler.providers.aws.services.eks.eks_service import EKSCluster -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 cluster_name = "cluster_test" cluster_arn = ( diff --git a/tests/providers/aws/services/eks/eks_control_plane_endpoint_access_restricted/eks_control_plane_endpoint_access_restricted_test.py b/tests/providers/aws/services/eks/eks_control_plane_endpoint_access_restricted/eks_control_plane_endpoint_access_restricted_test.py index a150aa6406..5b1604b23f 100644 --- a/tests/providers/aws/services/eks/eks_control_plane_endpoint_access_restricted/eks_control_plane_endpoint_access_restricted_test.py +++ b/tests/providers/aws/services/eks/eks_control_plane_endpoint_access_restricted/eks_control_plane_endpoint_access_restricted_test.py @@ -2,10 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.eks.eks_service import EKSCluster -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 cluster_name = "cluster_test" cluster_arn = ( diff --git a/tests/providers/aws/services/eks/eks_control_plane_logging_all_types_enabled/eks_control_plane_logging_all_types_enabled_test.py b/tests/providers/aws/services/eks/eks_control_plane_logging_all_types_enabled/eks_control_plane_logging_all_types_enabled_test.py index 5931360bdf..cee106aa80 100644 --- a/tests/providers/aws/services/eks/eks_control_plane_logging_all_types_enabled/eks_control_plane_logging_all_types_enabled_test.py +++ b/tests/providers/aws/services/eks/eks_control_plane_logging_all_types_enabled/eks_control_plane_logging_all_types_enabled_test.py @@ -5,10 +5,7 @@ from prowler.providers.aws.services.eks.eks_service import ( EKSCluster, EKSClusterLoggingEntity, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 cluster_name = "cluster_test" cluster_arn = ( diff --git a/tests/providers/aws/services/eks/eks_endpoints_not_publicly_accessible/eks_endpoints_not_publicly_accessible_test.py b/tests/providers/aws/services/eks/eks_endpoints_not_publicly_accessible/eks_endpoints_not_publicly_accessible_test.py index 7901b679c4..fdf63a1573 100644 --- a/tests/providers/aws/services/eks/eks_endpoints_not_publicly_accessible/eks_endpoints_not_publicly_accessible_test.py +++ b/tests/providers/aws/services/eks/eks_endpoints_not_publicly_accessible/eks_endpoints_not_publicly_accessible_test.py @@ -2,10 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.eks.eks_service import EKSCluster -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 cluster_name = "cluster_test" cluster_arn = ( diff --git a/tests/providers/aws/services/eks/eks_service_test.py b/tests/providers/aws/services/eks/eks_service_test.py index ba0675d6f1..0cb9e94c15 100644 --- a/tests/providers/aws/services/eks/eks_service_test.py +++ b/tests/providers/aws/services/eks/eks_service_test.py @@ -4,10 +4,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.eks.eks_service import EKS -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) cluster_name = "test" @@ -16,8 +16,8 @@ cidr_block_subnet_1 = "10.0.0.0/22" cidr_block_subnet_2 = "10.0.4.0/22" -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -25,27 +25,27 @@ def mock_generate_regional_clients(service, audit_info): @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_EKS_Service: # Test EKS Service def test_service(self): - audit_info = set_mocked_aws_audit_info() - eks = EKS(audit_info) + aws_provider = set_mocked_aws_provider() + eks = EKS(aws_provider) assert eks.service == "eks" # Test EKS client def test_client(self): - audit_info = set_mocked_aws_audit_info() - eks = EKS(audit_info) + aws_provider = set_mocked_aws_provider() + eks = EKS(aws_provider) for reg_client in eks.regional_clients.values(): assert reg_client.__class__.__name__ == "EKS" # Test EKS session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info() - eks = EKS(audit_info) + aws_provider = set_mocked_aws_provider() + eks = EKS(aws_provider) assert eks.session.__class__.__name__ == "Session" # Test EKS list clusters @@ -73,8 +73,8 @@ class Test_EKS_Service: roleArn=f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:role/eks-service-role-AWSServiceRoleForAmazonEKS-J7ONKE3BQ4PI", tags={"test": "test"}, ) - audit_info = set_mocked_aws_audit_info() - eks = EKS(audit_info) + aws_provider = set_mocked_aws_provider() + eks = EKS(aws_provider) assert len(eks.clusters) == 1 assert eks.clusters[0].name == cluster_name assert eks.clusters[0].region == AWS_REGION_EU_WEST_1 @@ -126,8 +126,8 @@ class Test_EKS_Service: }, ], ) - audit_info = set_mocked_aws_audit_info() - eks = EKS(audit_info) + aws_provider = set_mocked_aws_provider() + eks = EKS(aws_provider) assert len(eks.clusters) == 1 assert eks.clusters[0].name == cluster_name assert eks.clusters[0].region == AWS_REGION_EU_WEST_1 diff --git a/tests/providers/aws/services/elasticache/elasticache_cluster_uses_public_subnet/elasticache_cluster_uses_public_subnet_test.py b/tests/providers/aws/services/elasticache/elasticache_cluster_uses_public_subnet/elasticache_cluster_uses_public_subnet_test.py index 5f3ae884ac..ea8013f4a5 100644 --- a/tests/providers/aws/services/elasticache/elasticache_cluster_uses_public_subnet/elasticache_cluster_uses_public_subnet_test.py +++ b/tests/providers/aws/services/elasticache/elasticache_cluster_uses_public_subnet/elasticache_cluster_uses_public_subnet_test.py @@ -5,12 +5,6 @@ from moto import mock_aws from prowler.providers.aws.services.elasticache.elasticache_service import Cluster from prowler.providers.aws.services.vpc.vpc_service import VpcSubnet -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - AWS_REGION_US_EAST_1_AZA, - AWS_REGION_US_EAST_1_AZB, - set_mocked_aws_audit_info, -) from tests.providers.aws.services.elasticache.elasticache_service_test import ( ELASTICACHE_CLUSTER_ARN, ELASTICACHE_CLUSTER_NAME, @@ -20,6 +14,12 @@ from tests.providers.aws.services.elasticache.elasticache_service_test import ( SUBNET_GROUP_NAME, mock_make_api_call, ) +from tests.providers.aws.utils import ( + AWS_REGION_US_EAST_1, + AWS_REGION_US_EAST_1_AZA, + AWS_REGION_US_EAST_1_AZB, + set_mocked_aws_provider, +) VPC_ID = "vpc-12345678901234567" @@ -38,8 +38,8 @@ class Test_elasticache_cluster_uses_public_subnet: elasticache_service.clusters = {} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_US_EAST_1]), ), mock.patch( "prowler.providers.aws.services.elasticache.elasticache_service.ElastiCache", new=elasticache_service, @@ -106,8 +106,8 @@ class Test_elasticache_cluster_uses_public_subnet: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_US_EAST_1]), ), mock.patch( "prowler.providers.aws.services.elasticache.elasticache_service.ElastiCache", new=elasticache_service, @@ -183,8 +183,8 @@ class Test_elasticache_cluster_uses_public_subnet: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_US_EAST_1]), ), mock.patch( "prowler.providers.aws.services.elasticache.elasticache_service.ElastiCache", new=elasticache_service, diff --git a/tests/providers/aws/services/elasticache/elasticache_service_test.py b/tests/providers/aws/services/elasticache/elasticache_service_test.py index 4030c80476..804a519abd 100644 --- a/tests/providers/aws/services/elasticache/elasticache_service_test.py +++ b/tests/providers/aws/services/elasticache/elasticache_service_test.py @@ -5,12 +5,12 @@ from prowler.providers.aws.services.elasticache.elasticache_service import ( Cluster, ElastiCache, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, AWS_REGION_US_EAST_1_AZA, AWS_REGION_US_EAST_1_AZB, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) SUBNET_GROUP_NAME = "default" @@ -81,8 +81,8 @@ def mock_make_api_call(self, operation_name, kwargs): return make_api_call(self, operation_name, kwargs) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -90,7 +90,7 @@ def mock_generate_regional_clients(service, audit_info): @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) # Patch every AWS call using Boto3 @@ -98,32 +98,32 @@ def mock_generate_regional_clients(service, audit_info): class Test_ElastiCache_Service: # Test ElastiCache Service def test_service(self): - audit_info = set_mocked_aws_audit_info() - elasticache = ElastiCache(audit_info) + aws_provider = set_mocked_aws_provider() + elasticache = ElastiCache(aws_provider) assert elasticache.service == "elasticache" # Test ElastiCache Client] def test_client(self): - audit_info = set_mocked_aws_audit_info() - elasticache = ElastiCache(audit_info) + aws_provider = set_mocked_aws_provider() + elasticache = ElastiCache(aws_provider) assert elasticache.client.__class__.__name__ == "ElastiCache" # Test ElastiCache Session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info() - elasticache = ElastiCache(audit_info) + aws_provider = set_mocked_aws_provider() + elasticache = ElastiCache(aws_provider) assert elasticache.session.__class__.__name__ == "Session" # Test ElastiCache Session def test_audited_account(self): - audit_info = set_mocked_aws_audit_info() - elasticache = ElastiCache(audit_info) + aws_provider = set_mocked_aws_provider() + elasticache = ElastiCache(aws_provider) assert elasticache.audited_account == AWS_ACCOUNT_NUMBER # Test ElastiCache Clusters def test_describe_cache_clusters(self): - audit_info = set_mocked_aws_audit_info() - elasticache = ElastiCache(audit_info) + aws_provider = set_mocked_aws_provider() + elasticache = ElastiCache(aws_provider) assert len(elasticache.clusters) == 1 assert elasticache.clusters[ELASTICACHE_CLUSTER_ARN] diff --git a/tests/providers/aws/services/elb/elb_insecure_ssl_ciphers/elb_insecure_ssl_ciphers_test.py b/tests/providers/aws/services/elb/elb_insecure_ssl_ciphers/elb_insecure_ssl_ciphers_test.py index af4f5bd95d..b716ec7e6a 100644 --- a/tests/providers/aws/services/elb/elb_insecure_ssl_ciphers/elb_insecure_ssl_ciphers_test.py +++ b/tests/providers/aws/services/elb/elb_insecure_ssl_ciphers/elb_insecure_ssl_ciphers_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) AWS_ACCOUNT_NUMBER = "123456789012" @@ -20,12 +20,14 @@ class Test_elb_insecure_ssl_ciphers: from prowler.providers.aws.services.elb.elb_service import ELB with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elb.elb_insecure_ssl_ciphers.elb_insecure_ssl_ciphers.elb_client", new=ELB( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -68,12 +70,14 @@ class Test_elb_insecure_ssl_ciphers: from prowler.providers.aws.services.elb.elb_service import ELB with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elb.elb_insecure_ssl_ciphers.elb_insecure_ssl_ciphers.elb_client", new=ELB( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elb.elb_insecure_ssl_ciphers.elb_insecure_ssl_ciphers import ( @@ -116,12 +120,14 @@ class Test_elb_insecure_ssl_ciphers: from prowler.providers.aws.services.elb.elb_service import ELB with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elb.elb_insecure_ssl_ciphers.elb_insecure_ssl_ciphers.elb_client", new=ELB( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elb.elb_insecure_ssl_ciphers.elb_insecure_ssl_ciphers import ( diff --git a/tests/providers/aws/services/elb/elb_internet_facing/elb_internet_facing_test.py b/tests/providers/aws/services/elb/elb_internet_facing/elb_internet_facing_test.py index d40cdf8274..406000c748 100644 --- a/tests/providers/aws/services/elb/elb_internet_facing/elb_internet_facing_test.py +++ b/tests/providers/aws/services/elb/elb_internet_facing/elb_internet_facing_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) AWS_REGION = "eu-west-1" @@ -23,12 +23,14 @@ class Test_elb_request_smugling: from prowler.providers.aws.services.elb.elb_service import ELB with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elb.elb_internet_facing.elb_internet_facing.elb_client", new=ELB( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -64,12 +66,14 @@ class Test_elb_request_smugling: from prowler.providers.aws.services.elb.elb_service import ELB with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elb.elb_internet_facing.elb_internet_facing.elb_client", new=ELB( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elb.elb_internet_facing.elb_internet_facing import ( @@ -109,12 +113,14 @@ class Test_elb_request_smugling: from prowler.providers.aws.services.elb.elb_service import ELB with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elb.elb_internet_facing.elb_internet_facing.elb_client", new=ELB( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elb.elb_internet_facing.elb_internet_facing import ( diff --git a/tests/providers/aws/services/elb/elb_logging_enabled/elb_logging_enabled_test.py b/tests/providers/aws/services/elb/elb_logging_enabled/elb_logging_enabled_test.py index 5e8b7fc1cb..4f542e83a3 100644 --- a/tests/providers/aws/services/elb/elb_logging_enabled/elb_logging_enabled_test.py +++ b/tests/providers/aws/services/elb/elb_logging_enabled/elb_logging_enabled_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) AWS_REGION = "eu-west-1" @@ -23,12 +23,14 @@ class Test_elb_logging_enabled: from prowler.providers.aws.services.elb.elb_service import ELB with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elb.elb_logging_enabled.elb_logging_enabled.elb_client", new=ELB( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -64,12 +66,14 @@ class Test_elb_logging_enabled: from prowler.providers.aws.services.elb.elb_service import ELB with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elb.elb_logging_enabled.elb_logging_enabled.elb_client", new=ELB( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elb.elb_logging_enabled.elb_logging_enabled import ( @@ -123,12 +127,14 @@ class Test_elb_logging_enabled: from prowler.providers.aws.services.elb.elb_service import ELB with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elb.elb_logging_enabled.elb_logging_enabled.elb_client", new=ELB( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elb.elb_logging_enabled.elb_logging_enabled import ( diff --git a/tests/providers/aws/services/elb/elb_service_test.py b/tests/providers/aws/services/elb/elb_service_test.py index ef51a701dc..cecd3b4802 100644 --- a/tests/providers/aws/services/elb/elb_service_test.py +++ b/tests/providers/aws/services/elb/elb_service_test.py @@ -2,10 +2,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.elb.elb_service import ELB -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -14,16 +14,16 @@ class Test_ELB_Service: @mock_aws def test_service(self): # ELB client for this test class - audit_info = set_mocked_aws_audit_info() - elb = ELB(audit_info) + aws_provider = set_mocked_aws_provider() + elb = ELB(aws_provider) assert elb.service == "elb" # Test ELB Client @mock_aws def test_client(self): # ELB client for this test class - audit_info = set_mocked_aws_audit_info() - elb = ELB(audit_info) + aws_provider = set_mocked_aws_provider() + elb = ELB(aws_provider) for regional_client in elb.regional_clients.values(): assert regional_client.__class__.__name__ == "ElasticLoadBalancing" @@ -31,8 +31,8 @@ class Test_ELB_Service: @mock_aws def test__get_session__(self): # ELB client for this test class - audit_info = set_mocked_aws_audit_info() - elb = ELB(audit_info) + aws_provider = set_mocked_aws_provider() + elb = ELB(aws_provider) assert elb.session.__class__.__name__ == "Session" # Test ELB Describe Load Balancers @@ -56,8 +56,8 @@ class Test_ELB_Service: SecurityGroups=[security_group.id], ) # ELB client for this test class - audit_info = set_mocked_aws_audit_info() - elb = ELB(audit_info) + aws_provider = set_mocked_aws_provider() + elb = ELB(aws_provider) assert len(elb.loadbalancers) == 1 assert elb.loadbalancers[0].name == "my-lb" assert elb.loadbalancers[0].region == AWS_REGION_US_EAST_1 @@ -100,8 +100,8 @@ class Test_ELB_Service: }, ) # ELB client for this test class - audit_info = set_mocked_aws_audit_info() - elb = ELB(audit_info) + aws_provider = set_mocked_aws_provider() + elb = ELB(aws_provider) assert elb.loadbalancers[0].name == "my-lb" assert elb.loadbalancers[0].region == AWS_REGION_US_EAST_1 assert elb.loadbalancers[0].scheme == "internal" diff --git a/tests/providers/aws/services/elb/elb_ssl_listeners/elb_ssl_listeners_test.py b/tests/providers/aws/services/elb/elb_ssl_listeners/elb_ssl_listeners_test.py index 267a70c30c..7d68c41603 100644 --- a/tests/providers/aws/services/elb/elb_ssl_listeners/elb_ssl_listeners_test.py +++ b/tests/providers/aws/services/elb/elb_ssl_listeners/elb_ssl_listeners_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) AWS_REGION = "eu-west-1" @@ -23,12 +23,14 @@ class Test_elb_ssl_listeners: from prowler.providers.aws.services.elb.elb_service import ELB with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elb.elb_ssl_listeners.elb_ssl_listeners.elb_client", new=ELB( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -64,12 +66,14 @@ class Test_elb_ssl_listeners: from prowler.providers.aws.services.elb.elb_service import ELB with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elb.elb_ssl_listeners.elb_ssl_listeners.elb_client", new=ELB( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elb.elb_ssl_listeners.elb_ssl_listeners import ( @@ -106,12 +110,14 @@ class Test_elb_ssl_listeners: from prowler.providers.aws.services.elb.elb_service import ELB with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elb.elb_ssl_listeners.elb_ssl_listeners.elb_client", new=ELB( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elb.elb_ssl_listeners.elb_ssl_listeners import ( diff --git a/tests/providers/aws/services/elbv2/elbv2_deletion_protection/elbv2_deletion_protection_test.py b/tests/providers/aws/services/elbv2/elbv2_deletion_protection/elbv2_deletion_protection_test.py index 955edac08f..070f36c2a5 100644 --- a/tests/providers/aws/services/elbv2/elbv2_deletion_protection/elbv2_deletion_protection_test.py +++ b/tests/providers/aws/services/elbv2/elbv2_deletion_protection/elbv2_deletion_protection_test.py @@ -4,12 +4,12 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_EU_WEST_1_AZB, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,12 +19,14 @@ class Test_elbv2_deletion_protection: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_deletion_protection.elbv2_deletion_protection.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -75,12 +77,14 @@ class Test_elbv2_deletion_protection: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_deletion_protection.elbv2_deletion_protection.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_deletion_protection.elbv2_deletion_protection import ( @@ -136,12 +140,14 @@ class Test_elbv2_deletion_protection: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_deletion_protection.elbv2_deletion_protection.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_deletion_protection.elbv2_deletion_protection import ( diff --git a/tests/providers/aws/services/elbv2/elbv2_desync_mitigation_mode/elbv2_desync_mitigation_mode_test.py b/tests/providers/aws/services/elbv2/elbv2_desync_mitigation_mode/elbv2_desync_mitigation_mode_test.py index b8b1a9c40b..54e5f2cf98 100644 --- a/tests/providers/aws/services/elbv2/elbv2_desync_mitigation_mode/elbv2_desync_mitigation_mode_test.py +++ b/tests/providers/aws/services/elbv2/elbv2_desync_mitigation_mode/elbv2_desync_mitigation_mode_test.py @@ -4,12 +4,12 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_EU_WEST_1_AZB, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,12 +19,14 @@ class Test_elbv2_desync_mitigation_mode: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_desync_mitigation_mode.elbv2_desync_mitigation_mode.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -79,12 +81,14 @@ class Test_elbv2_desync_mitigation_mode: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_desync_mitigation_mode.elbv2_desync_mitigation_mode.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_desync_mitigation_mode.elbv2_desync_mitigation_mode import ( @@ -145,12 +149,14 @@ class Test_elbv2_desync_mitigation_mode: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_desync_mitigation_mode.elbv2_desync_mitigation_mode.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_desync_mitigation_mode.elbv2_desync_mitigation_mode import ( @@ -206,12 +212,14 @@ class Test_elbv2_desync_mitigation_mode: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_desync_mitigation_mode.elbv2_desync_mitigation_mode.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_desync_mitigation_mode.elbv2_desync_mitigation_mode import ( diff --git a/tests/providers/aws/services/elbv2/elbv2_insecure_ssl_ciphers/elbv2_insecure_ssl_ciphers_test.py b/tests/providers/aws/services/elbv2/elbv2_insecure_ssl_ciphers/elbv2_insecure_ssl_ciphers_test.py index 3403242b44..3073cc32fd 100644 --- a/tests/providers/aws/services/elbv2/elbv2_insecure_ssl_ciphers/elbv2_insecure_ssl_ciphers_test.py +++ b/tests/providers/aws/services/elbv2/elbv2_insecure_ssl_ciphers/elbv2_insecure_ssl_ciphers_test.py @@ -4,12 +4,12 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_EU_WEST_1_AZB, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,12 +19,14 @@ class Test_elbv2_insecure_ssl_ciphers: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_insecure_ssl_ciphers.elbv2_insecure_ssl_ciphers.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -92,12 +94,14 @@ class Test_elbv2_insecure_ssl_ciphers: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_insecure_ssl_ciphers.elbv2_insecure_ssl_ciphers.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_insecure_ssl_ciphers.elbv2_insecure_ssl_ciphers import ( @@ -169,12 +173,14 @@ class Test_elbv2_insecure_ssl_ciphers: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_insecure_ssl_ciphers.elbv2_insecure_ssl_ciphers.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_insecure_ssl_ciphers.elbv2_insecure_ssl_ciphers import ( diff --git a/tests/providers/aws/services/elbv2/elbv2_internet_facing/elbv2_internet_facing_test.py b/tests/providers/aws/services/elbv2/elbv2_internet_facing/elbv2_internet_facing_test.py index 0bee01c5b4..7f1d7e5b56 100644 --- a/tests/providers/aws/services/elbv2/elbv2_internet_facing/elbv2_internet_facing_test.py +++ b/tests/providers/aws/services/elbv2/elbv2_internet_facing/elbv2_internet_facing_test.py @@ -4,12 +4,12 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_EU_WEST_1_AZB, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,12 +19,14 @@ class Test_elbv2_internet_facing: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_internet_facing.elbv2_internet_facing.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -68,12 +70,14 @@ class Test_elbv2_internet_facing: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_internet_facing.elbv2_internet_facing.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_internet_facing.elbv2_internet_facing import ( @@ -122,12 +126,14 @@ class Test_elbv2_internet_facing: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_internet_facing.elbv2_internet_facing.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_internet_facing.elbv2_internet_facing import ( diff --git a/tests/providers/aws/services/elbv2/elbv2_listeners_underneath/elbv2_listeners_underneath_test.py b/tests/providers/aws/services/elbv2/elbv2_listeners_underneath/elbv2_listeners_underneath_test.py index 76ebf4960a..522355259a 100644 --- a/tests/providers/aws/services/elbv2/elbv2_listeners_underneath/elbv2_listeners_underneath_test.py +++ b/tests/providers/aws/services/elbv2/elbv2_listeners_underneath/elbv2_listeners_underneath_test.py @@ -4,12 +4,12 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_EU_WEST_1_AZB, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,12 +19,14 @@ class Test_elbv2_listeners_underneath: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_listeners_underneath.elbv2_listeners_underneath.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -68,12 +70,14 @@ class Test_elbv2_listeners_underneath: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_listeners_underneath.elbv2_listeners_underneath.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_listeners_underneath.elbv2_listeners_underneath import ( @@ -144,12 +148,14 @@ class Test_elbv2_listeners_underneath: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_listeners_underneath.elbv2_listeners_underneath.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_listeners_underneath.elbv2_listeners_underneath import ( diff --git a/tests/providers/aws/services/elbv2/elbv2_logging_enabled/elbv2_logging_enabled_test.py b/tests/providers/aws/services/elbv2/elbv2_logging_enabled/elbv2_logging_enabled_test.py index f86dc32829..0ec5b95dc9 100644 --- a/tests/providers/aws/services/elbv2/elbv2_logging_enabled/elbv2_logging_enabled_test.py +++ b/tests/providers/aws/services/elbv2/elbv2_logging_enabled/elbv2_logging_enabled_test.py @@ -4,12 +4,12 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_EU_WEST_1_AZB, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,12 +19,14 @@ class Test_elbv2_logging_enabled: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_logging_enabled.elbv2_logging_enabled.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -78,12 +80,14 @@ class Test_elbv2_logging_enabled: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_logging_enabled.elbv2_logging_enabled.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_logging_enabled.elbv2_logging_enabled import ( @@ -142,12 +146,14 @@ class Test_elbv2_logging_enabled: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_logging_enabled.elbv2_logging_enabled.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_logging_enabled.elbv2_logging_enabled import ( diff --git a/tests/providers/aws/services/elbv2/elbv2_service_test.py b/tests/providers/aws/services/elbv2/elbv2_service_test.py index 573d084a6e..c273fd4384 100644 --- a/tests/providers/aws/services/elbv2/elbv2_service_test.py +++ b/tests/providers/aws/services/elbv2/elbv2_service_test.py @@ -2,12 +2,12 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_EU_WEST_1_AZB, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -16,20 +16,20 @@ class Test_ELBv2_Service: @mock_aws def test_service(self): # ELBv2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - elbv2 = ELBv2(audit_info) + elbv2 = ELBv2(aws_provider) assert elbv2.service == "elbv2" # Test ELBv2 Client @mock_aws def test_client(self): # ELBv2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - elbv2 = ELBv2(audit_info) + elbv2 = ELBv2(aws_provider) for regional_client in elbv2.regional_clients.values(): assert regional_client.__class__.__name__ == "ElasticLoadBalancingv2" @@ -37,10 +37,10 @@ class Test_ELBv2_Service: @mock_aws def test__get_session__(self): # ELBv2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - elbv2 = ELBv2(audit_info) + elbv2 = ELBv2(aws_provider) assert elbv2.session.__class__.__name__ == "Session" # Test ELBv2 Describe Load Balancers @@ -71,10 +71,10 @@ class Test_ELBv2_Service: Scheme="internal", )["LoadBalancers"][0] # ELBv2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - elbv2 = ELBv2(audit_info) + elbv2 = ELBv2(aws_provider) assert len(elbv2.loadbalancersv2) == 1 assert elbv2.loadbalancersv2[0].name == "my-lb" assert elbv2.loadbalancersv2[0].region == AWS_REGION_EU_WEST_1 @@ -125,10 +125,10 @@ class Test_ELBv2_Service: ], ) # ELBv2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - elbv2 = ELBv2(audit_info) + elbv2 = ELBv2(aws_provider) assert len(elbv2.loadbalancersv2[0].listeners) == 1 assert elbv2.loadbalancersv2[0].listeners[0].protocol == "HTTP" assert elbv2.loadbalancersv2[0].listeners[0].port == 443 @@ -174,10 +174,10 @@ class Test_ELBv2_Service: ], ) # ELBv2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - elbv2 = ELBv2(audit_info) + elbv2 = ELBv2(aws_provider) assert len(elbv2.loadbalancersv2) == 1 assert elbv2.loadbalancersv2[0].desync_mitigation_mode == "defensive" assert elbv2.loadbalancersv2[0].access_logs == "true" @@ -228,9 +228,9 @@ class Test_ELBv2_Service: DefaultActions=actions, ) # ELBv2 client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) - elbv2 = ELBv2(audit_info) + elbv2 = ELBv2(aws_provider) assert len(elbv2.loadbalancersv2) == 1 assert elbv2.loadbalancersv2[0].listeners[0].rules[0].actions == actions diff --git a/tests/providers/aws/services/elbv2/elbv2_ssl_listeners/elbv2_ssl_listeners_test.py b/tests/providers/aws/services/elbv2/elbv2_ssl_listeners/elbv2_ssl_listeners_test.py index 29f262ad07..11a0651e88 100644 --- a/tests/providers/aws/services/elbv2/elbv2_ssl_listeners/elbv2_ssl_listeners_test.py +++ b/tests/providers/aws/services/elbv2/elbv2_ssl_listeners/elbv2_ssl_listeners_test.py @@ -4,12 +4,12 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_EU_WEST_1_AZB, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,12 +19,14 @@ class Test_elbv2_ssl_listeners: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_ssl_listeners.elbv2_ssl_listeners.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -90,12 +92,14 @@ class Test_elbv2_ssl_listeners: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_ssl_listeners.elbv2_ssl_listeners.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_ssl_listeners.elbv2_ssl_listeners import ( @@ -166,12 +170,14 @@ class Test_elbv2_ssl_listeners: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_ssl_listeners.elbv2_ssl_listeners.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_ssl_listeners.elbv2_ssl_listeners import ( @@ -235,12 +241,14 @@ class Test_elbv2_ssl_listeners: from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_ssl_listeners.elbv2_ssl_listeners.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): from prowler.providers.aws.services.elbv2.elbv2_ssl_listeners.elbv2_ssl_listeners import ( diff --git a/tests/providers/aws/services/elbv2/elbv2_waf_acl_attached/elbv2_waf_acl_attached_test.py b/tests/providers/aws/services/elbv2/elbv2_waf_acl_attached/elbv2_waf_acl_attached_test.py index 467ca3b157..e14beea0ad 100644 --- a/tests/providers/aws/services/elbv2/elbv2_waf_acl_attached/elbv2_waf_acl_attached_test.py +++ b/tests/providers/aws/services/elbv2/elbv2_waf_acl_attached/elbv2_waf_acl_attached_test.py @@ -5,12 +5,12 @@ import botocore from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_REGION_EU_WEST_1, AWS_REGION_EU_WEST_1_AZA, AWS_REGION_EU_WEST_1_AZB, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking WAF-Regional Calls @@ -43,22 +43,24 @@ class Test_elbv2_waf_acl_attached: from prowler.providers.aws.services.wafv2.wafv2_service import WAFv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_waf_acl_attached.elbv2_waf_acl_attached.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_waf_acl_attached.elbv2_waf_acl_attached.wafv2_client", new=WAFv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_waf_acl_attached.elbv2_waf_acl_attached.waf_client", new=WAF( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -114,22 +116,24 @@ class Test_elbv2_waf_acl_attached: from prowler.providers.aws.services.wafv2.wafv2_service import WAFv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_waf_acl_attached.elbv2_waf_acl_attached.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_waf_acl_attached.elbv2_waf_acl_attached.wafv2_client", new=WAFv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_waf_acl_attached.elbv2_waf_acl_attached.waf_client", new=WAF( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ): # Test Check @@ -194,23 +198,25 @@ class Test_elbv2_waf_acl_attached: from prowler.providers.aws.services.wafv2.wafv2_service import WAFv2 with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider( + [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] + ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_waf_acl_attached.elbv2_waf_acl_attached.elbv2_client", new=ELBv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ), mock.patch( "prowler.providers.aws.services.elbv2.elbv2_waf_acl_attached.elbv2_waf_acl_attached.wafv2_client", new=WAFv2( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ), ) as service_client: with mock.patch( "prowler.providers.aws.services.elbv2.elbv2_waf_acl_attached.elbv2_waf_acl_attached.waf_client", new=WAF( - set_mocked_aws_audit_info( + set_mocked_aws_provider( [AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] ) ), 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 84283e799e..a48b469e2a 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 @@ -3,10 +3,7 @@ from unittest import mock from prowler.providers.aws.services.emr.emr_service import ( BlockPublicAccessConfiguration, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 class Test_emr_cluster_account_public_block_enabled: diff --git a/tests/providers/aws/services/emr/emr_cluster_master_nodes_no_public_ip/emr_cluster_master_nodes_no_public_ip_test.py b/tests/providers/aws/services/emr/emr_cluster_master_nodes_no_public_ip/emr_cluster_master_nodes_no_public_ip_test.py index d33628ec82..af12dba5dd 100644 --- a/tests/providers/aws/services/emr/emr_cluster_master_nodes_no_public_ip/emr_cluster_master_nodes_no_public_ip_test.py +++ b/tests/providers/aws/services/emr/emr_cluster_master_nodes_no_public_ip/emr_cluster_master_nodes_no_public_ip_test.py @@ -1,10 +1,7 @@ from unittest import mock from prowler.providers.aws.services.emr.emr_service import Cluster, ClusterStatus -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 class Test_emr_cluster_master_nodes_no_public_ip: diff --git a/tests/providers/aws/services/emr/emr_cluster_publicly_accesible/emr_cluster_publicly_accesible_test.py b/tests/providers/aws/services/emr/emr_cluster_publicly_accesible/emr_cluster_publicly_accesible_test.py index 481f3827e8..718fb90162 100644 --- a/tests/providers/aws/services/emr/emr_cluster_publicly_accesible/emr_cluster_publicly_accesible_test.py +++ b/tests/providers/aws/services/emr/emr_cluster_publicly_accesible/emr_cluster_publicly_accesible_test.py @@ -5,10 +5,10 @@ from boto3 import resource from moto import mock_aws from prowler.providers.aws.services.emr.emr_service import Cluster, ClusterStatus, Node -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -81,11 +81,11 @@ class Test_emr_cluster_publicly_accesible: "prowler.providers.aws.services.emr.emr_service.EMR", new=emr_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.emr.emr_cluster_publicly_accesible.emr_cluster_publicly_accesible.ec2_client", - new=EC2(set_mocked_aws_audit_info()), + new=EC2(set_mocked_aws_provider()), ): # Test Check from prowler.providers.aws.services.emr.emr_cluster_publicly_accesible.emr_cluster_publicly_accesible import ( @@ -147,11 +147,11 @@ class Test_emr_cluster_publicly_accesible: "prowler.providers.aws.services.emr.emr_service.EMR", new=emr_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.emr.emr_cluster_publicly_accesible.emr_cluster_publicly_accesible.ec2_client", - new=EC2(set_mocked_aws_audit_info()), + new=EC2(set_mocked_aws_provider()), ): # Test Check from prowler.providers.aws.services.emr.emr_cluster_publicly_accesible.emr_cluster_publicly_accesible import ( @@ -230,11 +230,11 @@ class Test_emr_cluster_publicly_accesible: "prowler.providers.aws.services.emr.emr_service.EMR", new=emr_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.emr.emr_cluster_publicly_accesible.emr_cluster_publicly_accesible.ec2_client", - new=EC2(set_mocked_aws_audit_info()), + new=EC2(set_mocked_aws_provider()), ): # Test Check from prowler.providers.aws.services.emr.emr_cluster_publicly_accesible.emr_cluster_publicly_accesible import ( @@ -316,11 +316,11 @@ class Test_emr_cluster_publicly_accesible: "prowler.providers.aws.services.emr.emr_service.EMR", new=emr_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.emr.emr_cluster_publicly_accesible.emr_cluster_publicly_accesible.ec2_client", - new=EC2(set_mocked_aws_audit_info()), + new=EC2(set_mocked_aws_provider()), ): # Test Check from prowler.providers.aws.services.emr.emr_cluster_publicly_accesible.emr_cluster_publicly_accesible import ( @@ -399,11 +399,11 @@ class Test_emr_cluster_publicly_accesible: "prowler.providers.aws.services.emr.emr_service.EMR", new=emr_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - set_mocked_aws_audit_info(), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider(), ), mock.patch( "prowler.providers.aws.services.emr.emr_cluster_publicly_accesible.emr_cluster_publicly_accesible.ec2_client", - new=EC2(set_mocked_aws_audit_info()), + new=EC2(set_mocked_aws_provider()), ): # Test Check from prowler.providers.aws.services.emr.emr_cluster_publicly_accesible.emr_cluster_publicly_accesible import ( diff --git a/tests/providers/aws/services/emr/emr_service_test.py b/tests/providers/aws/services/emr/emr_service_test.py index be1dd131bf..bf8aefcc0f 100644 --- a/tests/providers/aws/services/emr/emr_service_test.py +++ b/tests/providers/aws/services/emr/emr_service_test.py @@ -6,10 +6,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.emr.emr_service import EMR, ClusterStatus -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking Access Analyzer Calls @@ -36,8 +36,8 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -45,7 +45,7 @@ def mock_generate_regional_clients(service, audit_info): @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @@ -53,19 +53,19 @@ class Test_EMR_Service: # Test EMR Client @mock_aws def test__get_client__(self): - emr = EMR(set_mocked_aws_audit_info()) + emr = EMR(set_mocked_aws_provider()) assert emr.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ == "EMR" # Test EMR Session @mock_aws def test__get_session__(self): - emr = EMR(set_mocked_aws_audit_info()) + emr = EMR(set_mocked_aws_provider()) assert emr.session.__class__.__name__ == "Session" # Test EMR Service @mock_aws def test__get_service__(self): - emr = EMR(set_mocked_aws_audit_info()) + emr = EMR(set_mocked_aws_provider()) assert emr.service == "emr" # Test __list_clusters__ and __describe_cluster__ @@ -93,7 +93,7 @@ class Test_EMR_Service: ) cluster_id = emr_client.run_job_flow(**run_job_flow_args)["JobFlowId"] # EMR Class - emr = EMR(set_mocked_aws_audit_info()) + emr = EMR(set_mocked_aws_provider()) assert len(emr.clusters) == 1 assert emr.clusters[cluster_id].id == cluster_id @@ -115,7 +115,7 @@ class Test_EMR_Service: @mock_aws def test__get_block_public_access_configuration__(self): - emr = EMR(set_mocked_aws_audit_info()) + emr = EMR(set_mocked_aws_provider()) assert len(emr.block_public_access_configuration) == 1 assert emr.block_public_access_configuration[ 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 f56919b305..91e76daa92 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 @@ -4,10 +4,7 @@ from prowler.providers.aws.services.fms.fms_service import ( Policy, PolicyAccountComplianceStatus, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_US_EAST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1 class Test_fms_policy_compliant: diff --git a/tests/providers/aws/services/fms/fms_service_test.py b/tests/providers/aws/services/fms/fms_service_test.py index dd0ce16c98..47ac18475f 100644 --- a/tests/providers/aws/services/fms/fms_service_test.py +++ b/tests/providers/aws/services/fms/fms_service_test.py @@ -4,7 +4,7 @@ from unittest.mock import patch import botocore from prowler.providers.aws.services.fms.fms_service import FMS -from tests.providers.aws.audit_info_utils import set_mocked_aws_audit_info +from tests.providers.aws.utils import set_mocked_aws_provider POLICY_ARN = "arn:aws:fms:us-east-1:123456789012:policy/MyFMSManagedPolicy" POLICY_ID = "12345678-1234-1234-1234-123456789012" @@ -62,18 +62,18 @@ def mock_make_api_call(self, operation_name, kwargs): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) class Test_FMS_Service: def test__get_client__(self): - audit_info = set_mocked_aws_audit_info() - fms = FMS(audit_info) + aws_provider = set_mocked_aws_provider() + fms = FMS(aws_provider) assert fms.client.__class__.__name__ == "FMS" def test__get_service__(self): - audit_info = set_mocked_aws_audit_info() - fms = FMS(audit_info) + aws_provider = set_mocked_aws_provider() + fms = FMS(aws_provider) assert fms.service == "fms" def test__list_policies__(self): - audit_info = set_mocked_aws_audit_info() - fms = FMS(audit_info) + aws_provider = set_mocked_aws_provider() + fms = FMS(aws_provider) assert len(fms.fms_policies) == 1 assert fms.fms_admin_account is True assert fms.fms_policies[0].arn == POLICY_ARN @@ -88,8 +88,8 @@ class Test_FMS_Service: ) def test__list_compliance_status__(self): - audit_info = set_mocked_aws_audit_info() - fms = FMS(audit_info) + aws_provider = set_mocked_aws_provider() + fms = FMS(aws_provider) assert len(fms.fms_policies) == 1 assert fms.fms_policies[0].compliance_status[0].status == "COMPLIANT" assert fms.fms_policies[0].compliance_status[0].account_id == "123456789012" diff --git a/tests/providers/aws/services/glacier/glacier_service_test.py b/tests/providers/aws/services/glacier/glacier_service_test.py index acaf3c0fdd..e8200c681b 100644 --- a/tests/providers/aws/services/glacier/glacier_service_test.py +++ b/tests/providers/aws/services/glacier/glacier_service_test.py @@ -4,11 +4,11 @@ from unittest.mock import patch import botocore from prowler.providers.aws.services.glacier.glacier_service import Glacier -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking Access Analyzer Calls @@ -62,8 +62,8 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -73,14 +73,14 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_Glacier_Service: # Test Glacier Client def test__get_client__(self): glacier = Glacier( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert ( glacier.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ @@ -90,21 +90,21 @@ class Test_Glacier_Service: # Test Glacier Session def test__get_session__(self): glacier = Glacier( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert glacier.session.__class__.__name__ == "Session" # Test Glacier Service def test__get_service__(self): glacier = Glacier( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert glacier.service == "glacier" def test__list_vaults__(self): # Set partition for the service glacier = Glacier( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) vault_name = "examplevault" assert len(glacier.vaults) == 1 @@ -120,7 +120,7 @@ class Test_Glacier_Service: def test__get_vault_access_policy__(self): # Set partition for the service glacier = Glacier( - set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) + set_mocked_aws_provider([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) vault_name = "examplevault" assert len(glacier.vaults) == 1 diff --git a/tests/providers/aws/services/glacier/glacier_vaults_policy_public_access/glacier_vaults_policy_public_access_test.py b/tests/providers/aws/services/glacier/glacier_vaults_policy_public_access/glacier_vaults_policy_public_access_test.py index fe18b12a42..2d10ed7d97 100644 --- a/tests/providers/aws/services/glacier/glacier_vaults_policy_public_access/glacier_vaults_policy_public_access_test.py +++ b/tests/providers/aws/services/glacier/glacier_vaults_policy_public_access/glacier_vaults_policy_public_access_test.py @@ -1,10 +1,7 @@ from unittest import mock from prowler.providers.aws.services.glacier.glacier_service import Vault -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 class Test_glacier_vaults_policy_public_access: diff --git a/tests/providers/aws/services/globalaccelerator/globalaccelerator_service_test.py b/tests/providers/aws/services/globalaccelerator/globalaccelerator_service_test.py index a4e299b458..36dbf1671f 100644 --- a/tests/providers/aws/services/globalaccelerator/globalaccelerator_service_test.py +++ b/tests/providers/aws/services/globalaccelerator/globalaccelerator_service_test.py @@ -1,13 +1,14 @@ import botocore from mock import patch +from moto import mock_aws from prowler.providers.aws.services.globalaccelerator.globalaccelerator_service import ( GlobalAccelerator, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_WEST_2, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking Access Analyzer Calls @@ -45,34 +46,35 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) +@mock_aws # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) class Test_GlobalAccelerator_Service: # Test GlobalAccelerator Service def test_service(self): # GlobalAccelerator client for this test class - audit_info = set_mocked_aws_audit_info() - globalaccelerator = GlobalAccelerator(audit_info) + aws_provider = set_mocked_aws_provider() + globalaccelerator = GlobalAccelerator(aws_provider) assert globalaccelerator.service == "globalaccelerator" # Test GlobalAccelerator Client def test_client(self): # GlobalAccelerator client for this test class - audit_info = set_mocked_aws_audit_info() - globalaccelerator = GlobalAccelerator(audit_info) + aws_provider = set_mocked_aws_provider() + globalaccelerator = GlobalAccelerator(aws_provider) assert globalaccelerator.client.__class__.__name__ == "GlobalAccelerator" # Test GlobalAccelerator Session def test__get_session__(self): # GlobalAccelerator client for this test class - audit_info = set_mocked_aws_audit_info() - globalaccelerator = GlobalAccelerator(audit_info) + aws_provider = set_mocked_aws_provider() + globalaccelerator = GlobalAccelerator(aws_provider) assert globalaccelerator.session.__class__.__name__ == "Session" def test__list_accelerators__(self): # GlobalAccelerator client for this test class - audit_info = set_mocked_aws_audit_info() - globalaccelerator = GlobalAccelerator(audit_info) + aws_provider = set_mocked_aws_provider() + globalaccelerator = GlobalAccelerator(aws_provider) accelerator_name = "TestAccelerator" 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 b6f4c99062..ac4fb1bd93 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 @@ -1,16 +1,13 @@ from unittest import mock from prowler.providers.aws.services.glue.glue_service import CatalogEncryptionSetting -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_glue_data_catalogs_connection_passwords_encryption_enabled: def test_glue_no_settings(self): glue_client = mock.MagicMock - glue_client.audit_info = set_mocked_aws_audit_info() + glue_client.provider = set_mocked_aws_provider() glue_client.catalog_encryption_settings = [] with mock.patch( @@ -29,7 +26,7 @@ class Test_glue_data_catalogs_connection_passwords_encryption_enabled: def test_glue_catalog_password_unencrypted(self): glue_client = mock.MagicMock - glue_client.audit_info = set_mocked_aws_audit_info() + glue_client.provider = set_mocked_aws_provider() glue_client.catalog_encryption_settings = [ CatalogEncryptionSetting( mode="DISABLED", @@ -70,7 +67,7 @@ class Test_glue_data_catalogs_connection_passwords_encryption_enabled: def test_glue_catalog_password_unencrypted_ignoring(self): glue_client = mock.MagicMock - glue_client.audit_info = set_mocked_aws_audit_info() + glue_client.provider = set_mocked_aws_provider() glue_client.catalog_encryption_settings = [ CatalogEncryptionSetting( mode="DISABLED", @@ -88,7 +85,7 @@ class Test_glue_data_catalogs_connection_passwords_encryption_enabled: 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 + glue_client.provider._ignore_unused_services = True with mock.patch( "prowler.providers.aws.services.glue.glue_service.Glue", glue_client, @@ -105,7 +102,7 @@ class Test_glue_data_catalogs_connection_passwords_encryption_enabled: def test_glue_catalog_password_unencrypted_ignoring_with_tables(self): glue_client = mock.MagicMock - glue_client.audit_info = set_mocked_aws_audit_info() + glue_client.provider = set_mocked_aws_provider() glue_client.catalog_encryption_settings = [ CatalogEncryptionSetting( mode="DISABLED", @@ -123,7 +120,7 @@ class Test_glue_data_catalogs_connection_passwords_encryption_enabled: 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 + glue_client.provider._ignore_unused_services = True with mock.patch( "prowler.providers.aws.services.glue.glue_service.Glue", glue_client, @@ -147,7 +144,7 @@ class Test_glue_data_catalogs_connection_passwords_encryption_enabled: def test_glue_catalog_encrypted(self): glue_client = mock.MagicMock - glue_client.audit_info = set_mocked_aws_audit_info() + glue_client.provider = set_mocked_aws_provider() glue_client.catalog_encryption_settings = [ CatalogEncryptionSetting( mode="DISABLED", 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 ccb3d5891f..999e941595 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 @@ -2,16 +2,13 @@ from re import search from unittest import mock from prowler.providers.aws.services.glue.glue_service import CatalogEncryptionSetting -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_glue_data_catalogs_metadata_encryption_enabled: def test_glue_no_settings(self): glue_client = mock.MagicMock - glue_client.audit_info = set_mocked_aws_audit_info + glue_client.provider = set_mocked_aws_provider glue_client.catalog_encryption_settings = [] with mock.patch( @@ -30,7 +27,7 @@ class Test_glue_data_catalogs_metadata_encryption_enabled: def test_glue_catalog_unencrypted(self): glue_client = mock.MagicMock - glue_client.audit_info = set_mocked_aws_audit_info() + glue_client.provider = set_mocked_aws_provider() glue_client.catalog_encryption_settings = [ CatalogEncryptionSetting( mode="disabled.", @@ -71,7 +68,7 @@ class Test_glue_data_catalogs_metadata_encryption_enabled: def test_glue_catalog_unencrypted_ignoring(self): glue_client = mock.MagicMock - glue_client.audit_info = set_mocked_aws_audit_info() + glue_client.provider = set_mocked_aws_provider() glue_client.catalog_encryption_settings = [ CatalogEncryptionSetting( mode="disabled.", @@ -83,7 +80,7 @@ class Test_glue_data_catalogs_metadata_encryption_enabled: ) ] glue_client.audited_account = "12345678912" - glue_client.audit_info.ignore_unused_services = True + glue_client.provider._ignore_unused_services = True 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" @@ -106,7 +103,7 @@ class Test_glue_data_catalogs_metadata_encryption_enabled: def test_glue_catalog_unencrypted_ignoring_with_tables(self): glue_client = mock.MagicMock - glue_client.audit_info = set_mocked_aws_audit_info() + glue_client.provider = set_mocked_aws_provider() glue_client.catalog_encryption_settings = [ CatalogEncryptionSetting( mode="disabled.", @@ -118,7 +115,7 @@ class Test_glue_data_catalogs_metadata_encryption_enabled: ) ] glue_client.audited_account = "12345678912" - glue_client.audit_info.ignore_unused_services = True + glue_client.provider._ignore_unused_services = True 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" @@ -148,7 +145,7 @@ class Test_glue_data_catalogs_metadata_encryption_enabled: def test_glue_catalog_encrypted(self): glue_client = mock.MagicMock - glue_client.audit_info = set_mocked_aws_audit_info() + glue_client.provider = set_mocked_aws_provider() glue_client.catalog_encryption_settings = [ CatalogEncryptionSetting( mode="SSE-KMS", diff --git a/tests/providers/aws/services/glue/glue_database_connections_ssl_enabled/glue_database_connections_ssl_enabled_test.py b/tests/providers/aws/services/glue/glue_database_connections_ssl_enabled/glue_database_connections_ssl_enabled_test.py index df7e4d9616..43e0d7f882 100644 --- a/tests/providers/aws/services/glue/glue_database_connections_ssl_enabled/glue_database_connections_ssl_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_database_connections_ssl_enabled/glue_database_connections_ssl_enabled_test.py @@ -2,7 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.glue.glue_service import Connection -from tests.providers.aws.audit_info_utils import AWS_REGION_US_EAST_1 +from tests.providers.aws.utils import AWS_REGION_US_EAST_1 class Test_glue_database_connections_ssl_enabled: diff --git a/tests/providers/aws/services/glue/glue_development_endpoints_cloudwatch_logs_encryption_enabled/glue_development_endpoints_cloudwatch_logs_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_development_endpoints_cloudwatch_logs_encryption_enabled/glue_development_endpoints_cloudwatch_logs_encryption_enabled_test.py index b28e80a193..6107c216ee 100644 --- a/tests/providers/aws/services/glue/glue_development_endpoints_cloudwatch_logs_encryption_enabled/glue_development_endpoints_cloudwatch_logs_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_development_endpoints_cloudwatch_logs_encryption_enabled/glue_development_endpoints_cloudwatch_logs_encryption_enabled_test.py @@ -2,7 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.glue.glue_service import DevEndpoint, SecurityConfig -from tests.providers.aws.audit_info_utils import AWS_REGION_US_EAST_1 +from tests.providers.aws.utils import AWS_REGION_US_EAST_1 class Test_glue_development_endpoints_cloudwatch_logs_encryption_enabled: diff --git a/tests/providers/aws/services/glue/glue_development_endpoints_job_bookmark_encryption_enabled/glue_development_endpoints_job_bookmark_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_development_endpoints_job_bookmark_encryption_enabled/glue_development_endpoints_job_bookmark_encryption_enabled_test.py index 2a1615aa17..473b23dc26 100644 --- a/tests/providers/aws/services/glue/glue_development_endpoints_job_bookmark_encryption_enabled/glue_development_endpoints_job_bookmark_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_development_endpoints_job_bookmark_encryption_enabled/glue_development_endpoints_job_bookmark_encryption_enabled_test.py @@ -2,7 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.glue.glue_service import DevEndpoint, SecurityConfig -from tests.providers.aws.audit_info_utils import AWS_REGION_US_EAST_1 +from tests.providers.aws.utils import AWS_REGION_US_EAST_1 class Test_glue_development_endpoints_job_bookmark_encryption_enabled: diff --git a/tests/providers/aws/services/glue/glue_development_endpoints_s3_encryption_enabled/glue_development_endpoints_s3_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_development_endpoints_s3_encryption_enabled/glue_development_endpoints_s3_encryption_enabled_test.py index 96de6949bc..4b79f34805 100644 --- a/tests/providers/aws/services/glue/glue_development_endpoints_s3_encryption_enabled/glue_development_endpoints_s3_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_development_endpoints_s3_encryption_enabled/glue_development_endpoints_s3_encryption_enabled_test.py @@ -2,7 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.glue.glue_service import DevEndpoint, SecurityConfig -from tests.providers.aws.audit_info_utils import AWS_REGION_US_EAST_1 +from tests.providers.aws.utils import AWS_REGION_US_EAST_1 class Test_glue_development_endpoints_s3_encryption_enabled: diff --git a/tests/providers/aws/services/glue/glue_etl_jobs_amazon_s3_encryption_enabled/glue_etl_jobs_amazon_s3_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_etl_jobs_amazon_s3_encryption_enabled/glue_etl_jobs_amazon_s3_encryption_enabled_test.py index 545d5fe8f2..136e6334a7 100644 --- a/tests/providers/aws/services/glue/glue_etl_jobs_amazon_s3_encryption_enabled/glue_etl_jobs_amazon_s3_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_etl_jobs_amazon_s3_encryption_enabled/glue_etl_jobs_amazon_s3_encryption_enabled_test.py @@ -2,7 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.glue.glue_service import Job, SecurityConfig -from tests.providers.aws.audit_info_utils import AWS_REGION_US_EAST_1 +from tests.providers.aws.utils import AWS_REGION_US_EAST_1 class Test_glue_etl_jobs_amazon_s3_encryption_enabled: diff --git a/tests/providers/aws/services/glue/glue_etl_jobs_cloudwatch_logs_encryption_enabled/glue_etl_jobs_cloudwatch_logs_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_etl_jobs_cloudwatch_logs_encryption_enabled/glue_etl_jobs_cloudwatch_logs_encryption_enabled_test.py index 607c919654..fbe3f8b34d 100644 --- a/tests/providers/aws/services/glue/glue_etl_jobs_cloudwatch_logs_encryption_enabled/glue_etl_jobs_cloudwatch_logs_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_etl_jobs_cloudwatch_logs_encryption_enabled/glue_etl_jobs_cloudwatch_logs_encryption_enabled_test.py @@ -2,7 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.glue.glue_service import Job, SecurityConfig -from tests.providers.aws.audit_info_utils import AWS_REGION_US_EAST_1 +from tests.providers.aws.utils import AWS_REGION_US_EAST_1 class Test_glue_etl_jobs_cloudwatch_logs_encryption_enabled: diff --git a/tests/providers/aws/services/glue/glue_etl_jobs_job_bookmark_encryption_enabled/glue_etl_jobs_job_bookmark_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_etl_jobs_job_bookmark_encryption_enabled/glue_etl_jobs_job_bookmark_encryption_enabled_test.py index 3e040302eb..b1936c9c4a 100644 --- a/tests/providers/aws/services/glue/glue_etl_jobs_job_bookmark_encryption_enabled/glue_etl_jobs_job_bookmark_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_etl_jobs_job_bookmark_encryption_enabled/glue_etl_jobs_job_bookmark_encryption_enabled_test.py @@ -2,7 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.glue.glue_service import Job, SecurityConfig -from tests.providers.aws.audit_info_utils import AWS_REGION_US_EAST_1 +from tests.providers.aws.utils import AWS_REGION_US_EAST_1 class Test_glue_etl_jobs_job_bookmark_encryption_enabled: diff --git a/tests/providers/aws/services/glue/glue_service_test.py b/tests/providers/aws/services/glue/glue_service_test.py index 0c119a0b18..a46f29d67d 100644 --- a/tests/providers/aws/services/glue/glue_service_test.py +++ b/tests/providers/aws/services/glue/glue_service_test.py @@ -4,10 +4,10 @@ import botocore from moto import mock_aws from prowler.providers.aws.services.glue.glue_service import Glue -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking Access Analyzer Calls @@ -104,8 +104,8 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -115,7 +115,7 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_Glue_Service: @@ -123,16 +123,16 @@ class Test_Glue_Service: @mock_aws def test_service(self): # Glue client for this test class - audit_info = set_mocked_aws_audit_info() - glue = Glue(audit_info) + aws_provider = set_mocked_aws_provider() + glue = Glue(aws_provider) assert glue.service == "glue" # Test Glue Client @mock_aws def test_client(self): # Glue client for this test class - audit_info = set_mocked_aws_audit_info() - glue = Glue(audit_info) + aws_provider = set_mocked_aws_provider() + glue = Glue(aws_provider) for regional_client in glue.regional_clients.values(): assert regional_client.__class__.__name__ == "Glue" @@ -140,23 +140,23 @@ class Test_Glue_Service: @mock_aws def test__get_session__(self): # Glue client for this test class - audit_info = set_mocked_aws_audit_info() - glue = Glue(audit_info) + aws_provider = set_mocked_aws_provider() + glue = Glue(aws_provider) assert glue.session.__class__.__name__ == "Session" # Test Glue Session @mock_aws def test_audited_account(self): # Glue client for this test class - audit_info = set_mocked_aws_audit_info() - glue = Glue(audit_info) + aws_provider = set_mocked_aws_provider() + glue = Glue(aws_provider) assert glue.audited_account == AWS_ACCOUNT_NUMBER # Test Glue Search Tables @mock_aws def test__search_tables__(self): - audit_info = set_mocked_aws_audit_info() - glue = Glue(audit_info) + aws_provider = set_mocked_aws_provider() + glue = Glue(aws_provider) assert len(glue.tables) == 1 assert glue.tables[0].name == "table" assert glue.tables[0].database == "database" @@ -166,8 +166,8 @@ class Test_Glue_Service: # Test Glue Get Connections @mock_aws def test__get_connections__(self): - audit_info = set_mocked_aws_audit_info() - glue = Glue(audit_info) + aws_provider = set_mocked_aws_provider() + glue = Glue(aws_provider) assert len(glue.connections) == 1 assert glue.connections[0].name == "connection" assert glue.connections[0].type == "JDBC" @@ -183,8 +183,8 @@ class Test_Glue_Service: # Test Glue Get Catalog Encryption @mock_aws def test__get_data_catalog_encryption_settings__(self): - audit_info = set_mocked_aws_audit_info() - glue = Glue(audit_info) + aws_provider = set_mocked_aws_provider() + glue = Glue(aws_provider) assert len(glue.catalog_encryption_settings) == 1 assert glue.catalog_encryption_settings[0].mode == "SSE-KMS" assert glue.catalog_encryption_settings[0].kms_id == "kms_key" @@ -195,8 +195,8 @@ class Test_Glue_Service: # Test Glue Get Dev Endpoints @mock_aws def test__get_dev_endpoints__(self): - audit_info = set_mocked_aws_audit_info() - glue = Glue(audit_info) + aws_provider = set_mocked_aws_provider() + glue = Glue(aws_provider) assert len(glue.dev_endpoints) == 1 assert glue.dev_endpoints[0].name == "endpoint" assert glue.dev_endpoints[0].security == "security_config" @@ -205,8 +205,8 @@ class Test_Glue_Service: # Test Glue Get Security Configs @mock_aws def test__get_security_configurations__(self): - audit_info = set_mocked_aws_audit_info() - glue = Glue(audit_info) + aws_provider = set_mocked_aws_provider() + glue = Glue(aws_provider) assert len(glue.security_configs) == 1 assert glue.security_configs[0].name == "test" assert glue.security_configs[0].s3_encryption == "DISABLED" @@ -217,8 +217,8 @@ class Test_Glue_Service: # Test Glue Get Security Configs @mock_aws def test__get_jobs__(self): - audit_info = set_mocked_aws_audit_info() - glue = Glue(audit_info) + aws_provider = set_mocked_aws_provider() + glue = Glue(aws_provider) assert len(glue.jobs) == 1 assert glue.jobs[0].name == "job" assert glue.jobs[0].security == "security_config" diff --git a/tests/providers/aws/services/guardduty/guardduty_centrally_managed/guardduty_centrally_managed_test.py b/tests/providers/aws/services/guardduty/guardduty_centrally_managed/guardduty_centrally_managed_test.py index 34085d2c61..7ff4d46a82 100644 --- a/tests/providers/aws/services/guardduty/guardduty_centrally_managed/guardduty_centrally_managed_test.py +++ b/tests/providers/aws/services/guardduty/guardduty_centrally_managed/guardduty_centrally_managed_test.py @@ -2,10 +2,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.guardduty.guardduty_service import Detector -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 AWS_ACCOUNT_NUMBER_ADMIN = "123456789013" DETECTOR_ID = str(uuid4()) diff --git a/tests/providers/aws/services/guardduty/guardduty_is_enabled/guardduty_is_enabled_test.py b/tests/providers/aws/services/guardduty/guardduty_is_enabled/guardduty_is_enabled_test.py index e2af78490b..4af746f645 100644 --- a/tests/providers/aws/services/guardduty/guardduty_is_enabled/guardduty_is_enabled_test.py +++ b/tests/providers/aws/services/guardduty/guardduty_is_enabled/guardduty_is_enabled_test.py @@ -2,7 +2,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.guardduty.guardduty_service import Detector -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, diff --git a/tests/providers/aws/services/guardduty/guardduty_no_high_severity_findings/guardduty_no_high_severity_findings_test.py b/tests/providers/aws/services/guardduty/guardduty_no_high_severity_findings/guardduty_no_high_severity_findings_test.py index fe1ea54bc1..402cf57c79 100644 --- a/tests/providers/aws/services/guardduty/guardduty_no_high_severity_findings/guardduty_no_high_severity_findings_test.py +++ b/tests/providers/aws/services/guardduty/guardduty_no_high_severity_findings/guardduty_no_high_severity_findings_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.guardduty.guardduty_service import Detector -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 DETECTOR_ID = str(uuid4()) DETECTOR_ARN = f"arn:aws:guardduty:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:detector/{DETECTOR_ID}" diff --git a/tests/providers/aws/services/guardduty/guardduty_service_test.py b/tests/providers/aws/services/guardduty/guardduty_service_test.py index d5e13b15a3..32a5ed6d75 100644 --- a/tests/providers/aws/services/guardduty/guardduty_service_test.py +++ b/tests/providers/aws/services/guardduty/guardduty_service_test.py @@ -6,10 +6,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.guardduty.guardduty_service import GuardDuty -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) AWS_ACCOUNT_NUMBER_ADMIN = "123456789013" @@ -50,8 +50,8 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -60,27 +60,27 @@ def mock_generate_regional_clients(service, audit_info): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_GuardDuty_Service: # Test GuardDuty Service def test_service(self): - audit_info = set_mocked_aws_audit_info() - guardduty = GuardDuty(audit_info) + aws_provider = set_mocked_aws_provider() + guardduty = GuardDuty(aws_provider) assert guardduty.service == "guardduty" # Test GuardDuty client def test_client(self): - audit_info = set_mocked_aws_audit_info() - guardduty = GuardDuty(audit_info) + aws_provider = set_mocked_aws_provider() + guardduty = GuardDuty(aws_provider) for reg_client in guardduty.regional_clients.values(): assert reg_client.__class__.__name__ == "GuardDuty" # Test GuardDuty session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info() - guardduty = GuardDuty(audit_info) + aws_provider = set_mocked_aws_provider() + guardduty = GuardDuty(aws_provider) assert guardduty.session.__class__.__name__ == "Session" @mock_aws @@ -89,8 +89,8 @@ class Test_GuardDuty_Service: guardduty_client = client("guardduty", region_name=AWS_REGION_EU_WEST_1) response = guardduty_client.create_detector(Enable=True, Tags={"test": "test"}) - audit_info = set_mocked_aws_audit_info() - guardduty = GuardDuty(audit_info) + aws_provider = set_mocked_aws_provider() + guardduty = GuardDuty(aws_provider) assert len(guardduty.detectors) == 1 assert guardduty.detectors[0].id == response["DetectorId"] @@ -111,8 +111,8 @@ class Test_GuardDuty_Service: guardduty_client = client("guardduty", region_name=AWS_REGION_EU_WEST_1) response = guardduty_client.create_detector(Enable=True) - audit_info = set_mocked_aws_audit_info() - guardduty = GuardDuty(audit_info) + aws_provider = set_mocked_aws_provider() + guardduty = GuardDuty(aws_provider) assert len(guardduty.detectors) == 1 assert guardduty.detectors[0].id == response["DetectorId"] @@ -133,8 +133,8 @@ class Test_GuardDuty_Service: guardduty_client = client("guardduty", region_name=AWS_REGION_EU_WEST_1) response = guardduty_client.create_detector(Enable=True) - audit_info = set_mocked_aws_audit_info() - guardduty = GuardDuty(audit_info) + aws_provider = set_mocked_aws_provider() + guardduty = GuardDuty(aws_provider) assert len(guardduty.detectors) == 1 assert guardduty.detectors[0].id == response["DetectorId"] @@ -154,8 +154,8 @@ class Test_GuardDuty_Service: guardduty_client = client("guardduty", region_name=AWS_REGION_EU_WEST_1) response = guardduty_client.create_detector(Enable=True) - audit_info = set_mocked_aws_audit_info() - guardduty = GuardDuty(audit_info) + aws_provider = set_mocked_aws_provider() + guardduty = GuardDuty(aws_provider) assert len(guardduty.detectors) == 1 assert guardduty.detectors[0].id == response["DetectorId"] @@ -176,8 +176,8 @@ class Test_GuardDuty_Service: guardduty_client = client("guardduty", region_name=AWS_REGION_EU_WEST_1) response = guardduty_client.create_detector(Enable=True) - audit_info = set_mocked_aws_audit_info() - guardduty = GuardDuty(audit_info) + aws_provider = set_mocked_aws_provider() + guardduty = GuardDuty(aws_provider) assert len(guardduty.detectors) == 1 assert guardduty.detectors[0].id == response["DetectorId"] diff --git a/tests/providers/aws/services/iam/iam_administrator_access_with_mfa/iam_administrator_access_with_mfa_test.py b/tests/providers/aws/services/iam/iam_administrator_access_with_mfa/iam_administrator_access_with_mfa_test.py index 076d085666..c562bdb037 100644 --- a/tests/providers/aws/services/iam/iam_administrator_access_with_mfa/iam_administrator_access_with_mfa_test.py +++ b/tests/providers/aws/services/iam/iam_administrator_access_with_mfa/iam_administrator_access_with_mfa_test.py @@ -5,10 +5,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_administrator_access_with_mfa_test: @@ -21,15 +18,15 @@ class Test_iam_administrator_access_with_mfa_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_administrator_access_with_mfa.iam_administrator_access_with_mfa.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_administrator_access_with_mfa.iam_administrator_access_with_mfa import ( iam_administrator_access_with_mfa, @@ -64,15 +61,15 @@ class Test_iam_administrator_access_with_mfa_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_administrator_access_with_mfa.iam_administrator_access_with_mfa.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_administrator_access_with_mfa.iam_administrator_access_with_mfa import ( iam_administrator_access_with_mfa, @@ -102,15 +99,15 @@ class Test_iam_administrator_access_with_mfa_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_administrator_access_with_mfa.iam_administrator_access_with_mfa.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_administrator_access_with_mfa.iam_administrator_access_with_mfa import ( iam_administrator_access_with_mfa, @@ -142,15 +139,15 @@ class Test_iam_administrator_access_with_mfa_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_administrator_access_with_mfa.iam_administrator_access_with_mfa.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_administrator_access_with_mfa.iam_administrator_access_with_mfa import ( iam_administrator_access_with_mfa, @@ -206,15 +203,15 @@ class Test_iam_administrator_access_with_mfa_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_administrator_access_with_mfa.iam_administrator_access_with_mfa.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_administrator_access_with_mfa.iam_administrator_access_with_mfa import ( iam_administrator_access_with_mfa, diff --git a/tests/providers/aws/services/iam/iam_avoid_root_usage/iam_avoid_root_usage_test.py b/tests/providers/aws/services/iam/iam_avoid_root_usage/iam_avoid_root_usage_test.py index b27f615bb6..33a9ac4629 100644 --- a/tests/providers/aws/services/iam/iam_avoid_root_usage/iam_avoid_root_usage_test.py +++ b/tests/providers/aws/services/iam/iam_avoid_root_usage/iam_avoid_root_usage_test.py @@ -5,10 +5,7 @@ from unittest import mock from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_avoid_root_usage: @@ -22,15 +19,15 @@ class Test_iam_avoid_root_usage: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage import ( iam_avoid_root_usage, @@ -62,15 +59,15 @@ class Test_iam_avoid_root_usage: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage import ( iam_avoid_root_usage, @@ -102,15 +99,15 @@ class Test_iam_avoid_root_usage: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage import ( iam_avoid_root_usage, @@ -142,15 +139,15 @@ class Test_iam_avoid_root_usage: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage import ( iam_avoid_root_usage, @@ -182,15 +179,15 @@ class Test_iam_avoid_root_usage: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage import ( iam_avoid_root_usage, @@ -222,15 +219,15 @@ class Test_iam_avoid_root_usage: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage import ( iam_avoid_root_usage, @@ -262,15 +259,15 @@ class Test_iam_avoid_root_usage: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_avoid_root_usage.iam_avoid_root_usage import ( iam_avoid_root_usage, diff --git a/tests/providers/aws/services/iam/iam_aws_attached_policy_no_administrative_privileges/iam_aws_attached_policy_no_administrative_privileges_test.py b/tests/providers/aws/services/iam/iam_aws_attached_policy_no_administrative_privileges/iam_aws_attached_policy_no_administrative_privileges_test.py index e1d6a7c688..667ea624ea 100644 --- a/tests/providers/aws/services/iam/iam_aws_attached_policy_no_administrative_privileges/iam_aws_attached_policy_no_administrative_privileges_test.py +++ b/tests/providers/aws/services/iam/iam_aws_attached_policy_no_administrative_privileges/iam_aws_attached_policy_no_administrative_privileges_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_aws_attached_policy_no_administrative_privileges_test: @@ -21,15 +18,15 @@ class Test_iam_aws_attached_policy_no_administrative_privileges_test: iam_client.attach_role_policy( PolicyArn="arn:aws:iam::aws:policy/AdministratorAccess", RoleName="my-role" ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_aws_attached_policy_no_administrative_privileges.iam_aws_attached_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_aws_attached_policy_no_administrative_privileges.iam_aws_attached_policy_no_administrative_privileges import ( iam_aws_attached_policy_no_administrative_privileges, @@ -60,15 +57,15 @@ class Test_iam_aws_attached_policy_no_administrative_privileges_test: PolicyArn="arn:aws:iam::aws:policy/IAMUserChangePassword", RoleName="my-role", ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_aws_attached_policy_no_administrative_privileges.iam_aws_attached_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_aws_attached_policy_no_administrative_privileges.iam_aws_attached_policy_no_administrative_privileges import ( iam_aws_attached_policy_no_administrative_privileges, @@ -102,15 +99,15 @@ class Test_iam_aws_attached_policy_no_administrative_privileges_test: PolicyArn="arn:aws:iam::aws:policy/IAMUserChangePassword", RoleName="my-role", ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_aws_attached_policy_no_administrative_privileges.iam_aws_attached_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_aws_attached_policy_no_administrative_privileges.iam_aws_attached_policy_no_administrative_privileges import ( iam_aws_attached_policy_no_administrative_privileges, diff --git a/tests/providers/aws/services/iam/iam_check_saml_providers_sts/iam_check_saml_providers_sts_test.py b/tests/providers/aws/services/iam/iam_check_saml_providers_sts/iam_check_saml_providers_sts_test.py index aec804f72b..79a45f4ea4 100644 --- a/tests/providers/aws/services/iam/iam_check_saml_providers_sts/iam_check_saml_providers_sts_test.py +++ b/tests/providers/aws/services/iam/iam_check_saml_providers_sts/iam_check_saml_providers_sts_test.py @@ -3,10 +3,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_check_saml_providers_sts: @@ -48,15 +45,15 @@ nTTxU4a7x1naFxzYXK1iQ1vMARKMjDb19QEJIEJKZlDK4uS7yMlf1nFS from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_check_saml_providers_sts.iam_check_saml_providers_sts.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_check_saml_providers_sts.iam_check_saml_providers_sts import ( diff --git a/tests/providers/aws/services/iam/iam_customer_attached_policy_no_administrative_privileges/iam_customer_attached_policy_no_administrative_privileges_test.py b/tests/providers/aws/services/iam/iam_customer_attached_policy_no_administrative_privileges/iam_customer_attached_policy_no_administrative_privileges_test.py index b03e84db81..4ae9ee4cd0 100644 --- a/tests/providers/aws/services/iam/iam_customer_attached_policy_no_administrative_privileges/iam_customer_attached_policy_no_administrative_privileges_test.py +++ b/tests/providers/aws/services/iam/iam_customer_attached_policy_no_administrative_privileges/iam_customer_attached_policy_no_administrative_privileges_test.py @@ -5,10 +5,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_customer_attached_policy_no_administrative_privileges_test: @@ -29,15 +26,15 @@ class Test_iam_customer_attached_policy_no_administrative_privileges_test: PolicyName=policy_name, PolicyDocument=dumps(policy_document) )["Policy"]["Arn"] iam_client.attach_role_policy(PolicyArn=arn, RoleName="my-role") - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_customer_attached_policy_no_administrative_privileges.iam_customer_attached_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_customer_attached_policy_no_administrative_privileges.iam_customer_attached_policy_no_administrative_privileges import ( iam_customer_attached_policy_no_administrative_privileges, @@ -71,15 +68,15 @@ class Test_iam_customer_attached_policy_no_administrative_privileges_test: PolicyName=policy_name, PolicyDocument=dumps(policy_document) )["Policy"]["Arn"] iam_client.attach_role_policy(PolicyArn=arn, RoleName="my-role") - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_customer_attached_policy_no_administrative_privileges.iam_customer_attached_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_customer_attached_policy_no_administrative_privileges.iam_customer_attached_policy_no_administrative_privileges import ( iam_customer_attached_policy_no_administrative_privileges, @@ -128,15 +125,15 @@ class Test_iam_customer_attached_policy_no_administrative_privileges_test: PolicyArn=arn_non_administrative, RoleName="my-role" ) iam_client.attach_role_policy(PolicyArn=arn_administrative, RoleName="my-role") - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_customer_attached_policy_no_administrative_privileges.iam_customer_attached_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_customer_attached_policy_no_administrative_privileges.iam_customer_attached_policy_no_administrative_privileges import ( iam_customer_attached_policy_no_administrative_privileges, diff --git a/tests/providers/aws/services/iam/iam_customer_unattached_policy_no_administrative_privileges/iam_customer_unattached_policy_no_administrative_privileges_test.py b/tests/providers/aws/services/iam/iam_customer_unattached_policy_no_administrative_privileges/iam_customer_unattached_policy_no_administrative_privileges_test.py index 269511a1fb..eb90e493d4 100644 --- a/tests/providers/aws/services/iam/iam_customer_unattached_policy_no_administrative_privileges/iam_customer_unattached_policy_no_administrative_privileges_test.py +++ b/tests/providers/aws/services/iam/iam_customer_unattached_policy_no_administrative_privileges/iam_customer_unattached_policy_no_administrative_privileges_test.py @@ -5,10 +5,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_customer_unattached_policy_no_administrative_privileges_test: @@ -26,15 +23,15 @@ class Test_iam_customer_unattached_policy_no_administrative_privileges_test: PolicyName=policy_name, PolicyDocument=dumps(policy_document) )["Policy"]["Arn"] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_customer_unattached_policy_no_administrative_privileges.iam_customer_unattached_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_customer_unattached_policy_no_administrative_privileges.iam_customer_unattached_policy_no_administrative_privileges import ( iam_customer_unattached_policy_no_administrative_privileges, @@ -65,15 +62,15 @@ class Test_iam_customer_unattached_policy_no_administrative_privileges_test: PolicyName=policy_name, PolicyDocument=dumps(policy_document) )["Policy"]["Arn"] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_customer_unattached_policy_no_administrative_privileges.iam_customer_unattached_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_customer_unattached_policy_no_administrative_privileges.iam_customer_unattached_policy_no_administrative_privileges import ( iam_customer_unattached_policy_no_administrative_privileges, @@ -116,15 +113,15 @@ class Test_iam_customer_unattached_policy_no_administrative_privileges_test: PolicyDocument=dumps(policy_document_administrative), )["Policy"]["Arn"] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_customer_unattached_policy_no_administrative_privileges.iam_customer_unattached_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_customer_unattached_policy_no_administrative_privileges.iam_customer_unattached_policy_no_administrative_privileges import ( iam_customer_unattached_policy_no_administrative_privileges, diff --git a/tests/providers/aws/services/iam/iam_inline_policy_no_administrative_privileges/iam_inline_policy_no_administrative_privileges_test.py b/tests/providers/aws/services/iam/iam_inline_policy_no_administrative_privileges/iam_inline_policy_no_administrative_privileges_test.py index 4bab5fb631..e2d6896c87 100644 --- a/tests/providers/aws/services/iam/iam_inline_policy_no_administrative_privileges/iam_inline_policy_no_administrative_privileges_test.py +++ b/tests/providers/aws/services/iam/iam_inline_policy_no_administrative_privileges/iam_inline_policy_no_administrative_privileges_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) INLINE_POLICY_ADMIN = { @@ -43,16 +43,16 @@ class Test_iam_inline_policy_no_administrative_privileges: _ = iam_client.create_group(GroupName=group_name) # Audit Info - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges import ( iam_inline_policy_no_administrative_privileges, @@ -78,16 +78,16 @@ class Test_iam_inline_policy_no_administrative_privileges: PolicyDocument=dumps(INLINE_POLICY_ADMIN), ) # Audit Info - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges import ( iam_inline_policy_no_administrative_privileges, @@ -122,16 +122,16 @@ class Test_iam_inline_policy_no_administrative_privileges: PolicyDocument=dumps(INLINE_POLICY_NOT_ADMIN), ) # Audit Info - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges import ( iam_inline_policy_no_administrative_privileges, @@ -174,16 +174,16 @@ class Test_iam_inline_policy_no_administrative_privileges: PolicyDocument=dumps(INLINE_POLICY_ADMIN), ) # Audit Info - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges import ( iam_inline_policy_no_administrative_privileges, @@ -228,16 +228,16 @@ class Test_iam_inline_policy_no_administrative_privileges: ) # Audit Info - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges import ( iam_inline_policy_no_administrative_privileges, @@ -266,16 +266,16 @@ class Test_iam_inline_policy_no_administrative_privileges: PolicyDocument=dumps(INLINE_POLICY_ADMIN), ) # Audit Info - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges import ( iam_inline_policy_no_administrative_privileges, @@ -313,16 +313,16 @@ class Test_iam_inline_policy_no_administrative_privileges: PolicyDocument=dumps(INLINE_POLICY_NOT_ADMIN), ) # Audit Info - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges import ( iam_inline_policy_no_administrative_privileges, @@ -367,16 +367,16 @@ class Test_iam_inline_policy_no_administrative_privileges: PolicyDocument=dumps(INLINE_POLICY_ADMIN), ) # Audit Info - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges import ( iam_inline_policy_no_administrative_privileges, @@ -420,16 +420,16 @@ class Test_iam_inline_policy_no_administrative_privileges: ) # Audit Info - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges import ( iam_inline_policy_no_administrative_privileges, @@ -459,16 +459,16 @@ class Test_iam_inline_policy_no_administrative_privileges: PolicyDocument=dumps(INLINE_POLICY_ADMIN), ) # Audit Info - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges import ( iam_inline_policy_no_administrative_privileges, @@ -507,16 +507,16 @@ class Test_iam_inline_policy_no_administrative_privileges: PolicyDocument=dumps(INLINE_POLICY_NOT_ADMIN), ) # Audit Info - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges import ( iam_inline_policy_no_administrative_privileges, @@ -562,16 +562,16 @@ class Test_iam_inline_policy_no_administrative_privileges: PolicyDocument=dumps(INLINE_POLICY_ADMIN), ) # Audit Info - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_inline_policy_no_administrative_privileges.iam_inline_policy_no_administrative_privileges import ( iam_inline_policy_no_administrative_privileges, diff --git a/tests/providers/aws/services/iam/iam_no_custom_policy_permissive_role_assumption/iam_no_custom_policy_permissive_role_assumption_test.py b/tests/providers/aws/services/iam/iam_no_custom_policy_permissive_role_assumption/iam_no_custom_policy_permissive_role_assumption_test.py index d2f2bd88ea..aa3d941006 100644 --- a/tests/providers/aws/services/iam/iam_no_custom_policy_permissive_role_assumption/iam_no_custom_policy_permissive_role_assumption_test.py +++ b/tests/providers/aws/services/iam/iam_no_custom_policy_permissive_role_assumption/iam_no_custom_policy_permissive_role_assumption_test.py @@ -5,10 +5,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_no_custom_policy_permissive_role_assumption: @@ -28,15 +25,15 @@ class Test_iam_no_custom_policy_permissive_role_assumption: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_no_custom_policy_permissive_role_assumption.iam_no_custom_policy_permissive_role_assumption.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_no_custom_policy_permissive_role_assumption.iam_no_custom_policy_permissive_role_assumption import ( iam_no_custom_policy_permissive_role_assumption, @@ -68,15 +65,15 @@ class Test_iam_no_custom_policy_permissive_role_assumption: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_no_custom_policy_permissive_role_assumption.iam_no_custom_policy_permissive_role_assumption.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_no_custom_policy_permissive_role_assumption.iam_no_custom_policy_permissive_role_assumption import ( iam_no_custom_policy_permissive_role_assumption, @@ -112,15 +109,15 @@ class Test_iam_no_custom_policy_permissive_role_assumption: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_no_custom_policy_permissive_role_assumption.iam_no_custom_policy_permissive_role_assumption.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_no_custom_policy_permissive_role_assumption.iam_no_custom_policy_permissive_role_assumption import ( iam_no_custom_policy_permissive_role_assumption, @@ -152,15 +149,15 @@ class Test_iam_no_custom_policy_permissive_role_assumption: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_no_custom_policy_permissive_role_assumption.iam_no_custom_policy_permissive_role_assumption.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_no_custom_policy_permissive_role_assumption.iam_no_custom_policy_permissive_role_assumption import ( iam_no_custom_policy_permissive_role_assumption, @@ -204,15 +201,15 @@ class Test_iam_no_custom_policy_permissive_role_assumption: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_no_custom_policy_permissive_role_assumption.iam_no_custom_policy_permissive_role_assumption.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_no_custom_policy_permissive_role_assumption.iam_no_custom_policy_permissive_role_assumption import ( iam_no_custom_policy_permissive_role_assumption, diff --git a/tests/providers/aws/services/iam/iam_no_expired_server_certificates_stored/iam_no_expired_server_certificates_stored_test.py b/tests/providers/aws/services/iam/iam_no_expired_server_certificates_stored/iam_no_expired_server_certificates_stored_test.py index 4c2dc149f7..08003a981b 100644 --- a/tests/providers/aws/services/iam/iam_no_expired_server_certificates_stored/iam_no_expired_server_certificates_stored_test.py +++ b/tests/providers/aws/services/iam/iam_no_expired_server_certificates_stored/iam_no_expired_server_certificates_stored_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_no_expired_server_certificates_stored_test: @@ -15,15 +12,15 @@ class Test_iam_no_expired_server_certificates_stored_test: def test_no_certificates(self): from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_no_expired_server_certificates_stored.iam_no_expired_server_certificates_stored.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_no_expired_server_certificates_stored.iam_no_expired_server_certificates_stored import ( iam_no_expired_server_certificates_stored, @@ -46,15 +43,15 @@ class Test_iam_no_expired_server_certificates_stored_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_no_expired_server_certificates_stored.iam_no_expired_server_certificates_stored.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_no_expired_server_certificates_stored.iam_no_expired_server_certificates_stored import ( iam_no_expired_server_certificates_stored, diff --git a/tests/providers/aws/services/iam/iam_no_root_access_key/iam_no_root_access_key_test.py b/tests/providers/aws/services/iam/iam_no_root_access_key/iam_no_root_access_key_test.py index 2cff307265..345008c51e 100644 --- a/tests/providers/aws/services/iam/iam_no_root_access_key/iam_no_root_access_key_test.py +++ b/tests/providers/aws/services/iam/iam_no_root_access_key/iam_no_root_access_key_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_no_root_access_key_test: @@ -19,15 +16,15 @@ class Test_iam_no_root_access_key_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_no_root_access_key.iam_no_root_access_key.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_no_root_access_key.iam_no_root_access_key import ( iam_no_root_access_key, @@ -62,15 +59,15 @@ class Test_iam_no_root_access_key_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_no_root_access_key.iam_no_root_access_key.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_no_root_access_key.iam_no_root_access_key import ( iam_no_root_access_key, @@ -105,15 +102,15 @@ class Test_iam_no_root_access_key_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_no_root_access_key.iam_no_root_access_key.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_no_root_access_key.iam_no_root_access_key import ( iam_no_root_access_key, @@ -148,15 +145,15 @@ class Test_iam_no_root_access_key_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_no_root_access_key.iam_no_root_access_key.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_no_root_access_key.iam_no_root_access_key import ( iam_no_root_access_key, diff --git a/tests/providers/aws/services/iam/iam_password_policy_expires_passwords_within_90_days_or_less/iam_password_policy_expires_passwords_within_90_days_or_less_test.py b/tests/providers/aws/services/iam/iam_password_policy_expires_passwords_within_90_days_or_less/iam_password_policy_expires_passwords_within_90_days_or_less_test.py index a4fa8d2d71..b382fa4eef 100644 --- a/tests/providers/aws/services/iam/iam_password_policy_expires_passwords_within_90_days_or_less/iam_password_policy_expires_passwords_within_90_days_or_less_test.py +++ b/tests/providers/aws/services/iam/iam_password_policy_expires_passwords_within_90_days_or_less/iam_password_policy_expires_passwords_within_90_days_or_less_test.py @@ -3,10 +3,10 @@ from unittest import mock from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -15,15 +15,15 @@ class Test_iam_password_policy_expires_passwords_within_90_days_or_less: def test_password_expiration_lower_90(self): from prowler.providers.aws.services.iam.iam_service import IAM, PasswordPolicy - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_expires_passwords_within_90_days_or_less.iam_password_policy_expires_passwords_within_90_days_or_less.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_password_policy_expires_passwords_within_90_days_or_less.iam_password_policy_expires_passwords_within_90_days_or_less import ( iam_password_policy_expires_passwords_within_90_days_or_less, @@ -60,15 +60,15 @@ class Test_iam_password_policy_expires_passwords_within_90_days_or_less: def test_password_expiration_greater_90(self): from prowler.providers.aws.services.iam.iam_service import IAM, PasswordPolicy - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_expires_passwords_within_90_days_or_less.iam_password_policy_expires_passwords_within_90_days_or_less.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_password_policy_expires_passwords_within_90_days_or_less.iam_password_policy_expires_passwords_within_90_days_or_less import ( iam_password_policy_expires_passwords_within_90_days_or_less, @@ -105,15 +105,15 @@ class Test_iam_password_policy_expires_passwords_within_90_days_or_less: def test_password_expiration_just_90(self): from prowler.providers.aws.services.iam.iam_service import IAM, PasswordPolicy - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_expires_passwords_within_90_days_or_less.iam_password_policy_expires_passwords_within_90_days_or_less.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_password_policy_expires_passwords_within_90_days_or_less.iam_password_policy_expires_passwords_within_90_days_or_less import ( iam_password_policy_expires_passwords_within_90_days_or_less, diff --git a/tests/providers/aws/services/iam/iam_password_policy_lowercase/iam_password_policy_lowercase_test.py b/tests/providers/aws/services/iam/iam_password_policy_lowercase/iam_password_policy_lowercase_test.py index d5ec435496..425a01ebeb 100644 --- a/tests/providers/aws/services/iam/iam_password_policy_lowercase/iam_password_policy_lowercase_test.py +++ b/tests/providers/aws/services/iam/iam_password_policy_lowercase/iam_password_policy_lowercase_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -20,14 +20,14 @@ class Test_iam_password_policy_lowercase: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_lowercase.iam_password_policy_lowercase.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_lowercase.iam_password_policy_lowercase import ( @@ -57,14 +57,14 @@ class Test_iam_password_policy_lowercase: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_lowercase.iam_password_policy_lowercase.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_lowercase.iam_password_policy_lowercase import ( diff --git a/tests/providers/aws/services/iam/iam_password_policy_minimum_length_14/iam_password_policy_minimum_length_14_test.py b/tests/providers/aws/services/iam/iam_password_policy_minimum_length_14/iam_password_policy_minimum_length_14_test.py index 1815dd27d8..6683910bc8 100644 --- a/tests/providers/aws/services/iam/iam_password_policy_minimum_length_14/iam_password_policy_minimum_length_14_test.py +++ b/tests/providers/aws/services/iam/iam_password_policy_minimum_length_14/iam_password_policy_minimum_length_14_test.py @@ -4,19 +4,19 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) class Test_iam_password_policy_minimum_length_14: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @mock_aws @@ -27,14 +27,14 @@ class Test_iam_password_policy_minimum_length_14: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_minimum_length_14.iam_password_policy_minimum_length_14.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_minimum_length_14.iam_password_policy_minimum_length_14 import ( @@ -64,14 +64,14 @@ class Test_iam_password_policy_minimum_length_14: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_minimum_length_14.iam_password_policy_minimum_length_14.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_minimum_length_14.iam_password_policy_minimum_length_14 import ( @@ -101,14 +101,14 @@ class Test_iam_password_policy_minimum_length_14: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_minimum_length_14.iam_password_policy_minimum_length_14.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_minimum_length_14.iam_password_policy_minimum_length_14 import ( diff --git a/tests/providers/aws/services/iam/iam_password_policy_number/iam_password_policy_number_test.py b/tests/providers/aws/services/iam/iam_password_policy_number/iam_password_policy_number_test.py index 9b518e4b16..962f1a5d9e 100644 --- a/tests/providers/aws/services/iam/iam_password_policy_number/iam_password_policy_number_test.py +++ b/tests/providers/aws/services/iam/iam_password_policy_number/iam_password_policy_number_test.py @@ -4,19 +4,19 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) class Test_iam_password_policy_number: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @mock_aws @@ -27,14 +27,14 @@ class Test_iam_password_policy_number: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_number.iam_password_policy_number.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_number.iam_password_policy_number import ( @@ -64,14 +64,14 @@ class Test_iam_password_policy_number: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_number.iam_password_policy_number.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_number.iam_password_policy_number import ( diff --git a/tests/providers/aws/services/iam/iam_password_policy_reuse_24/iam_password_policy_reuse_24_test.py b/tests/providers/aws/services/iam/iam_password_policy_reuse_24/iam_password_policy_reuse_24_test.py index 27ad3aa82c..5c4a81f12b 100644 --- a/tests/providers/aws/services/iam/iam_password_policy_reuse_24/iam_password_policy_reuse_24_test.py +++ b/tests/providers/aws/services/iam/iam_password_policy_reuse_24/iam_password_policy_reuse_24_test.py @@ -3,19 +3,19 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) class Test_iam_password_policy_reuse_24: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @mock_aws @@ -24,15 +24,15 @@ class Test_iam_password_policy_reuse_24: # update password policy iam_client.update_account_password_policy(PasswordReusePrevention=24) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_reuse_24.iam_password_policy_reuse_24.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_reuse_24.iam_password_policy_reuse_24 import ( @@ -60,15 +60,15 @@ class Test_iam_password_policy_reuse_24: # update password policy iam_client.update_account_password_policy(PasswordReusePrevention=20) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_reuse_24.iam_password_policy_reuse_24.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_reuse_24.iam_password_policy_reuse_24 import ( diff --git a/tests/providers/aws/services/iam/iam_password_policy_symbol/iam_password_policy_symbol_test.py b/tests/providers/aws/services/iam/iam_password_policy_symbol/iam_password_policy_symbol_test.py index 8285a5438f..3cdd7caa7b 100644 --- a/tests/providers/aws/services/iam/iam_password_policy_symbol/iam_password_policy_symbol_test.py +++ b/tests/providers/aws/services/iam/iam_password_policy_symbol/iam_password_policy_symbol_test.py @@ -4,19 +4,19 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) class Test_iam_password_policy_symbol: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @mock_aws @@ -27,14 +27,14 @@ class Test_iam_password_policy_symbol: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_symbol.iam_password_policy_symbol.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_symbol.iam_password_policy_symbol import ( @@ -64,14 +64,14 @@ class Test_iam_password_policy_symbol: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_symbol.iam_password_policy_symbol.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_symbol.iam_password_policy_symbol import ( diff --git a/tests/providers/aws/services/iam/iam_password_policy_uppercase/iam_password_policy_uppercase_test.py b/tests/providers/aws/services/iam/iam_password_policy_uppercase/iam_password_policy_uppercase_test.py index 97b7442d60..1ddba2d635 100644 --- a/tests/providers/aws/services/iam/iam_password_policy_uppercase/iam_password_policy_uppercase_test.py +++ b/tests/providers/aws/services/iam/iam_password_policy_uppercase/iam_password_policy_uppercase_test.py @@ -3,19 +3,19 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) class Test_iam_password_policy_uppercase: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @mock_aws @@ -24,15 +24,15 @@ class Test_iam_password_policy_uppercase: # update password policy iam_client.update_account_password_policy(RequireUppercaseCharacters=False) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_uppercase.iam_password_policy_uppercase.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_uppercase.iam_password_policy_uppercase import ( @@ -60,15 +60,15 @@ class Test_iam_password_policy_uppercase: # update password policy iam_client.update_account_password_policy(RequireUppercaseCharacters=True) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_password_policy_uppercase.iam_password_policy_uppercase.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_password_policy_uppercase.iam_password_policy_uppercase import ( diff --git a/tests/providers/aws/services/iam/iam_policy_allows_privilege_escalation/iam_policy_allows_privilege_escalation_test.py b/tests/providers/aws/services/iam/iam_policy_allows_privilege_escalation/iam_policy_allows_privilege_escalation_test.py index 5d5c9d2056..e91c54a027 100644 --- a/tests/providers/aws/services/iam/iam_policy_allows_privilege_escalation/iam_policy_allows_privilege_escalation_test.py +++ b/tests/providers/aws/services/iam/iam_policy_allows_privilege_escalation/iam_policy_allows_privilege_escalation_test.py @@ -5,10 +5,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Keep this up-to-date with the check's actions that allows for privilege escalation @@ -84,11 +84,11 @@ privilege_escalation_policies_combination = { class Test_iam_policy_allows_privilege_escalation: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # @mock_aws @@ -104,14 +104,14 @@ class Test_iam_policy_allows_privilege_escalation: # policy_arn = iam_client.create_policy( # PolicyName=policy_name, PolicyDocument=dumps(policy_document) # )["Policy"]["Arn"] - # set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + # set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # from prowler.providers.aws.services.iam.iam_service import IAM # with mock.patch( - # "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - # new=current_audit_info, + # "prowler.providers.common.common.get_global_provider", + # return_value=aws_provider, # ), mock.patch( # "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - # new=IAM(current_audit_info), + # new=IAM(aws_provider), # ): # # Test Check # from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -144,15 +144,15 @@ class Test_iam_policy_allows_privilege_escalation: PolicyName=policy_name, PolicyDocument=dumps(policy_document) )["Policy"]["Arn"] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -192,15 +192,15 @@ class Test_iam_policy_allows_privilege_escalation: PolicyName=policy_name, PolicyDocument=dumps(policy_document) )["Policy"]["Arn"] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -251,15 +251,15 @@ class Test_iam_policy_allows_privilege_escalation: PolicyName=policy_name, PolicyDocument=dumps(policy_document) )["Policy"]["Arn"] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -306,15 +306,15 @@ class Test_iam_policy_allows_privilege_escalation: PolicyName=policy_name, PolicyDocument=dumps(policy_document) )["Policy"]["Arn"] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -357,15 +357,15 @@ class Test_iam_policy_allows_privilege_escalation: PolicyName=policy_name, PolicyDocument=dumps(policy_document) )["Policy"]["Arn"] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -426,15 +426,15 @@ class Test_iam_policy_allows_privilege_escalation: PolicyName=policy_name, PolicyDocument=dumps(policy_document) )["Policy"]["Arn"] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -484,15 +484,15 @@ class Test_iam_policy_allows_privilege_escalation: PolicyName=policy_name, PolicyDocument=dumps(policy_document) )["Policy"]["Arn"] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -518,7 +518,7 @@ class Test_iam_policy_allows_privilege_escalation: def test_iam_policy_allows_privilege_escalation_policies_combination( self, ): - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) policy_name = "privileged_policy" for values in privilege_escalation_policies_combination.values(): @@ -541,11 +541,11 @@ class Test_iam_policy_allows_privilege_escalation: from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -577,7 +577,7 @@ class Test_iam_policy_allows_privilege_escalation: def test_iam_policy_allows_privilege_escalation_two_policies_one_good_one_bad( self, ): - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) policy_name_1 = "privileged_policy_1" policy_document_1 = { @@ -626,11 +626,11 @@ class Test_iam_policy_allows_privilege_escalation: from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -670,7 +670,7 @@ class Test_iam_policy_allows_privilege_escalation: def test_iam_policy_allows_privilege_escalation_two_bad_policies( self, ): - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) policy_name_1 = "privileged_policy_1" policy_document_1 = { @@ -726,11 +726,11 @@ class Test_iam_policy_allows_privilege_escalation: from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -775,7 +775,7 @@ class Test_iam_policy_allows_privilege_escalation: def test_iam_policy_allows_privilege_escalation_over_permissive_policy( self, ): - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) policy_name_1 = "privileged_policy_1" policy_document_1 = { @@ -807,11 +807,11 @@ class Test_iam_policy_allows_privilege_escalation: from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -841,7 +841,7 @@ class Test_iam_policy_allows_privilege_escalation: def test_iam_policy_allows_privilege_escalation_administrator_policy( self, ): - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) policy_name_1 = "privileged_policy_1" policy_document_1 = { @@ -863,11 +863,11 @@ class Test_iam_policy_allows_privilege_escalation: from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -899,7 +899,7 @@ class Test_iam_policy_allows_privilege_escalation: def test_iam_policy_allows_privilege_escalation_iam_put( self, ): - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) policy_name_1 = "privileged_policy_1" policy_document_1 = { @@ -921,11 +921,11 @@ class Test_iam_policy_allows_privilege_escalation: from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -952,7 +952,7 @@ class Test_iam_policy_allows_privilege_escalation: def test_iam_policy_allows_privilege_escalation_iam_wildcard( self, ): - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) policy_name_1 = "privileged_policy_1" policy_document_1 = { @@ -974,11 +974,11 @@ class Test_iam_policy_allows_privilege_escalation: from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( @@ -1005,7 +1005,7 @@ class Test_iam_policy_allows_privilege_escalation: def test_iam_policy_not_allows_privilege_escalation_custom_policy( self, ): - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) policy_name_1 = "privileged_policy_1" policy_document_1 = { @@ -1033,11 +1033,11 @@ class Test_iam_policy_allows_privilege_escalation: from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_allows_privilege_escalation.iam_policy_allows_privilege_escalation import ( diff --git a/tests/providers/aws/services/iam/iam_policy_attached_only_to_group_or_roles/iam_policy_attached_only_to_group_or_roles_test.py b/tests/providers/aws/services/iam/iam_policy_attached_only_to_group_or_roles/iam_policy_attached_only_to_group_or_roles_test.py index 6da58e95e5..843431e4e1 100644 --- a/tests/providers/aws/services/iam/iam_policy_attached_only_to_group_or_roles/iam_policy_attached_only_to_group_or_roles_test.py +++ b/tests/providers/aws/services/iam/iam_policy_attached_only_to_group_or_roles/iam_policy_attached_only_to_group_or_roles_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -30,15 +30,15 @@ class Test_iam_policy_attached_only_to_group_or_roles: )["Policy"]["Arn"] iam_client.attach_user_policy(UserName=user, PolicyArn=policyArn) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_attached_only_to_group_or_roles.iam_policy_attached_only_to_group_or_roles.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_policy_attached_only_to_group_or_roles.iam_policy_attached_only_to_group_or_roles import ( iam_policy_attached_only_to_group_or_roles, @@ -79,15 +79,15 @@ class Test_iam_policy_attached_only_to_group_or_roles: )["Policy"]["Arn"] iam_client.attach_user_policy(UserName=user, PolicyArn=policyArn) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_attached_only_to_group_or_roles.iam_policy_attached_only_to_group_or_roles.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_policy_attached_only_to_group_or_roles.iam_policy_attached_only_to_group_or_roles import ( iam_policy_attached_only_to_group_or_roles, @@ -133,15 +133,15 @@ class Test_iam_policy_attached_only_to_group_or_roles: UserName=user, PolicyName=policyName, PolicyDocument=dumps(policyDocument) ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_attached_only_to_group_or_roles.iam_policy_attached_only_to_group_or_roles.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_policy_attached_only_to_group_or_roles.iam_policy_attached_only_to_group_or_roles import ( iam_policy_attached_only_to_group_or_roles, @@ -168,15 +168,15 @@ class Test_iam_policy_attached_only_to_group_or_roles: user = "test_no_policies" iam_client.create_user(UserName=user) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_policy_attached_only_to_group_or_roles.iam_policy_attached_only_to_group_or_roles.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_policy_attached_only_to_group_or_roles.iam_policy_attached_only_to_group_or_roles import ( iam_policy_attached_only_to_group_or_roles, diff --git a/tests/providers/aws/services/iam/iam_policy_no_full_access_to_cloudtrail/iam_policy_no_full_access_to_cloudtrail_test.py b/tests/providers/aws/services/iam/iam_policy_no_full_access_to_cloudtrail/iam_policy_no_full_access_to_cloudtrail_test.py index 1781f1f046..536f947a47 100644 --- a/tests/providers/aws/services/iam/iam_policy_no_full_access_to_cloudtrail/iam_policy_no_full_access_to_cloudtrail_test.py +++ b/tests/providers/aws/services/iam/iam_policy_no_full_access_to_cloudtrail/iam_policy_no_full_access_to_cloudtrail_test.py @@ -5,16 +5,13 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import IAM -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_policy_no_full_access_to_cloudtrail: @mock_aws def test_policy_full_access_to_cloudtrail(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam") policy_name = "policy_cloudtrail_full" policy_document_full_access = { @@ -28,12 +25,12 @@ class Test_iam_policy_no_full_access_to_cloudtrail: )["Policy"]["Arn"] with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_policy_no_full_access_to_cloudtrail.iam_policy_no_full_access_to_cloudtrail.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_no_full_access_to_cloudtrail.iam_policy_no_full_access_to_cloudtrail import ( @@ -53,7 +50,7 @@ class Test_iam_policy_no_full_access_to_cloudtrail: @mock_aws def test_policy_no_full_access_to_cloudtrail(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam") policy_name = "policy_no_cloudtrail_full" policy_document_full_access = { @@ -67,12 +64,12 @@ class Test_iam_policy_no_full_access_to_cloudtrail: )["Policy"]["Arn"] with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_policy_no_full_access_to_cloudtrail.iam_policy_no_full_access_to_cloudtrail.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_no_full_access_to_cloudtrail.iam_policy_no_full_access_to_cloudtrail import ( @@ -92,7 +89,7 @@ class Test_iam_policy_no_full_access_to_cloudtrail: @mock_aws def test_policy_mixed(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam") policy_name = "policy_mixed" policy_document_full_access = { @@ -110,12 +107,12 @@ class Test_iam_policy_no_full_access_to_cloudtrail: )["Policy"]["Arn"] with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_policy_no_full_access_to_cloudtrail.iam_policy_no_full_access_to_cloudtrail.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_no_full_access_to_cloudtrail.iam_policy_no_full_access_to_cloudtrail import ( diff --git a/tests/providers/aws/services/iam/iam_policy_no_full_access_to_kms/iam_policy_no_full_access_to_kms_test.py b/tests/providers/aws/services/iam/iam_policy_no_full_access_to_kms/iam_policy_no_full_access_to_kms_test.py index 425038233e..c843bd772b 100644 --- a/tests/providers/aws/services/iam/iam_policy_no_full_access_to_kms/iam_policy_no_full_access_to_kms_test.py +++ b/tests/providers/aws/services/iam/iam_policy_no_full_access_to_kms/iam_policy_no_full_access_to_kms_test.py @@ -5,16 +5,13 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import IAM -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_policy_no_full_access_to_kms: @mock_aws def test_policy_full_access_to_kms(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam") policy_name = "policy_kms_full" policy_document_full_access = { @@ -28,12 +25,12 @@ class Test_iam_policy_no_full_access_to_kms: )["Policy"]["Arn"] with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_policy_no_full_access_to_kms.iam_policy_no_full_access_to_kms.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_no_full_access_to_kms.iam_policy_no_full_access_to_kms import ( @@ -53,7 +50,7 @@ class Test_iam_policy_no_full_access_to_kms: @mock_aws def test_policy_no_full_access_to_kms(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam") policy_name = "policy_no_kms_full" policy_document_full_access = { @@ -67,12 +64,12 @@ class Test_iam_policy_no_full_access_to_kms: )["Policy"]["Arn"] with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_policy_no_full_access_to_kms.iam_policy_no_full_access_to_kms.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_no_full_access_to_kms.iam_policy_no_full_access_to_kms import ( @@ -92,7 +89,7 @@ class Test_iam_policy_no_full_access_to_kms: @mock_aws def test_policy_mixed(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam_client = client("iam") policy_name = "policy_mixed" policy_document_full_access = { @@ -106,12 +103,12 @@ class Test_iam_policy_no_full_access_to_kms: )["Policy"]["Arn"] with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_policy_no_full_access_to_kms.iam_policy_no_full_access_to_kms.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_policy_no_full_access_to_kms.iam_policy_no_full_access_to_kms import ( diff --git a/tests/providers/aws/services/iam/iam_role_administratoraccess_policy/iam_role_administratoraccess_policy_test.py b/tests/providers/aws/services/iam/iam_role_administratoraccess_policy/iam_role_administratoraccess_policy_test.py index 12936c0198..f248252be6 100644 --- a/tests/providers/aws/services/iam/iam_role_administratoraccess_policy/iam_role_administratoraccess_policy_test.py +++ b/tests/providers/aws/services/iam/iam_role_administratoraccess_policy/iam_role_administratoraccess_policy_test.py @@ -5,10 +5,7 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import Role -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider AWS_REGION = "us-east-1" AWS_ACCOUNT_ID = "123456789012" @@ -19,13 +16,13 @@ class Test_iam_role_administratoraccess_policy: def test_no_roles(self): from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_administratoraccess_policy.iam_role_administratoraccess_policy.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_administratoraccess_policy.iam_role_administratoraccess_policy import ( @@ -54,15 +51,15 @@ class Test_iam_role_administratoraccess_policy: AssumeRolePolicyDocument=dumps(assume_role_policy_document), ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_administratoraccess_policy.iam_role_administratoraccess_policy.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_administratoraccess_policy.iam_role_administratoraccess_policy import ( @@ -103,15 +100,15 @@ class Test_iam_role_administratoraccess_policy: PolicyArn="arn:aws:iam::aws:policy/SecurityAudit", ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_administratoraccess_policy.iam_role_administratoraccess_policy.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_administratoraccess_policy.iam_role_administratoraccess_policy import ( @@ -152,15 +149,15 @@ class Test_iam_role_administratoraccess_policy: PolicyArn="arn:aws:iam::aws:policy/AdministratorAccess", ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_administratoraccess_policy.iam_role_administratoraccess_policy.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_administratoraccess_policy.iam_role_administratoraccess_policy import ( @@ -201,15 +198,15 @@ class Test_iam_role_administratoraccess_policy: PolicyArn="arn:aws:iam::aws:policy/AdministratorAccess", ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_administratoraccess_policy.iam_role_administratoraccess_policy.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_administratoraccess_policy.iam_role_administratoraccess_policy import ( @@ -250,11 +247,11 @@ class Test_iam_role_administratoraccess_policy: ) ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_administratoraccess_policy.iam_role_administratoraccess_policy.iam_client", new=iam_client, diff --git a/tests/providers/aws/services/iam/iam_role_cross_account_readonlyaccess_policy/iam_role_cross_account_readonlyaccess_policy_test.py b/tests/providers/aws/services/iam/iam_role_cross_account_readonlyaccess_policy/iam_role_cross_account_readonlyaccess_policy_test.py index cc2dd250c8..c7da986f2b 100644 --- a/tests/providers/aws/services/iam/iam_role_cross_account_readonlyaccess_policy/iam_role_cross_account_readonlyaccess_policy_test.py +++ b/tests/providers/aws/services/iam/iam_role_cross_account_readonlyaccess_policy/iam_role_cross_account_readonlyaccess_policy_test.py @@ -5,10 +5,7 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import Role -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider AWS_REGION = "us-east-1" AWS_ACCOUNT_ID = "123456789012" @@ -19,13 +16,13 @@ class Test_iam_role_cross_account_readonlyaccess_policy: def test_no_roles(self): from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_account_readonlyaccess_policy.iam_role_cross_account_readonlyaccess_policy.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_cross_account_readonlyaccess_policy.iam_role_cross_account_readonlyaccess_policy import ( @@ -54,15 +51,15 @@ class Test_iam_role_cross_account_readonlyaccess_policy: AssumeRolePolicyDocument=dumps(assume_role_policy_document), ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_account_readonlyaccess_policy.iam_role_cross_account_readonlyaccess_policy.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_cross_account_readonlyaccess_policy.iam_role_cross_account_readonlyaccess_policy import ( @@ -103,15 +100,15 @@ class Test_iam_role_cross_account_readonlyaccess_policy: PolicyArn="arn:aws:iam::aws:policy/ReadOnlyAccess", ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_account_readonlyaccess_policy.iam_role_cross_account_readonlyaccess_policy.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_cross_account_readonlyaccess_policy.iam_role_cross_account_readonlyaccess_policy import ( @@ -152,15 +149,15 @@ class Test_iam_role_cross_account_readonlyaccess_policy: PolicyArn="arn:aws:iam::aws:policy/ReadOnlyAccess", ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_account_readonlyaccess_policy.iam_role_cross_account_readonlyaccess_policy.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_cross_account_readonlyaccess_policy.iam_role_cross_account_readonlyaccess_policy import ( @@ -201,15 +198,15 @@ class Test_iam_role_cross_account_readonlyaccess_policy: PolicyArn="arn:aws:iam::aws:policy/ReadOnlyAccess", ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_account_readonlyaccess_policy.iam_role_cross_account_readonlyaccess_policy.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_cross_account_readonlyaccess_policy.iam_role_cross_account_readonlyaccess_policy import ( @@ -250,11 +247,11 @@ class Test_iam_role_cross_account_readonlyaccess_policy: ) ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_account_readonlyaccess_policy.iam_role_cross_account_readonlyaccess_policy.iam_client", new=iam_client, diff --git a/tests/providers/aws/services/iam/iam_role_cross_service_confused_deputy_prevention/iam_role_cross_service_confused_deputy_prevention_test.py b/tests/providers/aws/services/iam/iam_role_cross_service_confused_deputy_prevention/iam_role_cross_service_confused_deputy_prevention_test.py index 2c8e1f3e8b..22ddd3f78a 100644 --- a/tests/providers/aws/services/iam/iam_role_cross_service_confused_deputy_prevention/iam_role_cross_service_confused_deputy_prevention_test.py +++ b/tests/providers/aws/services/iam/iam_role_cross_service_confused_deputy_prevention/iam_role_cross_service_confused_deputy_prevention_test.py @@ -5,10 +5,7 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import Role -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider AWS_REGION = "us-east-1" AWS_ACCOUNT_ID = "123456789012" @@ -19,14 +16,14 @@ class Test_iam_role_cross_service_confused_deputy_prevention: def test_no_roles(self): from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - current_audit_info.audited_account = AWS_ACCOUNT_ID + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + aws_provider.identity.account = AWS_ACCOUNT_ID with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention import ( @@ -59,12 +56,12 @@ class Test_iam_role_cross_service_confused_deputy_prevention: ) ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - current_audit_info.audited_account = AWS_ACCOUNT_ID + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + aws_provider.identity.account = AWS_ACCOUNT_ID with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention.iam_client", new=iam_client, @@ -98,14 +95,14 @@ class Test_iam_role_cross_service_confused_deputy_prevention: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - current_audit_info.audited_account = AWS_ACCOUNT_ID + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + aws_provider.identity.account = AWS_ACCOUNT_ID with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention import ( @@ -146,14 +143,14 @@ class Test_iam_role_cross_service_confused_deputy_prevention: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - current_audit_info.audited_account = AWS_ACCOUNT_ID + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + aws_provider.identity.account = AWS_ACCOUNT_ID with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention import ( @@ -196,14 +193,14 @@ class Test_iam_role_cross_service_confused_deputy_prevention: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - current_audit_info.audited_account = AWS_ACCOUNT_ID + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + aws_provider.identity.account = AWS_ACCOUNT_ID with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention import ( @@ -246,14 +243,14 @@ class Test_iam_role_cross_service_confused_deputy_prevention: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - current_audit_info.audited_account = AWS_ACCOUNT_ID + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + aws_provider.identity.account = AWS_ACCOUNT_ID with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention import ( @@ -296,14 +293,14 @@ class Test_iam_role_cross_service_confused_deputy_prevention: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - current_audit_info.audited_account = AWS_ACCOUNT_ID + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + aws_provider.identity.account = AWS_ACCOUNT_ID with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_role_cross_service_confused_deputy_prevention.iam_role_cross_service_confused_deputy_prevention import ( diff --git a/tests/providers/aws/services/iam/iam_root_hardware_mfa_enabled/iam_root_hardware_mfa_enabled_test.py b/tests/providers/aws/services/iam/iam_root_hardware_mfa_enabled/iam_root_hardware_mfa_enabled_test.py index 0fc5f0323a..0fe3322fbd 100644 --- a/tests/providers/aws/services/iam/iam_root_hardware_mfa_enabled/iam_root_hardware_mfa_enabled_test.py +++ b/tests/providers/aws/services/iam/iam_root_hardware_mfa_enabled/iam_root_hardware_mfa_enabled_test.py @@ -4,19 +4,19 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) class Test_iam_root_hardware_mfa_enabled_test: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @mock_aws @@ -27,14 +27,14 @@ class Test_iam_root_hardware_mfa_enabled_test: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_root_hardware_mfa_enabled.iam_root_hardware_mfa_enabled.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_root_hardware_mfa_enabled.iam_root_hardware_mfa_enabled import ( iam_root_hardware_mfa_enabled, @@ -60,14 +60,14 @@ class Test_iam_root_hardware_mfa_enabled_test: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_root_hardware_mfa_enabled.iam_root_hardware_mfa_enabled.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_root_hardware_mfa_enabled.iam_root_hardware_mfa_enabled import ( iam_root_hardware_mfa_enabled, diff --git a/tests/providers/aws/services/iam/iam_root_mfa_enabled/iam_root_mfa_enabled_test.py b/tests/providers/aws/services/iam/iam_root_mfa_enabled/iam_root_mfa_enabled_test.py index 984fbf33e3..791171c624 100644 --- a/tests/providers/aws/services/iam/iam_root_mfa_enabled/iam_root_mfa_enabled_test.py +++ b/tests/providers/aws/services/iam/iam_root_mfa_enabled/iam_root_mfa_enabled_test.py @@ -4,20 +4,17 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider AWS_ACCOUNT_NUMBER = "123456789012" class Test_iam_root_mfa_enabled_test: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @mock_aws @@ -26,15 +23,15 @@ class Test_iam_root_mfa_enabled_test: user = "test-user" iam_client.create_user(UserName=user)["User"]["Arn"] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_root_mfa_enabled.iam_root_mfa_enabled.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_root_mfa_enabled.iam_root_mfa_enabled import ( iam_root_mfa_enabled, @@ -61,15 +58,15 @@ class Test_iam_root_mfa_enabled_test: user = "test-user" iam_client.create_user(UserName=user)["User"]["Arn"] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_root_mfa_enabled.iam_root_mfa_enabled.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_root_mfa_enabled.iam_root_mfa_enabled import ( iam_root_mfa_enabled, diff --git a/tests/providers/aws/services/iam/iam_rotate_access_key_90_days/iam_rotate_access_key_90_days_test.py b/tests/providers/aws/services/iam/iam_rotate_access_key_90_days/iam_rotate_access_key_90_days_test.py index f0e7e1200a..1330091012 100644 --- a/tests/providers/aws/services/iam/iam_rotate_access_key_90_days/iam_rotate_access_key_90_days_test.py +++ b/tests/providers/aws/services/iam/iam_rotate_access_key_90_days/iam_rotate_access_key_90_days_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_rotate_access_key_90_days_test: @@ -19,14 +16,14 @@ class Test_iam_rotate_access_key_90_days_test: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_rotate_access_key_90_days.iam_rotate_access_key_90_days.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_rotate_access_key_90_days.iam_rotate_access_key_90_days import ( iam_rotate_access_key_90_days, @@ -57,14 +54,14 @@ class Test_iam_rotate_access_key_90_days_test: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_rotate_access_key_90_days.iam_rotate_access_key_90_days.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_rotate_access_key_90_days.iam_rotate_access_key_90_days import ( iam_rotate_access_key_90_days, @@ -98,14 +95,14 @@ class Test_iam_rotate_access_key_90_days_test: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_rotate_access_key_90_days.iam_rotate_access_key_90_days.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_rotate_access_key_90_days.iam_rotate_access_key_90_days import ( iam_rotate_access_key_90_days, @@ -139,14 +136,14 @@ class Test_iam_rotate_access_key_90_days_test: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_rotate_access_key_90_days.iam_rotate_access_key_90_days.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_rotate_access_key_90_days.iam_rotate_access_key_90_days import ( iam_rotate_access_key_90_days, @@ -193,15 +190,15 @@ class Test_iam_rotate_access_key_90_days_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_rotate_access_key_90_days.iam_rotate_access_key_90_days.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_rotate_access_key_90_days.iam_rotate_access_key_90_days import ( iam_rotate_access_key_90_days, diff --git a/tests/providers/aws/services/iam/iam_securityaudit_role_created/iam_securityaudit_role_created_test.py b/tests/providers/aws/services/iam/iam_securityaudit_role_created/iam_securityaudit_role_created_test.py index db21e106c9..3d6c0eaa2d 100644 --- a/tests/providers/aws/services/iam/iam_securityaudit_role_created/iam_securityaudit_role_created_test.py +++ b/tests/providers/aws/services/iam/iam_securityaudit_role_created/iam_securityaudit_role_created_test.py @@ -6,16 +6,13 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import IAM -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_iam_securityaudit_role_created: @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_securityaudit_role_created(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) iam = client("iam") role_name = "test_securityaudit_role_created" assume_role_policy_document = { @@ -37,12 +34,12 @@ class Test_iam_securityaudit_role_created: ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_securityaudit_role_created.iam_securityaudit_role_created.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_securityaudit_role_created.iam_securityaudit_role_created import ( @@ -62,15 +59,15 @@ class Test_iam_securityaudit_role_created: @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_no_securityaudit_role_created(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_securityaudit_role_created.iam_securityaudit_role_created.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_securityaudit_role_created.iam_securityaudit_role_created import ( diff --git a/tests/providers/aws/services/iam/iam_service_test.py b/tests/providers/aws/services/iam/iam_service_test.py index d7a99804f2..90136999eb 100644 --- a/tests/providers/aws/services/iam/iam_service_test.py +++ b/tests/providers/aws/services/iam/iam_service_test.py @@ -8,10 +8,10 @@ from mock import patch from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import IAM, Policy, is_service_role -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) TEST_DATETIME = "2023-01-01T12:01:01+00:00" @@ -84,16 +84,16 @@ class Test_IAM_Service: @mock_aws def test__get_client__(self): # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert iam.client.__class__.__name__ == "IAM" # Test IAM Session @mock_aws def test__get_session__(self): # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert iam.session.__class__.__name__ == "Session" # Test IAM Get Credential Report @@ -134,8 +134,8 @@ class Test_IAM_Service: } # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.credential_report) == 1 assert iam.credential_report[0].get("user") assert iam.credential_report[0]["user"] == expected_credential_report["user"] @@ -305,8 +305,8 @@ class Test_IAM_Service: )["Role"] # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.roles) == len(iam_client.list_roles()["Roles"]) assert iam.roles[0].tags == [ @@ -332,8 +332,8 @@ class Test_IAM_Service: ) # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.groups) == len(iam_client.list_groups()["Groups"]) # Test IAM Get Users @@ -356,8 +356,8 @@ class Test_IAM_Service: ) # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.users) == len(iam_client.list_users()["Users"]) assert iam.users[0].tags == [ {"Key": "test", "Value": "test"}, @@ -374,8 +374,8 @@ class Test_IAM_Service: account_summary = iam_client.get_account_summary()["SummaryMap"] # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert iam.account_summary["SummaryMap"] == account_summary @@ -408,8 +408,8 @@ class Test_IAM_Service: ) # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert iam.password_policy.length == min_password_length assert iam.password_policy.symbols == require_symbols @@ -444,8 +444,8 @@ class Test_IAM_Service: ) # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.users) == 1 assert len(iam.users[0].mfa_devices) == 1 @@ -478,8 +478,8 @@ class Test_IAM_Service: ) # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.virtual_mfa_devices) == 1 assert ( @@ -505,8 +505,8 @@ class Test_IAM_Service: iam_client.add_user_to_group(GroupName=group, UserName=username) # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.groups) == 1 assert iam.groups[0].name == group @@ -552,8 +552,8 @@ class Test_IAM_Service: ) # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.groups) == 1 assert iam.groups[0].name == group @@ -587,8 +587,8 @@ class Test_IAM_Service: ) # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.roles) == 1 assert iam.roles[0].name == role_name @@ -608,8 +608,8 @@ class Test_IAM_Service: EntityFilter="Role", )["PolicyRoles"] - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.entities_role_attached_to_support_policy) == 0 @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) @@ -639,8 +639,8 @@ class Test_IAM_Service: EntityFilter="Role", )["PolicyRoles"] - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.entities_role_attached_to_support_policy) == 1 assert iam.entities_role_attached_to_support_policy[0]["RoleName"] == role_name @@ -652,8 +652,8 @@ class Test_IAM_Service: EntityFilter="Role", )["PolicyRoles"] - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.entities_role_attached_to_securityaudit_policy) == 0 @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) @@ -683,8 +683,8 @@ class Test_IAM_Service: EntityFilter="Role", )["PolicyRoles"] - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.entities_role_attached_to_securityaudit_policy) == 1 assert ( iam.entities_role_attached_to_securityaudit_policy[0]["RoleName"] @@ -708,8 +708,8 @@ class Test_IAM_Service: {"Key": "string", "Value": "string"}, ], ) - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) custom_policies = 0 for policy in iam.policies: if policy.type == "Custom": @@ -733,8 +733,8 @@ class Test_IAM_Service: iam_client.create_policy( PolicyName=policy_name, PolicyDocument=dumps(policy_document) ) - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) custom_policies = 0 for policy in iam.policies: @@ -784,8 +784,8 @@ nTTxU4a7x1naFxzYXK1iQ1vMARKMjDb19QEJIEJKZlDK4uS7yMlf1nFS ) # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.saml_providers) == 1 assert iam.saml_providers[0]["Arn"].split("/")[1] == saml_provider_name @@ -808,8 +808,8 @@ nTTxU4a7x1naFxzYXK1iQ1vMARKMjDb19QEJIEJKZlDK4uS7yMlf1nFS ) # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.users) == 1 assert iam.users[0].name == user_name @@ -852,8 +852,8 @@ nTTxU4a7x1naFxzYXK1iQ1vMARKMjDb19QEJIEJKZlDK4uS7yMlf1nFS iam_client.delete_policy # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.groups) == 1 assert iam.groups[0].name == group_name @@ -896,8 +896,8 @@ nTTxU4a7x1naFxzYXK1iQ1vMARKMjDb19QEJIEJKZlDK4uS7yMlf1nFS ) # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.roles) == 1 assert iam.roles[0].name == role_name @@ -936,8 +936,8 @@ nTTxU4a7x1naFxzYXK1iQ1vMARKMjDb19QEJIEJKZlDK4uS7yMlf1nFS access_key = iam_client.create_access_key(UserName="test-user") access_key_id = access_key["AccessKey"]["AccessKeyId"] # IAM client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - iam = IAM(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + iam = IAM(aws_provider) assert len(iam.users) == 1 diff --git a/tests/providers/aws/services/iam/iam_support_role_created/iam_support_role_created_test.py b/tests/providers/aws/services/iam/iam_support_role_created/iam_support_role_created_test.py index 1527f04fff..00eab94d5b 100644 --- a/tests/providers/aws/services/iam/iam_support_role_created/iam_support_role_created_test.py +++ b/tests/providers/aws/services/iam/iam_support_role_created/iam_support_role_created_test.py @@ -5,20 +5,17 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider AWS_ACCOUNT_NUMBER = "123456789012" class Test_iam_support_role_created: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) @@ -43,15 +40,15 @@ class Test_iam_support_role_created: PolicyArn="arn:aws:iam::aws:policy/aws-service-role/AWSSupportServiceRolePolicy", ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_support_role_created.iam_support_role_created.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_support_role_created.iam_support_role_created import ( iam_support_role_created, @@ -72,15 +69,15 @@ class Test_iam_support_role_created: @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_no_support_role_created(self): - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_support_role_created.iam_support_role_created.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): from prowler.providers.aws.services.iam.iam_support_role_created.iam_support_role_created import ( iam_support_role_created, diff --git a/tests/providers/aws/services/iam/iam_user_accesskey_unused/iam_user_accesskey_unused_test.py b/tests/providers/aws/services/iam/iam_user_accesskey_unused/iam_user_accesskey_unused_test.py index 78b9a9651e..2a9e50d17f 100644 --- a/tests/providers/aws/services/iam/iam_user_accesskey_unused/iam_user_accesskey_unused_test.py +++ b/tests/providers/aws/services/iam/iam_user_accesskey_unused/iam_user_accesskey_unused_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider AWS_ACCOUNT_NUMBER = "123456789012" AWS_REGION = "us-east-1" @@ -22,17 +19,17 @@ class Test_iam_user_accesskey_unused_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1], audit_config={"max_unused_access_keys_days": 45} ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_user_accesskey_unused.iam_user_accesskey_unused.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_accesskey_unused.iam_user_accesskey_unused import ( iam_user_accesskey_unused, @@ -68,17 +65,17 @@ class Test_iam_user_accesskey_unused_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1], audit_config={"max_unused_access_keys_days": 45} ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_user_accesskey_unused.iam_user_accesskey_unused.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_accesskey_unused.iam_user_accesskey_unused import ( iam_user_accesskey_unused, @@ -112,17 +109,17 @@ class Test_iam_user_accesskey_unused_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1], audit_config={"max_unused_access_keys_days": 45} ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_user_accesskey_unused.iam_user_accesskey_unused.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_accesskey_unused.iam_user_accesskey_unused import ( iam_user_accesskey_unused, @@ -156,17 +153,17 @@ class Test_iam_user_accesskey_unused_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1], audit_config={"max_unused_access_keys_days": 45} ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_user_accesskey_unused.iam_user_accesskey_unused.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_accesskey_unused.iam_user_accesskey_unused import ( iam_user_accesskey_unused, @@ -214,17 +211,17 @@ class Test_iam_user_accesskey_unused_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1], audit_config={"max_unused_access_keys_days": 45} ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_user_accesskey_unused.iam_user_accesskey_unused.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_accesskey_unused.iam_user_accesskey_unused import ( iam_user_accesskey_unused, diff --git a/tests/providers/aws/services/iam/iam_user_console_access_unused/iam_user_console_access_unused_test.py b/tests/providers/aws/services/iam/iam_user_console_access_unused/iam_user_console_access_unused_test.py index 6ee2957330..48ff551a5a 100644 --- a/tests/providers/aws/services/iam/iam_user_console_access_unused/iam_user_console_access_unused_test.py +++ b/tests/providers/aws/services/iam/iam_user_console_access_unused/iam_user_console_access_unused_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider AWS_ACCOUNT_NUMBER = "123456789012" AWS_REGION = "us-east-1" @@ -25,17 +22,17 @@ class Test_iam_user_console_access_unused_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1], audit_config={"max_unused_access_keys_days": 45} ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_user_console_access_unused.iam_user_console_access_unused.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_console_access_unused.iam_user_console_access_unused import ( iam_user_console_access_unused, @@ -65,17 +62,17 @@ class Test_iam_user_console_access_unused_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1], audit_config={"max_unused_access_keys_days": 45} ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_user_console_access_unused.iam_user_console_access_unused.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_console_access_unused.iam_user_console_access_unused import ( iam_user_console_access_unused, @@ -102,17 +99,17 @@ class Test_iam_user_console_access_unused_test: from prowler.providers.aws.services.iam.iam_service import IAM - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1], audit_config={"max_unused_access_keys_days": 45} ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.iam.iam_user_console_access_unused.iam_user_console_access_unused.iam_client", - new=IAM(audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_console_access_unused.iam_user_console_access_unused import ( iam_user_console_access_unused, diff --git a/tests/providers/aws/services/iam/iam_user_hardware_mfa_enabled/iam_user_hardware_mfa_enabled_test.py b/tests/providers/aws/services/iam/iam_user_hardware_mfa_enabled/iam_user_hardware_mfa_enabled_test.py index 7810af412a..f65aef27b5 100644 --- a/tests/providers/aws/services/iam/iam_user_hardware_mfa_enabled/iam_user_hardware_mfa_enabled_test.py +++ b/tests/providers/aws/services/iam/iam_user_hardware_mfa_enabled/iam_user_hardware_mfa_enabled_test.py @@ -4,20 +4,17 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider AWS_ACCOUNT_NUMBER = "123456789012" class Test_iam_user_hardware_mfa_enabled_test: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @mock_aws @@ -28,14 +25,14 @@ class Test_iam_user_hardware_mfa_enabled_test: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_hardware_mfa_enabled.iam_user_hardware_mfa_enabled.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_hardware_mfa_enabled.iam_user_hardware_mfa_enabled import ( iam_user_hardware_mfa_enabled, @@ -61,14 +58,14 @@ class Test_iam_user_hardware_mfa_enabled_test: from prowler.providers.aws.services.iam.iam_service import IAM, MFADevice - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_hardware_mfa_enabled.iam_user_hardware_mfa_enabled.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_hardware_mfa_enabled.iam_user_hardware_mfa_enabled import ( iam_user_hardware_mfa_enabled, @@ -100,14 +97,14 @@ class Test_iam_user_hardware_mfa_enabled_test: from prowler.providers.aws.services.iam.iam_service import IAM, MFADevice - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_hardware_mfa_enabled.iam_user_hardware_mfa_enabled.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_hardware_mfa_enabled.iam_user_hardware_mfa_enabled import ( iam_user_hardware_mfa_enabled, diff --git a/tests/providers/aws/services/iam/iam_user_mfa_enabled_console_access/iam_user_mfa_enabled_console_access_test.py b/tests/providers/aws/services/iam/iam_user_mfa_enabled_console_access/iam_user_mfa_enabled_console_access_test.py index c52265c86f..5727067d5f 100644 --- a/tests/providers/aws/services/iam/iam_user_mfa_enabled_console_access/iam_user_mfa_enabled_console_access_test.py +++ b/tests/providers/aws/services/iam/iam_user_mfa_enabled_console_access/iam_user_mfa_enabled_console_access_test.py @@ -3,20 +3,17 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider AWS_ACCOUNT_NUMBER = "123456789012" class Test_iam_user_mfa_enabled_console_access_test: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @mock_aws @@ -27,13 +24,13 @@ class Test_iam_user_mfa_enabled_console_access_test: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_mfa_enabled_console_access.iam_user_mfa_enabled_console_access.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_mfa_enabled_console_access.iam_user_mfa_enabled_console_access import ( iam_user_mfa_enabled_console_access, @@ -60,13 +57,13 @@ class Test_iam_user_mfa_enabled_console_access_test: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_mfa_enabled_console_access.iam_user_mfa_enabled_console_access.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_mfa_enabled_console_access.iam_user_mfa_enabled_console_access import ( iam_user_mfa_enabled_console_access, @@ -93,13 +90,13 @@ class Test_iam_user_mfa_enabled_console_access_test: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_mfa_enabled_console_access.iam_user_mfa_enabled_console_access.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_mfa_enabled_console_access.iam_user_mfa_enabled_console_access import ( iam_user_mfa_enabled_console_access, @@ -127,13 +124,13 @@ class Test_iam_user_mfa_enabled_console_access_test: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_mfa_enabled_console_access.iam_user_mfa_enabled_console_access.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_mfa_enabled_console_access.iam_user_mfa_enabled_console_access import ( iam_user_mfa_enabled_console_access, diff --git a/tests/providers/aws/services/iam/iam_user_no_setup_initial_access_key/iam_user_no_setup_initial_access_key_test.py b/tests/providers/aws/services/iam/iam_user_no_setup_initial_access_key/iam_user_no_setup_initial_access_key_test.py index 959ad01d22..227c6743d0 100644 --- a/tests/providers/aws/services/iam/iam_user_no_setup_initial_access_key/iam_user_no_setup_initial_access_key_test.py +++ b/tests/providers/aws/services/iam/iam_user_no_setup_initial_access_key/iam_user_no_setup_initial_access_key_test.py @@ -4,20 +4,17 @@ from unittest import mock from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider AWS_ACCOUNT_NUMBER = "123456789012" class Test_iam_user_no_setup_initial_access_key_test: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @mock_aws @@ -28,15 +25,15 @@ test_false_access_key_1,arn:aws:iam::123456789012:test_false_access_key_1,2022-0 csv_reader = DictReader(credential_lines, delimiter=",") credential_list = list(csv_reader) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_no_setup_initial_access_key.iam_user_no_setup_initial_access_key.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_no_setup_initial_access_key.iam_user_no_setup_initial_access_key import ( iam_user_no_setup_initial_access_key, @@ -57,15 +54,15 @@ test_false_access_key_2,arn:aws:iam::123456789012:test_false_access_key_2,2022-0 csv_reader = DictReader(credential_lines, delimiter=",") credential_list = list(csv_reader) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_no_setup_initial_access_key.iam_user_no_setup_initial_access_key.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_no_setup_initial_access_key.iam_user_no_setup_initial_access_key import ( iam_user_no_setup_initial_access_key, @@ -86,15 +83,15 @@ test_false_both_access_keys,arn:aws:iam::123456789012:test_false_both_access_key csv_reader = DictReader(credential_lines, delimiter=",") credential_list = list(csv_reader) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_no_setup_initial_access_key.iam_user_no_setup_initial_access_key.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_no_setup_initial_access_key.iam_user_no_setup_initial_access_key import ( iam_user_no_setup_initial_access_key, @@ -117,15 +114,15 @@ test_pass,arn:aws:iam::123456789012:test_pass,2022-02-17T14:59:38+00:00,not_supp csv_reader = DictReader(credential_lines, delimiter=",") credential_list = list(csv_reader) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) from prowler.providers.aws.services.iam.iam_service import IAM with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_no_setup_initial_access_key.iam_user_no_setup_initial_access_key.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ) as service_client: from prowler.providers.aws.services.iam.iam_user_no_setup_initial_access_key.iam_user_no_setup_initial_access_key import ( iam_user_no_setup_initial_access_key, diff --git a/tests/providers/aws/services/iam/iam_user_two_active_access_key/iam_user_two_active_access_key_test.py b/tests/providers/aws/services/iam/iam_user_two_active_access_key/iam_user_two_active_access_key_test.py index 6bfbfa5377..643c33b8e8 100644 --- a/tests/providers/aws/services/iam/iam_user_two_active_access_key/iam_user_two_active_access_key_test.py +++ b/tests/providers/aws/services/iam/iam_user_two_active_access_key/iam_user_two_active_access_key_test.py @@ -4,20 +4,17 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider AWS_ACCOUNT_NUMBER = "123456789012" class Test_iam_user_two_active_access_key: - from tests.providers.aws.audit_info_utils import ( + from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @mock_aws @@ -33,17 +30,17 @@ class Test_iam_user_two_active_access_key: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_two_active_access_key.iam_user_two_active_access_key.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_user_two_active_access_key.iam_user_two_active_access_key import ( @@ -72,14 +69,14 @@ class Test_iam_user_two_active_access_key: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_two_active_access_key.iam_user_two_active_access_key.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_user_two_active_access_key.iam_user_two_active_access_key import ( @@ -107,14 +104,14 @@ class Test_iam_user_two_active_access_key: from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_two_active_access_key.iam_user_two_active_access_key.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_user_two_active_access_key.iam_user_two_active_access_key import ( @@ -137,14 +134,14 @@ class Test_iam_user_two_active_access_key: def test_iam_no_users(self): from prowler.providers.aws.services.iam.iam_service import IAM - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.iam.iam_user_two_active_access_key.iam_user_two_active_access_key.iam_client", - new=IAM(current_audit_info), + new=IAM(aws_provider), ): # Test Check from prowler.providers.aws.services.iam.iam_user_two_active_access_key.iam_user_two_active_access_key import ( diff --git a/tests/providers/aws/services/iam/iam_user_with_temporary_credentials/iam_user_with_temporary_credentials_test.py b/tests/providers/aws/services/iam/iam_user_with_temporary_credentials/iam_user_with_temporary_credentials_test.py index 5d10298b29..0a8d9cdcc0 100644 --- a/tests/providers/aws/services/iam/iam_user_with_temporary_credentials/iam_user_with_temporary_credentials_test.py +++ b/tests/providers/aws/services/iam/iam_user_with_temporary_credentials/iam_user_with_temporary_credentials_test.py @@ -1,10 +1,7 @@ from unittest import mock from prowler.providers.aws.services.iam.iam_service import IAM -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_US_EAST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1 IAM_USER_NAME = "test-user" IAM_USER_ARN = f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:user/{IAM_USER_NAME}" diff --git a/tests/providers/aws/services/inspector2/inspector2_active_findings_exist/inspector2_active_findings_exist_test.py b/tests/providers/aws/services/inspector2/inspector2_active_findings_exist/inspector2_active_findings_exist_test.py index f9f6aa50ef..407ee0e612 100644 --- a/tests/providers/aws/services/inspector2/inspector2_active_findings_exist/inspector2_active_findings_exist_test.py +++ b/tests/providers/aws/services/inspector2/inspector2_active_findings_exist/inspector2_active_findings_exist_test.py @@ -4,10 +4,10 @@ from prowler.providers.aws.services.inspector2.inspector2_service import ( Inspector, InspectorFinding, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) FINDING_ARN = ( @@ -20,7 +20,7 @@ class Test_inspector2_active_findings_exist: # Mock the inspector2 client inspector2_client = mock.MagicMock - inspector2_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + inspector2_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) inspector2_client.audited_account = AWS_ACCOUNT_NUMBER inspector2_client.audited_account_arn = ( f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" @@ -35,11 +35,11 @@ class Test_inspector2_active_findings_exist: findings=[], ) ] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.inspector2.inspector2_active_findings_exist.inspector2_active_findings_exist.inspector2_client", @@ -71,7 +71,7 @@ class Test_inspector2_active_findings_exist: # Mock the inspector2 client inspector2_client = mock.MagicMock - inspector2_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + inspector2_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) inspector2_client.audited_account = AWS_ACCOUNT_NUMBER inspector2_client.audited_account_arn = ( f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" @@ -94,11 +94,11 @@ class Test_inspector2_active_findings_exist: ], ) ] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.inspector2.inspector2_active_findings_exist.inspector2_active_findings_exist.inspector2_client", @@ -130,7 +130,7 @@ class Test_inspector2_active_findings_exist: # Mock the inspector2 client inspector2_client = mock.MagicMock - inspector2_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + inspector2_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) inspector2_client.audited_account = AWS_ACCOUNT_NUMBER inspector2_client.audited_account_arn = ( f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" @@ -153,11 +153,11 @@ class Test_inspector2_active_findings_exist: ], ) ] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.inspector2.inspector2_active_findings_exist.inspector2_active_findings_exist.inspector2_client", @@ -189,7 +189,7 @@ class Test_inspector2_active_findings_exist: # Mock the inspector2 client inspector2_client = mock.MagicMock - inspector2_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + inspector2_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) inspector2_client.audited_account = AWS_ACCOUNT_NUMBER inspector2_client.audited_account_arn = ( f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" @@ -219,11 +219,11 @@ class Test_inspector2_active_findings_exist: ], ) ] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.inspector2.inspector2_active_findings_exist.inspector2_active_findings_exist.inspector2_client", @@ -262,11 +262,11 @@ class Test_inspector2_active_findings_exist: ecr_client.registries[AWS_REGION_EU_WEST_1].repositories = [] ec2_client = mock.MagicMock ec2_client.instances = [] - ec2_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - ecr_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - awslambda_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - inspector2_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - inspector2_client.audit_info.ignore_unused_services = True + ec2_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + ecr_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + awslambda_client.aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + inspector2_client.aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + inspector2_client.provider._ignore_unused_services = True inspector2_client.audited_account = AWS_ACCOUNT_NUMBER inspector2_client.audited_account_arn = ( f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" @@ -281,11 +281,11 @@ class Test_inspector2_active_findings_exist: findings=[], ) ] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.inspector2.inspector2_active_findings_exist.inspector2_active_findings_exist.inspector2_client", diff --git a/tests/providers/aws/services/inspector2/inspector2_is_enabled/inspector2_is_enabled_test.py b/tests/providers/aws/services/inspector2/inspector2_is_enabled/inspector2_is_enabled_test.py index 895a1f31e9..5cd21e42d4 100644 --- a/tests/providers/aws/services/inspector2/inspector2_is_enabled/inspector2_is_enabled_test.py +++ b/tests/providers/aws/services/inspector2/inspector2_is_enabled/inspector2_is_enabled_test.py @@ -1,10 +1,10 @@ from unittest import mock from prowler.providers.aws.services.inspector2.inspector2_service import Inspector -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) FINDING_ARN = ( @@ -19,10 +19,10 @@ class Test_inspector2_is_enabled: awslambda_client = mock.MagicMock ecr_client = mock.MagicMock ec2_client = mock.MagicMock - ec2_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - ecr_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - awslambda_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - inspector2_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + ec2_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + ecr_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + awslambda_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + inspector2_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) inspector2_client.audited_account = AWS_ACCOUNT_NUMBER inspector2_client.audited_account_arn = ( f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" @@ -37,11 +37,11 @@ class Test_inspector2_is_enabled: findings=[], ) ] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.inspector2.inspector2_is_enabled.inspector2_is_enabled.inspector2_client", @@ -68,7 +68,7 @@ class Test_inspector2_is_enabled: def test_enabled_no_finding(self): # Mock the inspector2 client inspector2_client = mock.MagicMock - inspector2_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + inspector2_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) inspector2_client.audited_account = AWS_ACCOUNT_NUMBER inspector2_client.audited_account_arn = ( f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" @@ -83,11 +83,11 @@ class Test_inspector2_is_enabled: findings=[], ) ] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.inspector2.inspector2_is_enabled.inspector2_is_enabled.inspector2_client", diff --git a/tests/providers/aws/services/inspector2/inspector2_service_test.py b/tests/providers/aws/services/inspector2/inspector2_service_test.py index 3babd88740..b8690b4ed1 100644 --- a/tests/providers/aws/services/inspector2/inspector2_service_test.py +++ b/tests/providers/aws/services/inspector2/inspector2_service_test.py @@ -4,10 +4,10 @@ from unittest.mock import patch import botocore from prowler.providers.aws.services.inspector2.inspector2_service import Inspector2 -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) FINDING_ARN = ( @@ -69,8 +69,8 @@ def mock_make_api_call(self, operation_name, kwargs): return make_api_call(self, operation_name, kwargs) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -80,34 +80,34 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_Inspector2_Service: def test__get_client__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - inspector2 = Inspector2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + inspector2 = Inspector2(aws_provider) assert ( inspector2.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ == "Inspector2" ) def test__get_service__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - inspector2 = Inspector2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + inspector2 = Inspector2(aws_provider) assert inspector2.service == "inspector2" def test__batch_get_account_status__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - inspector2 = Inspector2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + inspector2 = Inspector2(aws_provider) assert len(inspector2.inspectors) == 1 assert inspector2.inspectors[0].id == "Inspector2" assert inspector2.inspectors[0].region == AWS_REGION_EU_WEST_1 assert inspector2.inspectors[0].status == "ENABLED" def test__list_findings__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - inspector2 = Inspector2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + inspector2 = Inspector2(aws_provider) assert len(inspector2.inspectors[0].findings) == 1 assert inspector2.inspectors[0].findings[0].arn == FINDING_ARN assert inspector2.inspectors[0].findings[0].region == AWS_REGION_EU_WEST_1 diff --git a/tests/providers/aws/services/kms/kms_cmk_are_used/kms_cmk_are_used_test.py b/tests/providers/aws/services/kms/kms_cmk_are_used/kms_cmk_are_used_test.py index d79f540584..b77f347e69 100644 --- a/tests/providers/aws/services/kms/kms_cmk_are_used/kms_cmk_are_used_test.py +++ b/tests/providers/aws/services/kms/kms_cmk_are_used/kms_cmk_are_used_test.py @@ -3,10 +3,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_kms_cmk_are_used: @@ -14,14 +11,14 @@ class Test_kms_cmk_are_used: def test_kms_no_keys(self): from prowler.providers.aws.services.kms.kms_service import KMS - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.kms.kms_cmk_are_used.kms_cmk_are_used.kms_client", - new=KMS(current_audit_info), + new=KMS(aws_provider), ): # Test Check from prowler.providers.aws.services.kms.kms_cmk_are_used.kms_cmk_are_used import ( @@ -42,14 +39,14 @@ class Test_kms_cmk_are_used: from prowler.providers.aws.services.kms.kms_service import KMS - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.kms.kms_cmk_are_used.kms_cmk_are_used.kms_client", - new=KMS(current_audit_info), + new=KMS(aws_provider), ): # Test Check from prowler.providers.aws.services.kms.kms_cmk_are_used.kms_cmk_are_used import ( @@ -75,14 +72,14 @@ class Test_kms_cmk_are_used: from prowler.providers.aws.services.kms.kms_service import KMS - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.kms.kms_cmk_are_used.kms_cmk_are_used.kms_client", - new=KMS(current_audit_info), + new=KMS(aws_provider), ): # Test Check from prowler.providers.aws.services.kms.kms_cmk_are_used.kms_cmk_are_used import ( @@ -111,14 +108,14 @@ class Test_kms_cmk_are_used: from prowler.providers.aws.services.kms.kms_service import KMS - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.kms.kms_cmk_are_used.kms_cmk_are_used.kms_client", - new=KMS(current_audit_info), + new=KMS(aws_provider), ): # Test Check from prowler.providers.aws.services.kms.kms_cmk_are_used.kms_cmk_are_used import ( diff --git a/tests/providers/aws/services/kms/kms_cmk_rotation_enabled/kms_cmk_rotation_enabled_test.py b/tests/providers/aws/services/kms/kms_cmk_rotation_enabled/kms_cmk_rotation_enabled_test.py index 3e7312723f..b1240af8c3 100644 --- a/tests/providers/aws/services/kms/kms_cmk_rotation_enabled/kms_cmk_rotation_enabled_test.py +++ b/tests/providers/aws/services/kms/kms_cmk_rotation_enabled/kms_cmk_rotation_enabled_test.py @@ -3,10 +3,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_kms_cmk_rotation_enabled: @@ -14,14 +11,14 @@ class Test_kms_cmk_rotation_enabled: def test_kms_no_key(self): from prowler.providers.aws.services.kms.kms_service import KMS - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.kms.kms_cmk_rotation_enabled.kms_cmk_rotation_enabled.kms_client", - new=KMS(current_audit_info), + new=KMS(aws_provider), ): # Test Check from prowler.providers.aws.services.kms.kms_cmk_rotation_enabled.kms_cmk_rotation_enabled import ( @@ -43,14 +40,14 @@ class Test_kms_cmk_rotation_enabled: from prowler.providers.aws.services.kms.kms_service import KMS - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.kms.kms_cmk_rotation_enabled.kms_cmk_rotation_enabled.kms_client", - new=KMS(current_audit_info), + new=KMS(aws_provider), ): # Test Check from prowler.providers.aws.services.kms.kms_cmk_rotation_enabled.kms_cmk_rotation_enabled import ( @@ -78,14 +75,14 @@ class Test_kms_cmk_rotation_enabled: from prowler.providers.aws.services.kms.kms_service import KMS - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.kms.kms_cmk_rotation_enabled.kms_cmk_rotation_enabled.kms_client", - new=KMS(current_audit_info), + new=KMS(aws_provider), ): # Test Check from prowler.providers.aws.services.kms.kms_cmk_rotation_enabled.kms_cmk_rotation_enabled import ( diff --git a/tests/providers/aws/services/kms/kms_key_not_publicly_accessible/kms_key_not_publicly_accessible_test.py b/tests/providers/aws/services/kms/kms_key_not_publicly_accessible/kms_key_not_publicly_accessible_test.py index f2772acef7..6e1d1ea147 100644 --- a/tests/providers/aws/services/kms/kms_key_not_publicly_accessible/kms_key_not_publicly_accessible_test.py +++ b/tests/providers/aws/services/kms/kms_key_not_publicly_accessible/kms_key_not_publicly_accessible_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_kms_key_not_publicly_accessible: @@ -15,14 +12,14 @@ class Test_kms_key_not_publicly_accessible: def test_no_kms_keys(self): from prowler.providers.aws.services.kms.kms_service import KMS - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.kms.kms_key_not_publicly_accessible.kms_key_not_publicly_accessible.kms_client", - new=KMS(current_audit_info), + new=KMS(aws_provider), ): # Test Check from prowler.providers.aws.services.kms.kms_key_not_publicly_accessible.kms_key_not_publicly_accessible import ( @@ -43,14 +40,14 @@ class Test_kms_key_not_publicly_accessible: from prowler.providers.aws.services.kms.kms_service import KMS - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.kms.kms_key_not_publicly_accessible.kms_key_not_publicly_accessible.kms_client", - new=KMS(current_audit_info), + new=KMS(aws_provider), ): # Test Check from prowler.providers.aws.services.kms.kms_key_not_publicly_accessible.kms_key_not_publicly_accessible import ( @@ -94,14 +91,14 @@ class Test_kms_key_not_publicly_accessible: from prowler.providers.aws.services.kms.kms_service import KMS - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.kms.kms_key_not_publicly_accessible.kms_key_not_publicly_accessible.kms_client", - new=KMS(current_audit_info), + new=KMS(aws_provider), ): # Test Check from prowler.providers.aws.services.kms.kms_key_not_publicly_accessible.kms_key_not_publicly_accessible import ( @@ -144,14 +141,14 @@ class Test_kms_key_not_publicly_accessible: from prowler.providers.aws.services.kms.kms_service import KMS - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.kms.kms_key_not_publicly_accessible.kms_key_not_publicly_accessible.kms_client", - new=KMS(current_audit_info), + new=KMS(aws_provider), ): # Test Check from prowler.providers.aws.services.kms.kms_key_not_publicly_accessible.kms_key_not_publicly_accessible import ( diff --git a/tests/providers/aws/services/kms/kms_service_test.py b/tests/providers/aws/services/kms/kms_service_test.py index c810b1efd0..be316c930d 100644 --- a/tests/providers/aws/services/kms/kms_service_test.py +++ b/tests/providers/aws/services/kms/kms_service_test.py @@ -4,10 +4,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.kms.kms_service import KMS -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -17,16 +17,16 @@ class Test_ACM_Service: @mock_aws def test_service(self): # KMS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - kms = KMS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + kms = KMS(aws_provider) assert kms.service == "kms" # Test KMS Client @mock_aws def test_client(self): # KMS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - kms = KMS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + kms = KMS(aws_provider) for regional_client in kms.regional_clients.values(): assert regional_client.__class__.__name__ == "KMS" @@ -34,16 +34,16 @@ class Test_ACM_Service: @mock_aws def test__get_session__(self): # KMS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - kms = KMS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + kms = KMS(aws_provider) assert kms.session.__class__.__name__ == "Session" # Test KMS Session @mock_aws def test_audited_account(self): # KMS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - kms = KMS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + kms = KMS(aws_provider) assert kms.audited_account == AWS_ACCOUNT_NUMBER # Test KMS List Keys @@ -55,8 +55,8 @@ class Test_ACM_Service: key1 = kms_client.create_key()["KeyMetadata"] key2 = kms_client.create_key()["KeyMetadata"] # KMS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - kms = KMS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + kms = KMS(aws_provider) assert len(kms.keys) == 2 assert kms.keys[0].arn == key1["Arn"] assert kms.keys[1].arn == key2["Arn"] @@ -73,8 +73,8 @@ class Test_ACM_Service: ], )["KeyMetadata"] # KMS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - kms = KMS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + kms = KMS(aws_provider) assert len(kms.keys) == 1 assert kms.keys[0].arn == key1["Arn"] assert kms.keys[0].state == key1["KeyState"] @@ -94,8 +94,8 @@ class Test_ACM_Service: key2 = kms_client.create_key()["KeyMetadata"] kms_client.enable_key_rotation(KeyId=key2["KeyId"]) # KMS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - kms = KMS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + kms = KMS(aws_provider) assert len(kms.keys) == 2 assert kms.keys[0].arn == key1["Arn"] assert kms.keys[0].rotation_enabled is False @@ -141,8 +141,8 @@ class Test_ACM_Service: key1 = kms_client.create_key(Policy=default_policy)["KeyMetadata"] key2 = kms_client.create_key(Policy=public_policy)["KeyMetadata"] # KMS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - kms = KMS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + kms = KMS(aws_provider) assert len(kms.keys) == 2 assert kms.keys[0].arn == key1["Arn"] assert kms.keys[0].policy == json.loads(default_policy) 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 7df819f39b..68b1c1d17b 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 @@ -4,10 +4,10 @@ from moto import mock_aws from prowler.providers.aws.services.macie.macie_service import Session from prowler.providers.aws.services.s3.s3_service import Bucket -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -15,12 +15,12 @@ class Test_macie_is_enabled: @mock_aws def test_macie_disabled(self): s3_client = mock.MagicMock - s3_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + s3_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) s3_client.buckets = [] s3_client.regions_with_buckets = [] macie_client = mock.MagicMock - macie_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + macie_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) macie_client.audited_account = AWS_ACCOUNT_NUMBER macie_client.audited_account_arn = f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" macie_client.audited_partition = "aws" @@ -35,11 +35,11 @@ class Test_macie_is_enabled: 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]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.macie.macie_is_enabled.macie_is_enabled.macie_client", new=macie_client, @@ -67,12 +67,12 @@ class Test_macie_is_enabled: @mock_aws def test_macie_enabled(self): s3_client = mock.MagicMock - s3_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + s3_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) s3_client.buckets = [] s3_client.regions_with_buckets = [] macie_client = mock.MagicMock - macie_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + macie_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) macie_client.audited_account = AWS_ACCOUNT_NUMBER macie_client.audited_account_arn = f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" macie_client.audited_partition = "aws" @@ -87,11 +87,11 @@ class Test_macie_is_enabled: 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]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.macie.macie_is_enabled.macie_is_enabled.macie_client", new=macie_client, @@ -119,12 +119,12 @@ class Test_macie_is_enabled: @mock_aws def test_macie_suspended_ignored(self): s3_client = mock.MagicMock - s3_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + s3_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) s3_client.buckets = [] s3_client.regions_with_buckets = [] macie_client = mock.MagicMock - macie_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + macie_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) macie_client.audited_account = AWS_ACCOUNT_NUMBER macie_client.audited_account_arn = f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" macie_client.audited_partition = "aws" @@ -140,12 +140,12 @@ class Test_macie_is_enabled: ) ] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - macie_client.audit_info.ignore_unused_services = True + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + macie_client.provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.macie.macie_is_enabled.macie_is_enabled.macie_client", new=macie_client, @@ -167,7 +167,7 @@ class Test_macie_is_enabled: def test_macie_suspended_ignored_with_buckets(self): s3_client = mock.MagicMock s3_client.regions_with_buckets = [AWS_REGION_EU_WEST_1] - s3_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + s3_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) s3_client.buckets = [ Bucket( name="test", @@ -177,7 +177,7 @@ class Test_macie_is_enabled: ] macie_client = mock.MagicMock - macie_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + macie_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) macie_client.audited_account = AWS_ACCOUNT_NUMBER macie_client.audited_account_arn = f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" macie_client.audited_partition = "aws" @@ -192,12 +192,12 @@ class Test_macie_is_enabled: 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]) + macie_client.provider._ignore_unused_services = True + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.macie.macie_is_enabled.macie_is_enabled.macie_client", new=macie_client, @@ -227,10 +227,10 @@ class Test_macie_is_enabled: @mock_aws def test_macie_suspended(self): s3_client = mock.MagicMock - s3_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + s3_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) macie_client = mock.MagicMock - macie_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + macie_client.provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) macie_client.audited_account = AWS_ACCOUNT_NUMBER macie_client.audited_account_arn = f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" macie_client.audited_partition = "aws" @@ -241,14 +241,14 @@ class Test_macie_is_enabled: region="eu-west-1", ) ] - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([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, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.macie.macie_is_enabled.macie_is_enabled.macie_client", new=macie_client, diff --git a/tests/providers/aws/services/macie/macie_service_test.py b/tests/providers/aws/services/macie/macie_service_test.py index aa5945441f..df973d1373 100644 --- a/tests/providers/aws/services/macie/macie_service_test.py +++ b/tests/providers/aws/services/macie/macie_service_test.py @@ -4,10 +4,7 @@ from unittest.mock import patch import botocore from prowler.providers.aws.services.macie.macie_service import Macie, Session -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider # Mocking Macie2 Calls make_api_call = botocore.client.BaseClient._make_api_call @@ -32,8 +29,8 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -43,30 +40,30 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_Macie_Service: # Test Macie Client def test__get_client__(self): - macie = Macie(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])) + macie = Macie(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])) assert ( macie.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ == "Macie2" ) # Test Macie Session def test__get_session__(self): - macie = Macie(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])) + macie = Macie(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])) assert macie.session.__class__.__name__ == "Session" # Test Macie Service def test__get_service__(self): - macie = Macie(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])) + macie = Macie(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])) assert macie.service == "macie2" def test__get_macie_session__(self): # Set partition for the service - macie = Macie(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])) + macie = Macie(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])) macie.sessions = [ Session( status="ENABLED", diff --git a/tests/providers/aws/services/neptune/neptune_cluster_uses_public_subnet/neptune_cluster_uses_public_subnet_test.py b/tests/providers/aws/services/neptune/neptune_cluster_uses_public_subnet/neptune_cluster_uses_public_subnet_test.py index c1bb686744..2e032e4c5a 100644 --- a/tests/providers/aws/services/neptune/neptune_cluster_uses_public_subnet/neptune_cluster_uses_public_subnet_test.py +++ b/tests/providers/aws/services/neptune/neptune_cluster_uses_public_subnet/neptune_cluster_uses_public_subnet_test.py @@ -6,12 +6,6 @@ from moto import mock_aws from prowler.providers.aws.services.neptune.neptune_service import Neptune from prowler.providers.aws.services.vpc.vpc_service import VpcSubnet -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - AWS_REGION_US_EAST_1_AZA, - AWS_REGION_US_EAST_1_AZB, - set_mocked_aws_audit_info, -) from tests.providers.aws.services.neptune.neptune_service_test import ( NEPTUNE_CLUSTER_NAME, NEPTUNE_CLUSTER_TAGS, @@ -20,6 +14,12 @@ from tests.providers.aws.services.neptune.neptune_service_test import ( SUBNET_2, mock_make_api_call, ) +from tests.providers.aws.utils import ( + AWS_REGION_US_EAST_1, + AWS_REGION_US_EAST_1_AZA, + AWS_REGION_US_EAST_1_AZB, + set_mocked_aws_provider, +) VPC_ID = "vpc-12345678901234567" @@ -33,14 +33,14 @@ class Test_neptune_cluster_uses_public_subnet: vpc_client = MagicMock vpc_client.vpc_subnets = {} - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.neptune.neptune_cluster_uses_public_subnet.neptune_cluster_uses_public_subnet.neptune_client", - new=Neptune(audit_info), + new=Neptune(aws_provider), ), mock.patch( "prowler.providers.aws.services.neptune.neptune_cluster_uses_public_subnet.neptune_cluster_uses_public_subnet.vpc_client", new=vpc_client, @@ -106,13 +106,13 @@ class Test_neptune_cluster_uses_public_subnet: cluster_arn = cluster["DBClusterArn"] cluster_id = cluster["DbClusterResourceId"] - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.neptune.neptune_cluster_uses_public_subnet.neptune_cluster_uses_public_subnet.neptune_client", - new=Neptune(audit_info), + new=Neptune(aws_provider), ), mock.patch( "prowler.providers.aws.services.neptune.neptune_cluster_uses_public_subnet.neptune_cluster_uses_public_subnet.vpc_client", new=vpc_client, @@ -187,13 +187,13 @@ class Test_neptune_cluster_uses_public_subnet: cluster_arn = cluster["DBClusterArn"] cluster_id = cluster["DbClusterResourceId"] - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.neptune.neptune_cluster_uses_public_subnet.neptune_cluster_uses_public_subnet.neptune_client", - new=Neptune(audit_info), + new=Neptune(aws_provider), ), mock.patch( "prowler.providers.aws.services.neptune.neptune_cluster_uses_public_subnet.neptune_cluster_uses_public_subnet.vpc_client", new=vpc_client, diff --git a/tests/providers/aws/services/neptune/neptune_service_test.py b/tests/providers/aws/services/neptune/neptune_service_test.py index fe3303b09d..01ec4ae6e2 100644 --- a/tests/providers/aws/services/neptune/neptune_service_test.py +++ b/tests/providers/aws/services/neptune/neptune_service_test.py @@ -4,12 +4,12 @@ from mock import patch from moto import mock_aws from prowler.providers.aws.services.neptune.neptune_service import Cluster, Neptune -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, AWS_REGION_US_EAST_1_AZA, AWS_REGION_US_EAST_1_AZB, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) SUBNET_GROUP_NAME = "default" @@ -69,8 +69,8 @@ def mock_make_api_call(self, operation_name, kwargs): return make_api_call(self, operation_name, kwargs) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -78,7 +78,7 @@ def mock_generate_regional_clients(service, audit_info): @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) # Patch every AWS call using Boto3 @@ -87,29 +87,29 @@ class Test_Neptune_Service: # Test Neptune Service @mock_aws def test_service(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - neptune = Neptune(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + neptune = Neptune(aws_provider) assert neptune.service == "neptune" # Test Neptune Client] @mock_aws def test_client(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - neptune = Neptune(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + neptune = Neptune(aws_provider) assert neptune.client.__class__.__name__ == "Neptune" # Test Neptune Session @mock_aws def test__get_session__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - neptune = Neptune(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + neptune = Neptune(aws_provider) assert neptune.session.__class__.__name__ == "Session" # Test Neptune Session @mock_aws def test_audited_account(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - neptune = Neptune(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + neptune = Neptune(aws_provider) assert neptune.audited_account == AWS_ACCOUNT_NUMBER # Test Neptune Get Neptune Contacts @@ -134,8 +134,8 @@ class Test_Neptune_Service: cluster_arn = cluster["DBClusterArn"] cluster_id = cluster["DbClusterResourceId"] - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - neptune = Neptune(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + neptune = Neptune(aws_provider) assert len(neptune.clusters) == 1 assert neptune.clusters[cluster_arn] diff --git a/tests/providers/aws/services/networkfirewall/networkfirewall_in_all_vpc/networkfirewall_in_all_vpc_test.py b/tests/providers/aws/services/networkfirewall/networkfirewall_in_all_vpc/networkfirewall_in_all_vpc_test.py index 772854fd41..9b9d9a497c 100644 --- a/tests/providers/aws/services/networkfirewall/networkfirewall_in_all_vpc/networkfirewall_in_all_vpc_test.py +++ b/tests/providers/aws/services/networkfirewall/networkfirewall_in_all_vpc/networkfirewall_in_all_vpc_test.py @@ -4,10 +4,7 @@ from prowler.providers.aws.services.networkfirewall.networkfirewall_service impo Firewall, ) from prowler.providers.aws.services.vpc.vpc_service import VPCs, VpcSubnet -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider FIREWALL_ARN = "arn:aws:network-firewall:us-east-1:123456789012:firewall/my-firewall" FIREWALL_NAME = "my-firewall" @@ -19,21 +16,21 @@ POLICY_ARN = "arn:aws:network-firewall:us-east-1:123456789012:firewall-policy/my class Test_networkfirewall_in_all_vpc: def test_no_vpcs(self): networkfirewall_client = mock.MagicMock - networkfirewall_client.audit_info = set_mocked_aws_audit_info( + networkfirewall_client.provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1] ) networkfirewall_client.region = AWS_REGION_US_EAST_1 networkfirewall_client.network_firewalls = [] vpc_client = mock.MagicMock - vpc_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + vpc_client.provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) vpc_client.region = AWS_REGION_US_EAST_1 vpc_client.vpcs = {} - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.vpc_client", @@ -55,7 +52,7 @@ class Test_networkfirewall_in_all_vpc: def test_vpcs_with_firewall_all(self): networkfirewall_client = mock.MagicMock - networkfirewall_client.audit_info = set_mocked_aws_audit_info( + networkfirewall_client.provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1] ) networkfirewall_client.region = AWS_REGION_US_EAST_1 @@ -71,7 +68,7 @@ class Test_networkfirewall_in_all_vpc: ) ] vpc_client = mock.MagicMock - vpc_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + vpc_client.provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) vpc_client.region = AWS_REGION_US_EAST_1 vpc_client.vpcs = { VPC_ID_PROTECTED: VPCs( @@ -102,11 +99,11 @@ class Test_networkfirewall_in_all_vpc: ) } - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.vpc_client", @@ -137,13 +134,13 @@ class Test_networkfirewall_in_all_vpc: def test_vpcs_without_firewall(self): networkfirewall_client = mock.MagicMock - networkfirewall_client.audit_info = set_mocked_aws_audit_info( + networkfirewall_client.provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1] ) networkfirewall_client.region = AWS_REGION_US_EAST_1 networkfirewall_client.network_firewalls = [] vpc_client = mock.MagicMock - vpc_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + vpc_client.provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) vpc_client.region = AWS_REGION_US_EAST_1 vpc_client.vpcs = { VPC_ID_UNPROTECTED: VPCs( @@ -174,11 +171,11 @@ class Test_networkfirewall_in_all_vpc: ) } - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.vpc_client", @@ -209,14 +206,14 @@ class Test_networkfirewall_in_all_vpc: def test_vpcs_with_name_without_firewall(self): networkfirewall_client = mock.MagicMock - networkfirewall_client.audit_info = set_mocked_aws_audit_info( + networkfirewall_client.provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1] ) networkfirewall_client.region = AWS_REGION_US_EAST_1 networkfirewall_client.network_firewalls = [] vpc_client = mock.MagicMock - vpc_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + vpc_client.provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) vpc_client.region = AWS_REGION_US_EAST_1 vpc_client.vpcs = { VPC_ID_UNPROTECTED: VPCs( @@ -247,11 +244,11 @@ class Test_networkfirewall_in_all_vpc: ) } - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.vpc_client", @@ -282,7 +279,7 @@ class Test_networkfirewall_in_all_vpc: def test_vpcs_with_and_without_firewall(self): networkfirewall_client = mock.MagicMock - networkfirewall_client.audit_info = set_mocked_aws_audit_info( + networkfirewall_client.provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1] ) networkfirewall_client.region = AWS_REGION_US_EAST_1 @@ -298,7 +295,7 @@ class Test_networkfirewall_in_all_vpc: ) ] vpc_client = mock.MagicMock - vpc_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + vpc_client.provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) vpc_client.region = AWS_REGION_US_EAST_1 vpc_client.vpcs = { VPC_ID_UNPROTECTED: VPCs( @@ -355,11 +352,11 @@ class Test_networkfirewall_in_all_vpc: ), } - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.vpc_client", @@ -402,13 +399,13 @@ class Test_networkfirewall_in_all_vpc: def test_vpcs_without_firewall_ignoring(self): networkfirewall_client = mock.MagicMock - networkfirewall_client.audit_info = set_mocked_aws_audit_info( + networkfirewall_client.provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1] ) networkfirewall_client.region = AWS_REGION_US_EAST_1 networkfirewall_client.network_firewalls = [] vpc_client = mock.MagicMock - vpc_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + vpc_client.provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) vpc_client.region = AWS_REGION_US_EAST_1 vpc_client.vpcs = { VPC_ID_UNPROTECTED: VPCs( @@ -439,12 +436,12 @@ class Test_networkfirewall_in_all_vpc: ) } - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - vpc_client.audit_info.ignore_unused_services = True + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + vpc_client.provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.vpc_client", @@ -466,13 +463,13 @@ class Test_networkfirewall_in_all_vpc: def test_vpcs_without_firewall_ignoring_vpc_in_use(self): networkfirewall_client = mock.MagicMock - networkfirewall_client.audit_info = set_mocked_aws_audit_info( + networkfirewall_client.provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1] ) networkfirewall_client.region = AWS_REGION_US_EAST_1 networkfirewall_client.network_firewalls = [] vpc_client = mock.MagicMock - vpc_client.audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + vpc_client.provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) vpc_client.region = AWS_REGION_US_EAST_1 vpc_client.vpcs = { VPC_ID_UNPROTECTED: VPCs( @@ -504,12 +501,12 @@ class Test_networkfirewall_in_all_vpc: ) } - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - vpc_client.audit_info.ignore_unused_services = True + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + vpc_client.provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.networkfirewall.networkfirewall_in_all_vpc.networkfirewall_in_all_vpc.vpc_client", diff --git a/tests/providers/aws/services/networkfirewall/networkfirewall_service_test.py b/tests/providers/aws/services/networkfirewall/networkfirewall_service_test.py index b6b21db0de..ded1dfdc54 100644 --- a/tests/providers/aws/services/networkfirewall/networkfirewall_service_test.py +++ b/tests/providers/aws/services/networkfirewall/networkfirewall_service_test.py @@ -5,10 +5,7 @@ import botocore from prowler.providers.aws.services.networkfirewall.networkfirewall_service import ( NetworkFirewall, ) -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider FIREWALL_ARN = "arn:aws:network-firewall:us-east-1:123456789012:firewall/my-firewall" FIREWALL_NAME = "my-firewall" @@ -51,8 +48,8 @@ def mock_make_api_call(self, operation_name, kwargs): return make_api_call(self, operation_name, kwargs) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -62,34 +59,34 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_NetworkFirewall_Service: def test__get_client__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - networkfirewall = NetworkFirewall(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + networkfirewall = NetworkFirewall(aws_provider) assert ( networkfirewall.regional_clients[AWS_REGION_US_EAST_1].__class__.__name__ == "NetworkFirewall" ) def test__get_service__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - networkfirewall = NetworkFirewall(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + networkfirewall = NetworkFirewall(aws_provider) assert networkfirewall.service == "network-firewall" def test__list_firewalls__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - networkfirewall = NetworkFirewall(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + networkfirewall = NetworkFirewall(aws_provider) assert len(networkfirewall.network_firewalls) == 1 assert networkfirewall.network_firewalls[0].arn == FIREWALL_ARN assert networkfirewall.network_firewalls[0].region == AWS_REGION_US_EAST_1 assert networkfirewall.network_firewalls[0].name == FIREWALL_NAME def test__describe_firewall__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - networkfirewall = NetworkFirewall(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + networkfirewall = NetworkFirewall(aws_provider) assert len(networkfirewall.network_firewalls) == 1 assert networkfirewall.network_firewalls[0].arn == FIREWALL_ARN assert networkfirewall.network_firewalls[0].region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/opensearch/opensearch_service_domains_audit_logging_enabled/opensearch_service_domains_audit_logging_enabled_test.py b/tests/providers/aws/services/opensearch/opensearch_service_domains_audit_logging_enabled/opensearch_service_domains_audit_logging_enabled_test.py index dfb5d82557..25a3f63cef 100644 --- a/tests/providers/aws/services/opensearch/opensearch_service_domains_audit_logging_enabled/opensearch_service_domains_audit_logging_enabled_test.py +++ b/tests/providers/aws/services/opensearch/opensearch_service_domains_audit_logging_enabled/opensearch_service_domains_audit_logging_enabled_test.py @@ -5,10 +5,7 @@ from prowler.providers.aws.services.opensearch.opensearch_service import ( OpenSearchDomain, PublishingLoggingOption, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 domain_name = "test-domain" domain_arn = f"arn:aws:es:us-west-2:{AWS_ACCOUNT_NUMBER}:domain/{domain_name}" diff --git a/tests/providers/aws/services/opensearch/opensearch_service_domains_cloudwatch_logging_enabled/opensearch_service_domains_cloudwatch_logging_enabled_test.py b/tests/providers/aws/services/opensearch/opensearch_service_domains_cloudwatch_logging_enabled/opensearch_service_domains_cloudwatch_logging_enabled_test.py index e177188b00..7001b11798 100644 --- a/tests/providers/aws/services/opensearch/opensearch_service_domains_cloudwatch_logging_enabled/opensearch_service_domains_cloudwatch_logging_enabled_test.py +++ b/tests/providers/aws/services/opensearch/opensearch_service_domains_cloudwatch_logging_enabled/opensearch_service_domains_cloudwatch_logging_enabled_test.py @@ -5,10 +5,7 @@ from prowler.providers.aws.services.opensearch.opensearch_service import ( OpenSearchDomain, PublishingLoggingOption, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 domain_name = "test-domain" domain_arn = f"arn:aws:es:us-west-2:{AWS_ACCOUNT_NUMBER}:domain/{domain_name}" diff --git a/tests/providers/aws/services/opensearch/opensearch_service_domains_encryption_at_rest_enabled/opensearch_service_domains_encryption_at_rest_enabled_test.py b/tests/providers/aws/services/opensearch/opensearch_service_domains_encryption_at_rest_enabled/opensearch_service_domains_encryption_at_rest_enabled_test.py index 3c464df613..e0a485d332 100644 --- a/tests/providers/aws/services/opensearch/opensearch_service_domains_encryption_at_rest_enabled/opensearch_service_domains_encryption_at_rest_enabled_test.py +++ b/tests/providers/aws/services/opensearch/opensearch_service_domains_encryption_at_rest_enabled/opensearch_service_domains_encryption_at_rest_enabled_test.py @@ -4,10 +4,7 @@ from unittest import mock from prowler.providers.aws.services.opensearch.opensearch_service import ( OpenSearchDomain, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 domain_name = "test-domain" domain_arn = f"arn:aws:es:us-west-2:{AWS_ACCOUNT_NUMBER}:domain/{domain_name}" diff --git a/tests/providers/aws/services/opensearch/opensearch_service_domains_https_communications_enforced/opensearch_service_domains_https_communications_enforced_test.py b/tests/providers/aws/services/opensearch/opensearch_service_domains_https_communications_enforced/opensearch_service_domains_https_communications_enforced_test.py index d53ebc0027..0247831629 100644 --- a/tests/providers/aws/services/opensearch/opensearch_service_domains_https_communications_enforced/opensearch_service_domains_https_communications_enforced_test.py +++ b/tests/providers/aws/services/opensearch/opensearch_service_domains_https_communications_enforced/opensearch_service_domains_https_communications_enforced_test.py @@ -4,10 +4,7 @@ from unittest import mock from prowler.providers.aws.services.opensearch.opensearch_service import ( OpenSearchDomain, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 domain_name = "test-domain" domain_arn = f"arn:aws:es:us-west-2:{AWS_ACCOUNT_NUMBER}:domain/{domain_name}" diff --git a/tests/providers/aws/services/opensearch/opensearch_service_domains_internal_user_database_enabled/opensearch_service_domains_internal_user_database_enabled_test.py b/tests/providers/aws/services/opensearch/opensearch_service_domains_internal_user_database_enabled/opensearch_service_domains_internal_user_database_enabled_test.py index 7db5bcc0b2..4da2fd4d5e 100644 --- a/tests/providers/aws/services/opensearch/opensearch_service_domains_internal_user_database_enabled/opensearch_service_domains_internal_user_database_enabled_test.py +++ b/tests/providers/aws/services/opensearch/opensearch_service_domains_internal_user_database_enabled/opensearch_service_domains_internal_user_database_enabled_test.py @@ -4,10 +4,7 @@ from unittest import mock from prowler.providers.aws.services.opensearch.opensearch_service import ( OpenSearchDomain, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 domain_name = "test-domain" domain_arn = f"arn:aws:es:us-west-2:{AWS_ACCOUNT_NUMBER}:domain/{domain_name}" diff --git a/tests/providers/aws/services/opensearch/opensearch_service_domains_node_to_node_encryption_enabled/opensearch_service_domains_node_to_node_encryption_enabled_test.py b/tests/providers/aws/services/opensearch/opensearch_service_domains_node_to_node_encryption_enabled/opensearch_service_domains_node_to_node_encryption_enabled_test.py index 2c5a1e7420..9745cdad99 100644 --- a/tests/providers/aws/services/opensearch/opensearch_service_domains_node_to_node_encryption_enabled/opensearch_service_domains_node_to_node_encryption_enabled_test.py +++ b/tests/providers/aws/services/opensearch/opensearch_service_domains_node_to_node_encryption_enabled/opensearch_service_domains_node_to_node_encryption_enabled_test.py @@ -4,10 +4,7 @@ from unittest import mock from prowler.providers.aws.services.opensearch.opensearch_service import ( OpenSearchDomain, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 domain_name = "test-domain" domain_arn = f"arn:aws:es:us-west-2:{AWS_ACCOUNT_NUMBER}:domain/{domain_name}" diff --git a/tests/providers/aws/services/opensearch/opensearch_service_domains_not_publicly_accessible/opensearch_service_domains_not_publicly_accessible_test.py b/tests/providers/aws/services/opensearch/opensearch_service_domains_not_publicly_accessible/opensearch_service_domains_not_publicly_accessible_test.py index 3be4dd48d4..3bedd0ba84 100644 --- a/tests/providers/aws/services/opensearch/opensearch_service_domains_not_publicly_accessible/opensearch_service_domains_not_publicly_accessible_test.py +++ b/tests/providers/aws/services/opensearch/opensearch_service_domains_not_publicly_accessible/opensearch_service_domains_not_publicly_accessible_test.py @@ -3,10 +3,7 @@ from unittest import mock from prowler.providers.aws.services.opensearch.opensearch_service import ( OpenSearchDomain, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 domain_name = "test-domain" domain_arn = f"arn:aws:es:us-west-2:{AWS_ACCOUNT_NUMBER}:domain/{domain_name}" diff --git a/tests/providers/aws/services/opensearch/opensearch_service_domains_updated_to_the_latest_service_software_version/opensearch_service_domains_updated_to_the_latest_service_software_version_test.py b/tests/providers/aws/services/opensearch/opensearch_service_domains_updated_to_the_latest_service_software_version/opensearch_service_domains_updated_to_the_latest_service_software_version_test.py index c31cb969c7..7c988fb1a9 100644 --- a/tests/providers/aws/services/opensearch/opensearch_service_domains_updated_to_the_latest_service_software_version/opensearch_service_domains_updated_to_the_latest_service_software_version_test.py +++ b/tests/providers/aws/services/opensearch/opensearch_service_domains_updated_to_the_latest_service_software_version/opensearch_service_domains_updated_to_the_latest_service_software_version_test.py @@ -4,10 +4,7 @@ from unittest import mock from prowler.providers.aws.services.opensearch.opensearch_service import ( OpenSearchDomain, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 domain_name = "test-domain" domain_arn = f"arn:aws:es:us-west-2:{AWS_ACCOUNT_NUMBER}:domain/{domain_name}" diff --git a/tests/providers/aws/services/opensearch/opensearch_service_domains_use_cognito_authentication_for_kibana/opensearch_service_domains_use_cognito_authentication_for_kibana_test.py b/tests/providers/aws/services/opensearch/opensearch_service_domains_use_cognito_authentication_for_kibana/opensearch_service_domains_use_cognito_authentication_for_kibana_test.py index 8e9df866a6..56cc1909cd 100644 --- a/tests/providers/aws/services/opensearch/opensearch_service_domains_use_cognito_authentication_for_kibana/opensearch_service_domains_use_cognito_authentication_for_kibana_test.py +++ b/tests/providers/aws/services/opensearch/opensearch_service_domains_use_cognito_authentication_for_kibana/opensearch_service_domains_use_cognito_authentication_for_kibana_test.py @@ -4,10 +4,7 @@ from unittest import mock from prowler.providers.aws.services.opensearch.opensearch_service import ( OpenSearchDomain, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 domain_name = "test-domain" domain_arn = f"arn:aws:es:us-west-2:{AWS_ACCOUNT_NUMBER}:domain/{domain_name}" diff --git a/tests/providers/aws/services/opensearch/opensearch_service_test.py b/tests/providers/aws/services/opensearch/opensearch_service_test.py index 26325f90fb..9e091ee851 100644 --- a/tests/providers/aws/services/opensearch/opensearch_service_test.py +++ b/tests/providers/aws/services/opensearch/opensearch_service_test.py @@ -6,10 +6,10 @@ import botocore from prowler.providers.aws.services.opensearch.opensearch_service import ( OpenSearchService, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) test_domain_name = "test" @@ -91,8 +91,8 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -101,41 +101,41 @@ def mock_generate_regional_clients(service, audit_info): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_OpenSearchService_Service: # Test OpenSearchService Service def test_service(self): - audit_info = set_mocked_aws_audit_info([]) - opensearch = OpenSearchService(audit_info) + aws_provider = set_mocked_aws_provider([]) + opensearch = OpenSearchService(aws_provider) assert opensearch.service == "opensearch" # Test OpenSearchService_ client def test_client(self): - audit_info = set_mocked_aws_audit_info([]) - opensearch = OpenSearchService(audit_info) + aws_provider = set_mocked_aws_provider([]) + opensearch = OpenSearchService(aws_provider) for reg_client in opensearch.regional_clients.values(): assert reg_client.__class__.__name__ == "OpenSearchService" # Test OpenSearchService session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info([]) - opensearch = OpenSearchService(audit_info) + aws_provider = set_mocked_aws_provider([]) + opensearch = OpenSearchService(aws_provider) assert opensearch.session.__class__.__name__ == "Session" # Test OpenSearchService list domains names def test__list_domain_names__(self): - audit_info = set_mocked_aws_audit_info([]) - opensearch = OpenSearchService(audit_info) + aws_provider = set_mocked_aws_provider([]) + opensearch = OpenSearchService(aws_provider) assert len(opensearch.opensearch_domains) == 1 assert opensearch.opensearch_domains[0].name == test_domain_name assert opensearch.opensearch_domains[0].region == AWS_REGION_EU_WEST_1 # Test OpenSearchService describ domain config def test__describe_domain_config__(self): - audit_info = set_mocked_aws_audit_info([]) - opensearch = OpenSearchService(audit_info) + aws_provider = set_mocked_aws_provider([]) + opensearch = OpenSearchService(aws_provider) assert len(opensearch.opensearch_domains) == 1 assert opensearch.opensearch_domains[0].name == test_domain_name assert opensearch.opensearch_domains[0].region == AWS_REGION_EU_WEST_1 @@ -149,8 +149,8 @@ class Test_OpenSearchService_Service: # Test OpenSearchService describ domain def test__describe_domain__(self): - audit_info = set_mocked_aws_audit_info([]) - opensearch = OpenSearchService(audit_info) + aws_provider = set_mocked_aws_provider([]) + opensearch = OpenSearchService(aws_provider) assert len(opensearch.opensearch_domains) == 1 assert opensearch.opensearch_domains[0].name == test_domain_name assert opensearch.opensearch_domains[0].region == AWS_REGION_EU_WEST_1 diff --git a/tests/providers/aws/services/organizations/organizations_account_part_of_organizations/organizations_account_part_of_organizations_test.py b/tests/providers/aws/services/organizations/organizations_account_part_of_organizations/organizations_account_part_of_organizations_test.py index c5875cc40d..7a14758381 100644 --- a/tests/providers/aws/services/organizations/organizations_account_part_of_organizations/organizations_account_part_of_organizations_test.py +++ b/tests/providers/aws/services/organizations/organizations_account_part_of_organizations/organizations_account_part_of_organizations_test.py @@ -7,25 +7,25 @@ from moto import mock_aws from prowler.providers.aws.services.organizations.organizations_service import ( Organizations, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) class Test_organizations_account_part_of_organizations: @mock_aws def test_no_organization(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_account_part_of_organizations.organizations_account_part_of_organizations.organizations_client", - new=Organizations(audit_info), + new=Organizations(aws_provider), ): # Test Check from prowler.providers.aws.services.organizations.organizations_account_part_of_organizations.organizations_account_part_of_organizations import ( @@ -47,19 +47,19 @@ class Test_organizations_account_part_of_organizations: @mock_aws def test_organization(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) # Create Organization conn = client("organizations") response = conn.create_organization() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_account_part_of_organizations.organizations_account_part_of_organizations.organizations_client", - new=Organizations(audit_info), + new=Organizations(aws_provider), ): # Test Check from prowler.providers.aws.services.organizations.organizations_account_part_of_organizations.organizations_account_part_of_organizations import ( diff --git a/tests/providers/aws/services/organizations/organizations_delegated_administrators/organizations_delegated_administrators_test.py b/tests/providers/aws/services/organizations/organizations_delegated_administrators/organizations_delegated_administrators_test.py index 79a1c00314..d9cec555de 100644 --- a/tests/providers/aws/services/organizations/organizations_delegated_administrators/organizations_delegated_administrators_test.py +++ b/tests/providers/aws/services/organizations/organizations_delegated_administrators/organizations_delegated_administrators_test.py @@ -7,24 +7,23 @@ from moto import mock_aws from prowler.providers.aws.services.organizations.organizations_service import ( Organizations, ) -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider class Test_organizations_delegated_administrators: @mock_aws def test_no_organization(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - audit_info.audit_config = {"organizations_trusted_delegated_administrators": []} + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + aws_provider._audit_config = { + "organizations_trusted_delegated_administrators": [] + } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_delegated_administrators.organizations_delegated_administrators.organizations_client", - new=Organizations(audit_info), + new=Organizations(aws_provider), ): # Test Check from prowler.providers.aws.services.organizations.organizations_delegated_administrators.organizations_delegated_administrators import ( @@ -38,20 +37,22 @@ class Test_organizations_delegated_administrators: @mock_aws def test_organization_no_delegations(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - audit_info.audit_config = {"organizations_trusted_delegated_administrators": []} + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + aws_provider._audit_config = { + "organizations_trusted_delegated_administrators": [] + } # Create Organization conn = client("organizations", region_name=AWS_REGION_EU_WEST_1) response = conn.create_organization() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_delegated_administrators.organizations_delegated_administrators.organizations_client", - new=Organizations(audit_info), + new=Organizations(aws_provider), ): # Test Check from prowler.providers.aws.services.organizations.organizations_delegated_administrators.organizations_delegated_administrators import ( @@ -73,7 +74,7 @@ class Test_organizations_delegated_administrators: @mock_aws def test_organization_trusted_delegated(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) # Create Organization conn = client("organizations", region_name=AWS_REGION_EU_WEST_1) @@ -90,19 +91,19 @@ class Test_organizations_delegated_administrators: ) # Set config variable - audit_info.audit_config = { + aws_provider._audit_config = { "organizations_trusted_delegated_administrators": [ account["CreateAccountStatus"]["AccountId"] ] } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_delegated_administrators.organizations_delegated_administrators.organizations_client", - new=Organizations(audit_info), + new=Organizations(aws_provider), ): # Test Check from prowler.providers.aws.services.organizations.organizations_delegated_administrators.organizations_delegated_administrators import ( @@ -124,7 +125,7 @@ class Test_organizations_delegated_administrators: @mock_aws def test_organization_untrusted_delegated(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) # Create Organization conn = client("organizations", region_name=AWS_REGION_EU_WEST_1) @@ -141,15 +142,17 @@ class Test_organizations_delegated_administrators: ) # Set config variable - audit_info.audit_config = {"organizations_trusted_delegated_administrators": []} + aws_provider._audit_config = { + "organizations_trusted_delegated_administrators": [] + } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_delegated_administrators.organizations_delegated_administrators.organizations_client", - new=Organizations(audit_info), + new=Organizations(aws_provider), ): # Test Check from prowler.providers.aws.services.organizations.organizations_delegated_administrators.organizations_delegated_administrators import ( diff --git a/tests/providers/aws/services/organizations/organizations_scp_check_deny_regions/organizations_scp_check_deny_regions_test.py b/tests/providers/aws/services/organizations/organizations_scp_check_deny_regions/organizations_scp_check_deny_regions_test.py index 0a093f6489..3a877d54a3 100644 --- a/tests/providers/aws/services/organizations/organizations_scp_check_deny_regions/organizations_scp_check_deny_regions_test.py +++ b/tests/providers/aws/services/organizations/organizations_scp_check_deny_regions/organizations_scp_check_deny_regions_test.py @@ -7,11 +7,11 @@ from moto import mock_aws from prowler.providers.aws.services.organizations.organizations_service import ( Organizations, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_REGION_EU_CENTRAL_1, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -22,17 +22,17 @@ def scp_restrict_regions_with_deny(): class Test_organizations_scp_check_deny_regions: @mock_aws def test_no_organization(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - audit_info.audit_config = { + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + aws_provider._audit_config = { "organizations_enabled_regions": [AWS_REGION_EU_WEST_1] } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_scp_check_deny_regions.organizations_scp_check_deny_regions.organizations_client", - new=Organizations(audit_info), + new=Organizations(aws_provider), ): # Test Check from prowler.providers.aws.services.organizations.organizations_scp_check_deny_regions.organizations_scp_check_deny_regions import ( @@ -54,8 +54,8 @@ class Test_organizations_scp_check_deny_regions: @mock_aws def test_organization_without_scp_deny_regions(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - audit_info.audit_config = { + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + aws_provider._audit_config = { "organizations_enabled_regions": [AWS_REGION_EU_WEST_1] } @@ -64,12 +64,12 @@ class Test_organizations_scp_check_deny_regions: response = conn.create_organization() with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_scp_check_deny_regions.organizations_scp_check_deny_regions.organizations_client", - new=Organizations(audit_info), + new=Organizations(aws_provider), ): # Test Check from prowler.providers.aws.services.organizations.organizations_scp_check_deny_regions.organizations_scp_check_deny_regions import ( @@ -91,7 +91,7 @@ class Test_organizations_scp_check_deny_regions: @mock_aws def test_organization_with_scp_deny_regions_valid(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) # Create Organization conn = client("organizations", region_name=AWS_REGION_EU_WEST_1) @@ -105,15 +105,15 @@ class Test_organizations_scp_check_deny_regions: ) # Set config variable - audit_info.audit_config = {"organizations_enabled_regions": ["eu-central-1"]} + aws_provider._audit_config = {"organizations_enabled_regions": ["eu-central-1"]} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_scp_check_deny_regions.organizations_scp_check_deny_regions.organizations_client", - new=Organizations(audit_info), + new=Organizations(aws_provider), ): # Test Check from prowler.providers.aws.services.organizations.organizations_scp_check_deny_regions.organizations_scp_check_deny_regions import ( @@ -135,7 +135,7 @@ class Test_organizations_scp_check_deny_regions: @mock_aws def test_organization_with_scp_deny_regions_not_valid(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) # Create Organization conn = client("organizations", region_name=AWS_REGION_EU_WEST_1) @@ -149,15 +149,15 @@ class Test_organizations_scp_check_deny_regions: ) # Set config variable - audit_info.audit_config = {"organizations_enabled_regions": ["us-east-1"]} + aws_provider._audit_config = {"organizations_enabled_regions": ["us-east-1"]} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_scp_check_deny_regions.organizations_scp_check_deny_regions.organizations_client", - new=Organizations(audit_info), + new=Organizations(aws_provider), ): # Test Check from prowler.providers.aws.services.organizations.organizations_scp_check_deny_regions.organizations_scp_check_deny_regions import ( @@ -179,8 +179,8 @@ class Test_organizations_scp_check_deny_regions: @mock_aws def test_organization_with_scp_deny_all_regions_valid(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - audit_info.audit_config = { + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + aws_provider._audit_config = { "organizations_enabled_regions": [ AWS_REGION_EU_WEST_1, AWS_REGION_EU_CENTRAL_1, @@ -198,15 +198,15 @@ class Test_organizations_scp_check_deny_regions: ) # Set config variable - audit_info.audit_config = {"organizations_enabled_regions": ["eu-central-1"]} + aws_provider._audit_config = {"organizations_enabled_regions": ["eu-central-1"]} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_scp_check_deny_regions.organizations_scp_check_deny_regions.organizations_client", - new=Organizations(audit_info), + new=Organizations(aws_provider), ): # Test Check from prowler.providers.aws.services.organizations.organizations_scp_check_deny_regions.organizations_scp_check_deny_regions import ( diff --git a/tests/providers/aws/services/organizations/organizations_service_test.py b/tests/providers/aws/services/organizations/organizations_service_test.py index 58bfcb327f..6f6383b56a 100644 --- a/tests/providers/aws/services/organizations/organizations_service_test.py +++ b/tests/providers/aws/services/organizations/organizations_service_test.py @@ -6,10 +6,7 @@ from moto import mock_aws from prowler.providers.aws.services.organizations.organizations_service import ( Organizations, ) -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider def scp_restrict_regions_with_deny(): @@ -19,8 +16,8 @@ def scp_restrict_regions_with_deny(): class Test_Organizations_Service: @mock_aws def test_service(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - organizations = Organizations(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + organizations = Organizations(aws_provider) assert organizations.service == "organizations" @mock_aws @@ -29,8 +26,8 @@ class Test_Organizations_Service: conn = client("organizations", region_name=AWS_REGION_EU_WEST_1) response = conn.create_organization() # Mock - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - organizations = Organizations(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + organizations = Organizations(aws_provider) # Tests assert len(organizations.organizations) == 1 assert organizations.organizations[0].arn == response["Organization"]["Arn"] @@ -54,8 +51,8 @@ class Test_Organizations_Service: Type="SERVICE_CONTROL_POLICY", ) # Mock - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - organizations = Organizations(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + organizations = Organizations(aws_provider) # Tests for policy in organizations.policies: if policy.arn == response["Policy"]["PolicySummary"]["Arn"]: diff --git a/tests/providers/aws/services/organizations/organizations_tags_policies_enabled_and_attached/organizations_tags_policies_enabled_and_attached_test.py b/tests/providers/aws/services/organizations/organizations_tags_policies_enabled_and_attached/organizations_tags_policies_enabled_and_attached_test.py index c035bfa988..5f58f6c0ed 100644 --- a/tests/providers/aws/services/organizations/organizations_tags_policies_enabled_and_attached/organizations_tags_policies_enabled_and_attached_test.py +++ b/tests/providers/aws/services/organizations/organizations_tags_policies_enabled_and_attached/organizations_tags_policies_enabled_and_attached_test.py @@ -4,10 +4,10 @@ from prowler.providers.aws.services.organizations.organizations_service import ( Organization, Policy, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Moto: NotImplementedError: The TAG_POLICY policy type has not been implemented @@ -27,11 +27,11 @@ class Test_organizations_tags_policies_enabled_and_attached: ) ] - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached.organizations_client", @@ -78,11 +78,11 @@ class Test_organizations_tags_policies_enabled_and_attached: ) ] - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached.organizations_client", @@ -132,11 +132,11 @@ class Test_organizations_tags_policies_enabled_and_attached: ) ] - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.organizations.organizations_tags_policies_enabled_and_attached.organizations_tags_policies_enabled_and_attached.organizations_client", diff --git a/tests/providers/aws/services/rds/rds_instance_backup_enabled/rds_instance_backup_enabled_test.py b/tests/providers/aws/services/rds/rds_instance_backup_enabled/rds_instance_backup_enabled_test.py index fd2b9b191b..653fa8872c 100644 --- a/tests/providers/aws/services/rds/rds_instance_backup_enabled/rds_instance_backup_enabled_test.py +++ b/tests/providers/aws/services/rds/rds_instance_backup_enabled/rds_instance_backup_enabled_test.py @@ -5,10 +5,10 @@ import botocore from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) make_api_call = botocore.client.BaseClient._make_api_call @@ -35,15 +35,15 @@ class Test_rds_instance_backup_enabled: def test_rds_no_instances(self): from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_backup_enabled.rds_instance_backup_enabled.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_backup_enabled.rds_instance_backup_enabled import ( @@ -68,15 +68,15 @@ class Test_rds_instance_backup_enabled: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_backup_enabled.rds_instance_backup_enabled.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ) as service_client: # Test Check from prowler.providers.aws.services.rds.rds_instance_backup_enabled.rds_instance_backup_enabled import ( @@ -115,15 +115,15 @@ class Test_rds_instance_backup_enabled: ) from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_backup_enabled.rds_instance_backup_enabled.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_backup_enabled.rds_instance_backup_enabled import ( diff --git a/tests/providers/aws/services/rds/rds_instance_deletion_protection/rds_instance_deletion_protection_test.py b/tests/providers/aws/services/rds/rds_instance_deletion_protection/rds_instance_deletion_protection_test.py index 660d3382ee..2841018e20 100644 --- a/tests/providers/aws/services/rds/rds_instance_deletion_protection/rds_instance_deletion_protection_test.py +++ b/tests/providers/aws/services/rds/rds_instance_deletion_protection/rds_instance_deletion_protection_test.py @@ -5,10 +5,10 @@ import botocore from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) make_api_call = botocore.client.BaseClient._make_api_call @@ -35,15 +35,15 @@ class Test_rds_instance_deletion_protection: def test_rds_no_instances(self): from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_deletion_protection.rds_instance_deletion_protection.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_deletion_protection.rds_instance_deletion_protection import ( @@ -68,14 +68,14 @@ class Test_rds_instance_deletion_protection: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_deletion_protection.rds_instance_deletion_protection.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_deletion_protection.rds_instance_deletion_protection import ( @@ -113,15 +113,15 @@ class Test_rds_instance_deletion_protection: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_deletion_protection.rds_instance_deletion_protection.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_deletion_protection.rds_instance_deletion_protection import ( @@ -171,15 +171,15 @@ class Test_rds_instance_deletion_protection: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_deletion_protection.rds_instance_deletion_protection.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_deletion_protection.rds_instance_deletion_protection import ( @@ -229,15 +229,15 @@ class Test_rds_instance_deletion_protection: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_deletion_protection.rds_instance_deletion_protection.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_deletion_protection.rds_instance_deletion_protection import ( diff --git a/tests/providers/aws/services/rds/rds_instance_deprecated_engine_version/rds_instance_deprecated_engine_version_test.py b/tests/providers/aws/services/rds/rds_instance_deprecated_engine_version/rds_instance_deprecated_engine_version_test.py index 079b52d117..0e1500de75 100644 --- a/tests/providers/aws/services/rds/rds_instance_deprecated_engine_version/rds_instance_deprecated_engine_version_test.py +++ b/tests/providers/aws/services/rds/rds_instance_deprecated_engine_version/rds_instance_deprecated_engine_version_test.py @@ -5,10 +5,10 @@ import botocore from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) make_api_call = botocore.client.BaseClient._make_api_call @@ -35,15 +35,15 @@ class Test_rds_instance_deprecated_engine_version: def test_rds_no_instances(self): from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_deprecated_engine_version.rds_instance_deprecated_engine_version.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_deprecated_engine_version.rds_instance_deprecated_engine_version import ( @@ -69,15 +69,15 @@ class Test_rds_instance_deprecated_engine_version: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_deprecated_engine_version.rds_instance_deprecated_engine_version.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_deprecated_engine_version.rds_instance_deprecated_engine_version import ( @@ -115,15 +115,15 @@ class Test_rds_instance_deprecated_engine_version: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_deprecated_engine_version.rds_instance_deprecated_engine_version.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_deprecated_engine_version.rds_instance_deprecated_engine_version import ( diff --git a/tests/providers/aws/services/rds/rds_instance_enhanced_monitoring_enabled/rds_instance_enhanced_monitoring_enabled_test.py b/tests/providers/aws/services/rds/rds_instance_enhanced_monitoring_enabled/rds_instance_enhanced_monitoring_enabled_test.py index 225d40da69..39f3ec5f25 100644 --- a/tests/providers/aws/services/rds/rds_instance_enhanced_monitoring_enabled/rds_instance_enhanced_monitoring_enabled_test.py +++ b/tests/providers/aws/services/rds/rds_instance_enhanced_monitoring_enabled/rds_instance_enhanced_monitoring_enabled_test.py @@ -5,10 +5,10 @@ import botocore from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) make_api_call = botocore.client.BaseClient._make_api_call @@ -35,15 +35,15 @@ class Test_rds_instance_enhanced_monitoring_enabled: def test_rds_no_instances(self): from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_enhanced_monitoring_enabled.rds_instance_enhanced_monitoring_enabled.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_enhanced_monitoring_enabled.rds_instance_enhanced_monitoring_enabled import ( @@ -68,15 +68,15 @@ class Test_rds_instance_enhanced_monitoring_enabled: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_enhanced_monitoring_enabled.rds_instance_enhanced_monitoring_enabled.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_enhanced_monitoring_enabled.rds_instance_enhanced_monitoring_enabled import ( @@ -113,15 +113,15 @@ class Test_rds_instance_enhanced_monitoring_enabled: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_enhanced_monitoring_enabled.rds_instance_enhanced_monitoring_enabled.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ) as service_client: # Test Check from prowler.providers.aws.services.rds.rds_instance_enhanced_monitoring_enabled.rds_instance_enhanced_monitoring_enabled import ( diff --git a/tests/providers/aws/services/rds/rds_instance_integration_cloudwatch_logs/rds_instance_integration_cloudwatch_logs_test.py b/tests/providers/aws/services/rds/rds_instance_integration_cloudwatch_logs/rds_instance_integration_cloudwatch_logs_test.py index 6ee19c0728..fe18e96758 100644 --- a/tests/providers/aws/services/rds/rds_instance_integration_cloudwatch_logs/rds_instance_integration_cloudwatch_logs_test.py +++ b/tests/providers/aws/services/rds/rds_instance_integration_cloudwatch_logs/rds_instance_integration_cloudwatch_logs_test.py @@ -5,10 +5,10 @@ import botocore from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) make_api_call = botocore.client.BaseClient._make_api_call @@ -35,15 +35,15 @@ class Test_rds_instance_integration_cloudwatch_logs: def test_rds_no_instances(self): from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_integration_cloudwatch_logs.rds_instance_integration_cloudwatch_logs.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_integration_cloudwatch_logs.rds_instance_integration_cloudwatch_logs import ( @@ -68,15 +68,15 @@ class Test_rds_instance_integration_cloudwatch_logs: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_integration_cloudwatch_logs.rds_instance_integration_cloudwatch_logs.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_integration_cloudwatch_logs.rds_instance_integration_cloudwatch_logs import ( @@ -114,15 +114,15 @@ class Test_rds_instance_integration_cloudwatch_logs: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_integration_cloudwatch_logs.rds_instance_integration_cloudwatch_logs.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_integration_cloudwatch_logs.rds_instance_integration_cloudwatch_logs import ( diff --git a/tests/providers/aws/services/rds/rds_instance_minor_version_upgrade_enabled/rds_instance_minor_version_upgrade_enabled_test.py b/tests/providers/aws/services/rds/rds_instance_minor_version_upgrade_enabled/rds_instance_minor_version_upgrade_enabled_test.py index 658a299e54..d91faca315 100644 --- a/tests/providers/aws/services/rds/rds_instance_minor_version_upgrade_enabled/rds_instance_minor_version_upgrade_enabled_test.py +++ b/tests/providers/aws/services/rds/rds_instance_minor_version_upgrade_enabled/rds_instance_minor_version_upgrade_enabled_test.py @@ -5,10 +5,10 @@ import botocore from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) make_api_call = botocore.client.BaseClient._make_api_call @@ -35,15 +35,15 @@ class Test_rds_instance_minor_version_upgrade_enabled: def test_rds_no_instances(self): from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_minor_version_upgrade_enabled.rds_instance_minor_version_upgrade_enabled.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_minor_version_upgrade_enabled.rds_instance_minor_version_upgrade_enabled import ( @@ -68,15 +68,15 @@ class Test_rds_instance_minor_version_upgrade_enabled: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_minor_version_upgrade_enabled.rds_instance_minor_version_upgrade_enabled.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_minor_version_upgrade_enabled.rds_instance_minor_version_upgrade_enabled import ( @@ -114,15 +114,15 @@ class Test_rds_instance_minor_version_upgrade_enabled: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_minor_version_upgrade_enabled.rds_instance_minor_version_upgrade_enabled.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_minor_version_upgrade_enabled.rds_instance_minor_version_upgrade_enabled import ( diff --git a/tests/providers/aws/services/rds/rds_instance_multi_az/rds_instance_multi_az_test.py b/tests/providers/aws/services/rds/rds_instance_multi_az/rds_instance_multi_az_test.py index c0e9fcd989..4a1c6f4e36 100644 --- a/tests/providers/aws/services/rds/rds_instance_multi_az/rds_instance_multi_az_test.py +++ b/tests/providers/aws/services/rds/rds_instance_multi_az/rds_instance_multi_az_test.py @@ -6,10 +6,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.rds.rds_service import DBCluster, DBInstance -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) make_api_call = botocore.client.BaseClient._make_api_call @@ -36,15 +36,15 @@ class Test_rds_instance_multi_az: def test_rds_no_instances(self): from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az import ( @@ -68,15 +68,15 @@ class Test_rds_instance_multi_az: ) from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az import ( @@ -114,15 +114,15 @@ class Test_rds_instance_multi_az: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az import ( @@ -191,11 +191,11 @@ class Test_rds_instance_multi_az: ) ] - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az.rds_client", @@ -268,11 +268,11 @@ class Test_rds_instance_multi_az: ) ] - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_multi_az.rds_instance_multi_az.rds_client", diff --git a/tests/providers/aws/services/rds/rds_instance_no_public_access/rds_instance_no_public_access_test.py b/tests/providers/aws/services/rds/rds_instance_no_public_access/rds_instance_no_public_access_test.py index a48236633b..b557542b18 100644 --- a/tests/providers/aws/services/rds/rds_instance_no_public_access/rds_instance_no_public_access_test.py +++ b/tests/providers/aws/services/rds/rds_instance_no_public_access/rds_instance_no_public_access_test.py @@ -5,10 +5,10 @@ import botocore from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) make_api_call = botocore.client.BaseClient._make_api_call @@ -35,15 +35,15 @@ class Test_rds_instance_no_public_access: def test_rds_no_instances(self): from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_no_public_access.rds_instance_no_public_access.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_no_public_access.rds_instance_no_public_access import ( @@ -68,15 +68,15 @@ class Test_rds_instance_no_public_access: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_no_public_access.rds_instance_no_public_access.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_no_public_access.rds_instance_no_public_access import ( @@ -114,15 +114,15 @@ class Test_rds_instance_no_public_access: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_no_public_access.rds_instance_no_public_access.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_no_public_access.rds_instance_no_public_access import ( @@ -177,21 +177,21 @@ class Test_rds_instance_no_public_access: from prowler.providers.aws.services.ec2.ec2_service import EC2 from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - audit_info.audit_metadata.expected_checks = [ + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + aws_provider.audit_metadata.expected_checks = [ "ec2_securitygroup_allow_ingress_from_internet_to_any_port" ] with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_no_public_access.rds_instance_no_public_access.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ), mock.patch( "prowler.providers.aws.services.rds.rds_instance_no_public_access.rds_instance_no_public_access.ec2_client", - new=EC2(audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_no_public_access.rds_instance_no_public_access import ( @@ -244,15 +244,15 @@ class Test_rds_instance_no_public_access: ) from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_no_public_access.rds_instance_no_public_access.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_no_public_access.rds_instance_no_public_access import ( diff --git a/tests/providers/aws/services/rds/rds_instance_storage_encrypted/rds_instance_storage_encrypted_test.py b/tests/providers/aws/services/rds/rds_instance_storage_encrypted/rds_instance_storage_encrypted_test.py index 20be681d84..bbd3014f4b 100644 --- a/tests/providers/aws/services/rds/rds_instance_storage_encrypted/rds_instance_storage_encrypted_test.py +++ b/tests/providers/aws/services/rds/rds_instance_storage_encrypted/rds_instance_storage_encrypted_test.py @@ -5,10 +5,10 @@ import botocore from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) make_api_call = botocore.client.BaseClient._make_api_call @@ -35,15 +35,15 @@ class Test_rds_instance_storage_encrypted: def test_rds_no_instances(self): from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_storage_encrypted.rds_instance_storage_encrypted.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_storage_encrypted.rds_instance_storage_encrypted import ( @@ -67,15 +67,15 @@ class Test_rds_instance_storage_encrypted: ) from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_storage_encrypted.rds_instance_storage_encrypted.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_storage_encrypted.rds_instance_storage_encrypted import ( @@ -113,15 +113,15 @@ class Test_rds_instance_storage_encrypted: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_storage_encrypted.rds_instance_storage_encrypted.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_storage_encrypted.rds_instance_storage_encrypted import ( diff --git a/tests/providers/aws/services/rds/rds_instance_transport_encrypted/rds_instance_transport_encrypted_test.py b/tests/providers/aws/services/rds/rds_instance_transport_encrypted/rds_instance_transport_encrypted_test.py index 49b579aca1..ceeb5f4fad 100644 --- a/tests/providers/aws/services/rds/rds_instance_transport_encrypted/rds_instance_transport_encrypted_test.py +++ b/tests/providers/aws/services/rds/rds_instance_transport_encrypted/rds_instance_transport_encrypted_test.py @@ -5,10 +5,10 @@ import botocore from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) make_api_call = botocore.client.BaseClient._make_api_call @@ -35,15 +35,15 @@ class Test_rds_instance_transport_encrypted: def test_rds_no_instances(self): from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_transport_encrypted.rds_instance_transport_encrypted.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_transport_encrypted.rds_instance_transport_encrypted import ( @@ -73,15 +73,15 @@ class Test_rds_instance_transport_encrypted: ) from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_transport_encrypted.rds_instance_transport_encrypted.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_transport_encrypted.rds_instance_transport_encrypted import ( @@ -123,15 +123,15 @@ class Test_rds_instance_transport_encrypted: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_transport_encrypted.rds_instance_transport_encrypted.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_transport_encrypted.rds_instance_transport_encrypted import ( @@ -185,15 +185,15 @@ class Test_rds_instance_transport_encrypted: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_instance_transport_encrypted.rds_instance_transport_encrypted.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_instance_transport_encrypted.rds_instance_transport_encrypted import ( diff --git a/tests/providers/aws/services/rds/rds_service_test.py b/tests/providers/aws/services/rds/rds_service_test.py index 7a886555b4..0bd3618167 100644 --- a/tests/providers/aws/services/rds/rds_service_test.py +++ b/tests/providers/aws/services/rds/rds_service_test.py @@ -5,10 +5,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.rds.rds_service import RDS -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) make_api_call = botocore.client.BaseClient._make_api_call @@ -36,16 +36,16 @@ class Test_RDS_Service: @mock_aws def test_service(self): # Dynamo client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - rds = RDS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + rds = RDS(aws_provider) assert rds.service == "rds" # Test Dynamo Client @mock_aws def test_client(self): # Dynamo client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - rds = RDS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + rds = RDS(aws_provider) for regional_client in rds.regional_clients.values(): assert regional_client.__class__.__name__ == "RDS" @@ -53,16 +53,16 @@ class Test_RDS_Service: @mock_aws def test__get_session__(self): # Dynamo client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - rds = RDS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + rds = RDS(aws_provider) assert rds.session.__class__.__name__ == "Session" # Test Dynamo Session @mock_aws def test_audited_account(self): # Dynamo client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - rds = RDS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + rds = RDS(aws_provider) assert rds.audited_account == AWS_ACCOUNT_NUMBER # Test RDS Describe DB Instances @@ -93,8 +93,8 @@ class Test_RDS_Service: ], ) # RDS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - rds = RDS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + rds = RDS(aws_provider) assert len(rds.db_instances) == 1 assert rds.db_instances[0].id == "db-master-1" assert rds.db_instances[0].region == AWS_REGION_US_EAST_1 @@ -143,8 +143,8 @@ class Test_RDS_Service: ], ) # RDS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - rds = RDS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + rds = RDS(aws_provider) assert len(rds.db_instances) == 1 assert rds.db_instances[0].id == "db-master-1" assert rds.db_instances[0].region == AWS_REGION_US_EAST_1 @@ -168,8 +168,8 @@ class Test_RDS_Service: DBInstanceIdentifier="db-primary-1", DBSnapshotIdentifier="snapshot-1" ) # RDS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - rds = RDS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + rds = RDS(aws_provider) assert len(rds.db_snapshots) == 1 assert rds.db_snapshots[0].id == "snapshot-1" assert rds.db_snapshots[0].instance_id == "db-primary-1" @@ -205,8 +205,8 @@ class Test_RDS_Service: ], ) # RDS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - rds = RDS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + rds = RDS(aws_provider) db_cluster_arn = f"arn:aws:rds:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:cluster:{cluster_id}" @@ -248,8 +248,8 @@ class Test_RDS_Service: DBClusterIdentifier="db-primary-1", DBClusterSnapshotIdentifier="snapshot-1" ) # RDS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - rds = RDS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + rds = RDS(aws_provider) assert len(rds.db_cluster_snapshots) == 1 assert rds.db_cluster_snapshots[0].id == "snapshot-1" assert rds.db_cluster_snapshots[0].cluster_id == "db-primary-1" @@ -260,8 +260,8 @@ class Test_RDS_Service: @mock_aws def test__describe_db_engine_versions__(self): # RDS client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - rds = RDS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + rds = RDS(aws_provider) assert "mysql" in rds.db_engines[AWS_REGION_US_EAST_1] assert rds.db_engines[AWS_REGION_US_EAST_1]["mysql"].engine_versions == [ "8.0.32" diff --git a/tests/providers/aws/services/rds/rds_snapshots_public_access/rds_snapshots_public_access_test.py b/tests/providers/aws/services/rds/rds_snapshots_public_access/rds_snapshots_public_access_test.py index 202b3e9dac..7216820775 100644 --- a/tests/providers/aws/services/rds/rds_snapshots_public_access/rds_snapshots_public_access_test.py +++ b/tests/providers/aws/services/rds/rds_snapshots_public_access/rds_snapshots_public_access_test.py @@ -5,10 +5,10 @@ import botocore from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) make_api_call = botocore.client.BaseClient._make_api_call @@ -44,15 +44,15 @@ class Test_rds_snapshots_public_access: def test_rds_no_snapshots(self): from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_snapshots_public_access.rds_snapshots_public_access.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_snapshots_public_access.rds_snapshots_public_access import ( @@ -82,15 +82,15 @@ class Test_rds_snapshots_public_access: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_snapshots_public_access.rds_snapshots_public_access.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_snapshots_public_access.rds_snapshots_public_access import ( @@ -126,15 +126,15 @@ class Test_rds_snapshots_public_access: from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_snapshots_public_access.rds_snapshots_public_access.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ) as service_client: # Test Check from prowler.providers.aws.services.rds.rds_snapshots_public_access.rds_snapshots_public_access import ( @@ -177,15 +177,15 @@ class Test_rds_snapshots_public_access: ) from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_snapshots_public_access.rds_snapshots_public_access.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ): # Test Check from prowler.providers.aws.services.rds.rds_snapshots_public_access.rds_snapshots_public_access import ( @@ -227,15 +227,15 @@ class Test_rds_snapshots_public_access: ) from prowler.providers.aws.services.rds.rds_service import RDS - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.rds.rds_snapshots_public_access.rds_snapshots_public_access.rds_client", - new=RDS(audit_info), + new=RDS(aws_provider), ) as service_client: # Test Check from prowler.providers.aws.services.rds.rds_snapshots_public_access.rds_snapshots_public_access import ( diff --git a/tests/providers/aws/services/redshift/redshift_cluster_audit_logging/redshift_cluster_audit_logging_test.py b/tests/providers/aws/services/redshift/redshift_cluster_audit_logging/redshift_cluster_audit_logging_test.py index 2cc81ab0a5..0ea26f6bde 100644 --- a/tests/providers/aws/services/redshift/redshift_cluster_audit_logging/redshift_cluster_audit_logging_test.py +++ b/tests/providers/aws/services/redshift/redshift_cluster_audit_logging/redshift_cluster_audit_logging_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.redshift.redshift_service import Cluster -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 CLUSTER_ID = str(uuid4()) CLUSTER_ARN = ( diff --git a/tests/providers/aws/services/redshift/redshift_cluster_automated_snapshot/redshift_cluster_automated_snapshot_test.py b/tests/providers/aws/services/redshift/redshift_cluster_automated_snapshot/redshift_cluster_automated_snapshot_test.py index 1ccd61e10b..f21bc012dd 100644 --- a/tests/providers/aws/services/redshift/redshift_cluster_automated_snapshot/redshift_cluster_automated_snapshot_test.py +++ b/tests/providers/aws/services/redshift/redshift_cluster_automated_snapshot/redshift_cluster_automated_snapshot_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.redshift.redshift_service import Cluster -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 CLUSTER_ID = str(uuid4()) CLUSTER_ARN = ( diff --git a/tests/providers/aws/services/redshift/redshift_cluster_automatic_upgrades/redshift_cluster_automatic_upgrades_test.py b/tests/providers/aws/services/redshift/redshift_cluster_automatic_upgrades/redshift_cluster_automatic_upgrades_test.py index 1fa9f2f4df..d6080f7266 100644 --- a/tests/providers/aws/services/redshift/redshift_cluster_automatic_upgrades/redshift_cluster_automatic_upgrades_test.py +++ b/tests/providers/aws/services/redshift/redshift_cluster_automatic_upgrades/redshift_cluster_automatic_upgrades_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.redshift.redshift_service import Cluster -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 CLUSTER_ID = str(uuid4()) CLUSTER_ARN = ( diff --git a/tests/providers/aws/services/redshift/redshift_cluster_public_access/redshift_cluster_public_access_test.py b/tests/providers/aws/services/redshift/redshift_cluster_public_access/redshift_cluster_public_access_test.py index 5b6cb363bd..be0cb97df0 100644 --- a/tests/providers/aws/services/redshift/redshift_cluster_public_access/redshift_cluster_public_access_test.py +++ b/tests/providers/aws/services/redshift/redshift_cluster_public_access/redshift_cluster_public_access_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.redshift.redshift_service import Cluster -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 CLUSTER_ID = str(uuid4()) CLUSTER_ARN = ( diff --git a/tests/providers/aws/services/redshift/redshift_service_test.py b/tests/providers/aws/services/redshift/redshift_service_test.py index 17007f2f04..133a0a35e7 100644 --- a/tests/providers/aws/services/redshift/redshift_service_test.py +++ b/tests/providers/aws/services/redshift/redshift_service_test.py @@ -6,10 +6,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.redshift.redshift_service import Redshift -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) topic_name = "test-topic" @@ -46,8 +46,8 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -56,27 +56,27 @@ def mock_generate_regional_clients(service, audit_info): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_Redshift_Service: # Test Redshift Service def test_service(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - redshift = Redshift(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + redshift = Redshift(aws_provider) assert redshift.service == "redshift" # Test Redshift client def test_client(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - redshift = Redshift(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + redshift = Redshift(aws_provider) for reg_client in redshift.regional_clients.values(): assert reg_client.__class__.__name__ == "Redshift" # Test Redshift session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - redshift = Redshift(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + redshift = Redshift(aws_provider) assert redshift.session.__class__.__name__ == "Session" @mock_aws @@ -94,8 +94,8 @@ class Test_Redshift_Service: {"Key": "test", "Value": "test"}, ], ) - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - redshift = Redshift(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + redshift = Redshift(aws_provider) assert len(redshift.clusters) == 1 assert redshift.clusters[0].id == cluster_id @@ -125,8 +125,8 @@ class Test_Redshift_Service: MasterUserPassword="password", PubliclyAccessible=True, ) - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - redshift = Redshift(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + redshift = Redshift(aws_provider) assert len(redshift.clusters) == 1 assert redshift.clusters[0].id == cluster_id @@ -155,8 +155,8 @@ class Test_Redshift_Service: MasterUserPassword="password", PubliclyAccessible=True, ) - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - redshift = Redshift(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + redshift = Redshift(aws_provider) assert len(redshift.clusters) == 1 assert redshift.clusters[0].id == cluster_id 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 0abd945b9d..51e5df9ca3 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 @@ -3,10 +3,7 @@ from unittest import mock from prowler.providers.aws.services.resourceexplorer2.resourceexplorer2_service import ( Indexes, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_US_EAST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1 INDEX_ARN = "arn:aws:resource-explorer-2:ap-south-1:123456789012:index/123456-2896-4fe8-93d2-15ec137e5c47" INDEX_REGION = "us-east-1" diff --git a/tests/providers/aws/services/resourceexplorer2/resourceexplorer2_service_test.py b/tests/providers/aws/services/resourceexplorer2/resourceexplorer2_service_test.py index 4cd1ddb83f..ead3d0d6a7 100644 --- a/tests/providers/aws/services/resourceexplorer2/resourceexplorer2_service_test.py +++ b/tests/providers/aws/services/resourceexplorer2/resourceexplorer2_service_test.py @@ -5,10 +5,7 @@ import botocore from prowler.providers.aws.services.resourceexplorer2.resourceexplorer2_service import ( ResourceExplorer2, ) -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider INDEX_ARN = "arn:aws:resource-explorer-2:ap-south-1:123456789012:index/123456-2896-4fe8-93d2-15ec137e5c47" INDEX_REGION = "us-east-1" @@ -30,8 +27,8 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -40,26 +37,26 @@ def mock_generate_regional_clients(service, audit_info): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_ResourceExplorer2_Service: def test__get_client__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - resourceeplorer2 = ResourceExplorer2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + resourceeplorer2 = ResourceExplorer2(aws_provider) assert ( resourceeplorer2.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ == "ResourceExplorer" ) def test__get_service__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - resourceeplorer2 = ResourceExplorer2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + resourceeplorer2 = ResourceExplorer2(aws_provider) assert resourceeplorer2.service == "resource-explorer-2" def test__list_indexes__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - resourceeplorer2 = ResourceExplorer2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + resourceeplorer2 = ResourceExplorer2(aws_provider) assert len(resourceeplorer2.indexes) == 1 assert resourceeplorer2.indexes[0].arn == INDEX_ARN assert resourceeplorer2.indexes[0].region == INDEX_REGION diff --git a/tests/providers/aws/services/route53/route53_dangling_ip_subdomain_takeover/route53_dangling_ip_subdomain_takeover_test.py b/tests/providers/aws/services/route53/route53_dangling_ip_subdomain_takeover/route53_dangling_ip_subdomain_takeover_test.py index f76e0a9d3c..93f88718cd 100644 --- a/tests/providers/aws/services/route53/route53_dangling_ip_subdomain_takeover/route53_dangling_ip_subdomain_takeover_test.py +++ b/tests/providers/aws/services/route53/route53_dangling_ip_subdomain_takeover/route53_dangling_ip_subdomain_takeover_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_route53_dangling_ip_subdomain_takeover: @@ -16,19 +13,19 @@ class Test_route53_dangling_ip_subdomain_takeover: from prowler.providers.aws.services.ec2.ec2_service import EC2 from prowler.providers.aws.services.route53.route53_service import Route53 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.route53_client", - new=Route53(audit_info), + new=Route53(aws_provider), ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.ec2_client", - new=EC2(audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover import ( @@ -51,19 +48,19 @@ class Test_route53_dangling_ip_subdomain_takeover: from prowler.providers.aws.services.ec2.ec2_service import EC2 from prowler.providers.aws.services.route53.route53_service import Route53 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.route53_client", - new=Route53(audit_info), + new=Route53(aws_provider), ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.ec2_client", - new=EC2(audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover import ( @@ -101,19 +98,19 @@ class Test_route53_dangling_ip_subdomain_takeover: from prowler.providers.aws.services.ec2.ec2_service import EC2 from prowler.providers.aws.services.route53.route53_service import Route53 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.route53_client", - new=Route53(audit_info), + new=Route53(aws_provider), ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.ec2_client", - new=EC2(audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover import ( @@ -135,7 +132,7 @@ class Test_route53_dangling_ip_subdomain_takeover: ) assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/', '')}" + == f"arn:{aws_provider.identity.partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/', '')}" ) @mock_aws @@ -164,19 +161,19 @@ class Test_route53_dangling_ip_subdomain_takeover: from prowler.providers.aws.services.ec2.ec2_service import EC2 from prowler.providers.aws.services.route53.route53_service import Route53 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.route53_client", - new=Route53(audit_info), + new=Route53(aws_provider), ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.ec2_client", - new=EC2(audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover import ( @@ -198,7 +195,7 @@ class Test_route53_dangling_ip_subdomain_takeover: ) assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/', '')}" + == f"arn:{aws_provider.identity.partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/', '')}" ) @mock_aws @@ -227,19 +224,19 @@ class Test_route53_dangling_ip_subdomain_takeover: from prowler.providers.aws.services.ec2.ec2_service import EC2 from prowler.providers.aws.services.route53.route53_service import Route53 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.route53_client", - new=Route53(audit_info), + new=Route53(aws_provider), ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.ec2_client", - new=EC2(audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover import ( @@ -261,7 +258,7 @@ class Test_route53_dangling_ip_subdomain_takeover: ) assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/', '')}" + == f"arn:{aws_provider.identity.partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/', '')}" ) @mock_aws @@ -293,19 +290,19 @@ class Test_route53_dangling_ip_subdomain_takeover: from prowler.providers.aws.services.ec2.ec2_service import EC2 from prowler.providers.aws.services.route53.route53_service import Route53 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.route53_client", - new=Route53(audit_info), + new=Route53(aws_provider), ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.ec2_client", - new=EC2(audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover import ( @@ -327,7 +324,7 @@ class Test_route53_dangling_ip_subdomain_takeover: ) assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/', '')}" + == f"arn:{aws_provider.identity.partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/', '')}" ) @mock_aws @@ -365,19 +362,19 @@ class Test_route53_dangling_ip_subdomain_takeover: from prowler.providers.aws.services.ec2.ec2_service import EC2 from prowler.providers.aws.services.route53.route53_service import Route53 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.route53_client", - new=Route53(audit_info), + new=Route53(aws_provider), ): with mock.patch( "prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover.ec2_client", - new=EC2(audit_info), + new=EC2(aws_provider), ): # Test Check from prowler.providers.aws.services.route53.route53_dangling_ip_subdomain_takeover.route53_dangling_ip_subdomain_takeover import ( @@ -399,5 +396,5 @@ class Test_route53_dangling_ip_subdomain_takeover: ) assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/', '')}" + == f"arn:{aws_provider.identity.partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/', '')}" ) diff --git a/tests/providers/aws/services/route53/route53_domains_privacy_protection_enabled/route53_domains_privacy_protection_enabled_test.py b/tests/providers/aws/services/route53/route53_domains_privacy_protection_enabled/route53_domains_privacy_protection_enabled_test.py index ae3e9d2644..c847595967 100644 --- a/tests/providers/aws/services/route53/route53_domains_privacy_protection_enabled/route53_domains_privacy_protection_enabled_test.py +++ b/tests/providers/aws/services/route53/route53_domains_privacy_protection_enabled/route53_domains_privacy_protection_enabled_test.py @@ -1,7 +1,7 @@ from unittest import mock from prowler.providers.aws.services.route53.route53_service import Domain -from tests.providers.aws.audit_info_utils import AWS_REGION_US_EAST_1 +from tests.providers.aws.utils import AWS_REGION_US_EAST_1 class Test_route53_domains_privacy_protection_enabled: diff --git a/tests/providers/aws/services/route53/route53_domains_transferlock_enabled/route53_domains_transferlock_enabled_test.py b/tests/providers/aws/services/route53/route53_domains_transferlock_enabled/route53_domains_transferlock_enabled_test.py index eb87c8db3c..14be1f0ee1 100644 --- a/tests/providers/aws/services/route53/route53_domains_transferlock_enabled/route53_domains_transferlock_enabled_test.py +++ b/tests/providers/aws/services/route53/route53_domains_transferlock_enabled/route53_domains_transferlock_enabled_test.py @@ -1,7 +1,7 @@ from unittest import mock from prowler.providers.aws.services.route53.route53_service import Domain -from tests.providers.aws.audit_info_utils import AWS_REGION_US_EAST_1 +from tests.providers.aws.utils import AWS_REGION_US_EAST_1 class Test_route53_domains_transferlock_enabled: diff --git a/tests/providers/aws/services/route53/route53_public_hosted_zones_cloudwatch_logging_enabled/route53_public_hosted_zones_cloudwatch_logging_enabled_test.py b/tests/providers/aws/services/route53/route53_public_hosted_zones_cloudwatch_logging_enabled/route53_public_hosted_zones_cloudwatch_logging_enabled_test.py index 251b6db28d..315fa73385 100644 --- a/tests/providers/aws/services/route53/route53_public_hosted_zones_cloudwatch_logging_enabled/route53_public_hosted_zones_cloudwatch_logging_enabled_test.py +++ b/tests/providers/aws/services/route53/route53_public_hosted_zones_cloudwatch_logging_enabled/route53_public_hosted_zones_cloudwatch_logging_enabled_test.py @@ -4,10 +4,7 @@ from prowler.providers.aws.services.route53.route53_service import ( HostedZone, LoggingConfig, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_US_EAST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1 class Test_route53_public_hosted_zones_cloudwatch_logging_enabled: diff --git a/tests/providers/aws/services/route53/route53_service_test.py b/tests/providers/aws/services/route53/route53_service_test.py index b6ad9001d3..e64c927a29 100644 --- a/tests/providers/aws/services/route53/route53_service_test.py +++ b/tests/providers/aws/services/route53/route53_service_test.py @@ -5,10 +5,7 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.route53.route53_service import Route53 -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider # Mocking Access Analyzer Calls make_api_call = botocore.client.BaseClient._make_api_call @@ -38,19 +35,19 @@ class Test_Route53_Service: # Test Route53 Client @mock_aws def test__get_client__(self): - route53 = Route53(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + route53 = Route53(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert route53.client.__class__.__name__ == "Route53" # Test Route53 Session @mock_aws def test__get_session__(self): - route53 = Route53(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + route53 = Route53(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert route53.session.__class__.__name__ == "Session" # Test Route53 Service @mock_aws def test__get_service__(self): - route53 = Route53(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + route53 = Route53(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert route53.service == "route53" @mock_aws @@ -77,7 +74,7 @@ class Test_Route53_Service: ) # Set partition for the service - route53 = Route53(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + route53 = Route53(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert len(route53.hosted_zones) == 1 assert route53.hosted_zones[hosted_zone_id] assert route53.hosted_zones[hosted_zone_id].id == hosted_zone_id @@ -121,7 +118,7 @@ class Test_Route53_Service: ) # Set partition for the service - route53 = Route53(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + route53 = Route53(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert len(route53.hosted_zones) == 1 assert route53.hosted_zones[hosted_zone_id] assert route53.hosted_zones[hosted_zone_id].id == hosted_zone_id @@ -152,7 +149,7 @@ class Test_Route53_Service: hosted_zone_name = response["HostedZone"]["Name"] # Set partition for the service - route53 = Route53(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + route53 = Route53(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert len(route53.hosted_zones) == 1 assert route53.hosted_zones[hosted_zone_id] assert route53.hosted_zones[hosted_zone_id].id == hosted_zone_id @@ -179,7 +176,7 @@ class Test_Route53_Service: hosted_zone_name = response["HostedZone"]["Name"] # Set partition for the service - route53 = Route53(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + route53 = Route53(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert len(route53.hosted_zones) == 1 assert route53.hosted_zones[hosted_zone_id] assert route53.hosted_zones[hosted_zone_id].id == hosted_zone_id @@ -219,7 +216,7 @@ class Test_Route53_Service: ) # Set partition for the service - route53 = Route53(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + route53 = Route53(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert ( len(route53.record_sets) == 3 ) # Default NS and SOA records plus the A record just created diff --git a/tests/providers/aws/services/route53/route53domains_service_test.py b/tests/providers/aws/services/route53/route53domains_service_test.py index 062e56e42a..6a0bbaf0c5 100644 --- a/tests/providers/aws/services/route53/route53domains_service_test.py +++ b/tests/providers/aws/services/route53/route53domains_service_test.py @@ -4,10 +4,7 @@ from unittest.mock import patch import botocore from prowler.providers.aws.services.route53.route53_service import Route53Domains -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider # Mocking Access Analyzer Calls make_api_call = botocore.client.BaseClient._make_api_call @@ -72,29 +69,21 @@ class Test_Route53_Service: # Test Route53Domains Client def test__get_client__(self): - route53domains = Route53Domains( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - ) + route53domains = Route53Domains(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert route53domains.client.__class__.__name__ == "Route53Domains" # Test Route53Domains Session def test__get_session__(self): - route53domains = Route53Domains( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - ) + route53domains = Route53Domains(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert route53domains.session.__class__.__name__ == "Session" # Test Route53Domains Service def test__get_service__(self): - route53domains = Route53Domains( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - ) + route53domains = Route53Domains(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert route53domains.service == "route53domains" def test__list_domains__(self): - route53domains = Route53Domains( - set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - ) + route53domains = Route53Domains(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) domain_name = "test.domain.com" assert len(route53domains.domains) assert route53domains.domains diff --git a/tests/providers/aws/services/s3/s3_account_level_public_access_blocks/s3_account_level_public_access_blocks_test.py b/tests/providers/aws/services/s3/s3_account_level_public_access_blocks/s3_account_level_public_access_blocks_test.py index 9cf5f3d3f1..d9c950f60c 100644 --- a/tests/providers/aws/services/s3/s3_account_level_public_access_blocks/s3_account_level_public_access_blocks_test.py +++ b/tests/providers/aws/services/s3/s3_account_level_public_access_blocks/s3_account_level_public_access_blocks_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -26,17 +26,19 @@ class Test_s3_account_level_public_access_blocks: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + # from prowler.providers.common.common import get_global_provider + # "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.s3.s3_account_level_public_access_blocks.s3_account_level_public_access_blocks.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ), mock.patch( "prowler.providers.aws.services.s3.s3_account_level_public_access_blocks.s3_account_level_public_access_blocks.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_account_level_public_access_blocks.s3_account_level_public_access_blocks import ( @@ -74,17 +76,19 @@ class Test_s3_account_level_public_access_blocks: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + # from prowler.providers.common.common import get_global_provider + # "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.s3.s3_account_level_public_access_blocks.s3_account_level_public_access_blocks.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ), mock.patch( "prowler.providers.aws.services.s3.s3_account_level_public_access_blocks.s3_account_level_public_access_blocks.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_account_level_public_access_blocks.s3_account_level_public_access_blocks import ( @@ -122,18 +126,18 @@ class Test_s3_account_level_public_access_blocks: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - audit_info.ignore_unused_services = True + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + aws_provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.s3.s3_account_level_public_access_blocks.s3_account_level_public_access_blocks.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ), mock.patch( "prowler.providers.aws.services.s3.s3_account_level_public_access_blocks.s3_account_level_public_access_blocks.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_account_level_public_access_blocks.s3_account_level_public_access_blocks import ( diff --git a/tests/providers/aws/services/s3/s3_bucket_acl_prohibited/s3_bucket_acl_prohibited_test.py b/tests/providers/aws/services/s3/s3_bucket_acl_prohibited/s3_bucket_acl_prohibited_test.py index 3a75707088..845fbc1e0f 100644 --- a/tests/providers/aws/services/s3/s3_bucket_acl_prohibited/s3_bucket_acl_prohibited_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_acl_prohibited/s3_bucket_acl_prohibited_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_s3_bucket_acl_prohibited: @@ -19,15 +16,15 @@ class Test_s3_bucket_acl_prohibited: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_acl_prohibited.s3_bucket_acl_prohibited.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_acl_prohibited.s3_bucket_acl_prohibited import ( @@ -46,7 +43,7 @@ class Test_s3_bucket_acl_prohibited: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -58,15 +55,15 @@ class Test_s3_bucket_acl_prohibited: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_acl_prohibited.s3_bucket_acl_prohibited.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_acl_prohibited.s3_bucket_acl_prohibited import ( @@ -85,7 +82,7 @@ class Test_s3_bucket_acl_prohibited: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -99,15 +96,15 @@ class Test_s3_bucket_acl_prohibited: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_acl_prohibited.s3_bucket_acl_prohibited.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_acl_prohibited.s3_bucket_acl_prohibited import ( @@ -126,6 +123,6 @@ class Test_s3_bucket_acl_prohibited: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/s3/s3_bucket_default_encryption/s3_bucket_default_encryption_test.py b/tests/providers/aws/services/s3/s3_bucket_default_encryption/s3_bucket_default_encryption_test.py index 48cea58391..6dae215717 100644 --- a/tests/providers/aws/services/s3/s3_bucket_default_encryption/s3_bucket_default_encryption_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_default_encryption/s3_bucket_default_encryption_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_s3_bucket_default_encryption: @@ -19,15 +16,15 @@ class Test_s3_bucket_default_encryption: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_default_encryption.s3_bucket_default_encryption.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_default_encryption.s3_bucket_default_encryption import ( @@ -46,7 +43,7 @@ class Test_s3_bucket_default_encryption: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -74,15 +71,15 @@ class Test_s3_bucket_default_encryption: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_default_encryption.s3_bucket_default_encryption.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_default_encryption.s3_bucket_default_encryption import ( @@ -101,6 +98,6 @@ class Test_s3_bucket_default_encryption: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/s3/s3_bucket_kms_encryption/s3_bucket_kms_encryption_test.py b/tests/providers/aws/services/s3/s3_bucket_kms_encryption/s3_bucket_kms_encryption_test.py index 806ab06b0a..bd15bf9ce4 100644 --- a/tests/providers/aws/services/s3/s3_bucket_kms_encryption/s3_bucket_kms_encryption_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_kms_encryption/s3_bucket_kms_encryption_test.py @@ -3,10 +3,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_s3_bucket_kms_encryption: @@ -14,14 +11,14 @@ class Test_s3_bucket_kms_encryption: def test_no_buckets(self): from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.s3.s3_bucket_kms_encryption.s3_bucket_kms_encryption.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_kms_encryption.s3_bucket_kms_encryption import ( @@ -41,14 +38,14 @@ class Test_s3_bucket_kms_encryption: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.s3.s3_bucket_kms_encryption.s3_bucket_kms_encryption.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_kms_encryption.s3_bucket_kms_encryption import ( @@ -67,7 +64,7 @@ class Test_s3_bucket_kms_encryption: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 @@ -95,14 +92,14 @@ class Test_s3_bucket_kms_encryption: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.s3.s3_bucket_kms_encryption.s3_bucket_kms_encryption.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_kms_encryption.s3_bucket_kms_encryption import ( @@ -121,7 +118,7 @@ class Test_s3_bucket_kms_encryption: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 @@ -151,15 +148,15 @@ class Test_s3_bucket_kms_encryption: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_kms_encryption.s3_bucket_kms_encryption.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_kms_encryption.s3_bucket_kms_encryption import ( @@ -178,7 +175,7 @@ class Test_s3_bucket_kms_encryption: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 @@ -208,15 +205,15 @@ class Test_s3_bucket_kms_encryption: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_kms_encryption.s3_bucket_kms_encryption.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_kms_encryption.s3_bucket_kms_encryption import ( @@ -235,7 +232,7 @@ class Test_s3_bucket_kms_encryption: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/s3/s3_bucket_level_public_access_block/s3_bucket_level_public_access_block_test.py b/tests/providers/aws/services/s3/s3_bucket_level_public_access_block/s3_bucket_level_public_access_block_test.py index 682486f950..061783f212 100644 --- a/tests/providers/aws/services/s3/s3_bucket_level_public_access_block/s3_bucket_level_public_access_block_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_level_public_access_block/s3_bucket_level_public_access_block_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -15,19 +15,19 @@ class Test_s3_bucket_level_public_access_block: def test_no_buckets(self): from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block import ( @@ -65,19 +65,19 @@ class Test_s3_bucket_level_public_access_block: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block import ( @@ -96,7 +96,7 @@ class Test_s3_bucket_level_public_access_block: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -126,19 +126,19 @@ class Test_s3_bucket_level_public_access_block: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block import ( @@ -158,7 +158,7 @@ class Test_s3_bucket_level_public_access_block: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -188,19 +188,19 @@ class Test_s3_bucket_level_public_access_block: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block import ( @@ -220,7 +220,7 @@ class Test_s3_bucket_level_public_access_block: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -250,14 +250,14 @@ class Test_s3_bucket_level_public_access_block: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): # To test this behaviour we need to set public_access_block to None - s3 = S3(audit_info) + s3 = S3(aws_provider) s3.buckets[0].public_access_block = None with mock.patch( @@ -266,7 +266,7 @@ class Test_s3_bucket_level_public_access_block: ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_level_public_access_block.s3_bucket_level_public_access_block import ( diff --git a/tests/providers/aws/services/s3/s3_bucket_no_mfa_delete/s3_bucket_no_mfa_delete_test.py b/tests/providers/aws/services/s3/s3_bucket_no_mfa_delete/s3_bucket_no_mfa_delete_test.py index c97f566c0c..c2053a454c 100644 --- a/tests/providers/aws/services/s3/s3_bucket_no_mfa_delete/s3_bucket_no_mfa_delete_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_no_mfa_delete/s3_bucket_no_mfa_delete_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_s3_bucket_no_mfa_delete: @@ -15,15 +12,15 @@ class Test_s3_bucket_no_mfa_delete: def test_no_buckets(self): from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_no_mfa_delete.s3_bucket_no_mfa_delete.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_no_mfa_delete.s3_bucket_no_mfa_delete import ( @@ -43,15 +40,15 @@ class Test_s3_bucket_no_mfa_delete: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_no_mfa_delete.s3_bucket_no_mfa_delete.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_no_mfa_delete.s3_bucket_no_mfa_delete import ( @@ -70,7 +67,7 @@ class Test_s3_bucket_no_mfa_delete: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) @mock_aws @@ -85,14 +82,14 @@ class Test_s3_bucket_no_mfa_delete: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_no_mfa_delete.s3_bucket_no_mfa_delete.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ) as service_client: # Test Check from prowler.providers.aws.services.s3.s3_bucket_no_mfa_delete.s3_bucket_no_mfa_delete import ( @@ -112,5 +109,5 @@ class Test_s3_bucket_no_mfa_delete: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) diff --git a/tests/providers/aws/services/s3/s3_bucket_object_lock/s3_bucket_object_lock_test.py b/tests/providers/aws/services/s3/s3_bucket_object_lock/s3_bucket_object_lock_test.py index 74ae68c5ba..8959c291e2 100644 --- a/tests/providers/aws/services/s3/s3_bucket_object_lock/s3_bucket_object_lock_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_object_lock/s3_bucket_object_lock_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_s3_bucket_object_lock: @@ -15,15 +12,15 @@ class Test_s3_bucket_object_lock: def test_no_buckets(self): from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_object_lock.s3_bucket_object_lock.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_object_lock.s3_bucket_object_lock import ( @@ -43,15 +40,15 @@ class Test_s3_bucket_object_lock: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_object_lock.s3_bucket_object_lock.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_object_lock.s3_bucket_object_lock import ( @@ -70,7 +67,7 @@ class Test_s3_bucket_object_lock: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] @@ -87,15 +84,15 @@ class Test_s3_bucket_object_lock: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_object_lock.s3_bucket_object_lock.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_object_lock.s3_bucket_object_lock import ( @@ -114,7 +111,7 @@ class Test_s3_bucket_object_lock: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] diff --git a/tests/providers/aws/services/s3/s3_bucket_object_versioning/s3_bucket_object_versioning_test.py b/tests/providers/aws/services/s3/s3_bucket_object_versioning/s3_bucket_object_versioning_test.py index 270d6a35a2..836cfd8b6d 100644 --- a/tests/providers/aws/services/s3/s3_bucket_object_versioning/s3_bucket_object_versioning_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_object_versioning/s3_bucket_object_versioning_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_s3_bucket_object_versioning: @@ -19,15 +16,15 @@ class Test_s3_bucket_object_versioning: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_object_versioning.s3_bucket_object_versioning.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_object_versioning.s3_bucket_object_versioning import ( @@ -46,7 +43,7 @@ class Test_s3_bucket_object_versioning: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -64,15 +61,15 @@ class Test_s3_bucket_object_versioning: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_object_versioning.s3_bucket_object_versioning.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_object_versioning.s3_bucket_object_versioning import ( @@ -91,6 +88,6 @@ class Test_s3_bucket_object_versioning: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/s3/s3_bucket_policy_public_write_access/s3_bucket_policy_public_write_access_test.py b/tests/providers/aws/services/s3/s3_bucket_policy_public_write_access/s3_bucket_policy_public_write_access_test.py index aaf92d469e..ece4195a05 100644 --- a/tests/providers/aws/services/s3/s3_bucket_policy_public_write_access/s3_bucket_policy_public_write_access_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_policy_public_write_access/s3_bucket_policy_public_write_access_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -19,15 +19,15 @@ class Test_s3_bucket_policy_public_write_access: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access import ( @@ -46,7 +46,7 @@ class Test_s3_bucket_policy_public_write_access: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -77,18 +77,18 @@ class Test_s3_bucket_policy_public_write_access: from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ), mock.patch( "prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access import ( @@ -107,7 +107,7 @@ class Test_s3_bucket_policy_public_write_access: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -148,18 +148,18 @@ class Test_s3_bucket_policy_public_write_access: from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ), mock.patch( "prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access import ( @@ -178,7 +178,7 @@ class Test_s3_bucket_policy_public_write_access: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -210,18 +210,18 @@ class Test_s3_bucket_policy_public_write_access: from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ), mock.patch( "prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access import ( @@ -240,7 +240,7 @@ class Test_s3_bucket_policy_public_write_access: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -271,18 +271,18 @@ class Test_s3_bucket_policy_public_write_access: from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access import ( @@ -301,7 +301,7 @@ class Test_s3_bucket_policy_public_write_access: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -332,18 +332,18 @@ class Test_s3_bucket_policy_public_write_access: from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_policy_public_write_access.s3_bucket_policy_public_write_access import ( @@ -362,6 +362,6 @@ class Test_s3_bucket_policy_public_write_access: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/s3/s3_bucket_public_access/s3_bucket_public_access_test.py b/tests/providers/aws/services/s3/s3_bucket_public_access/s3_bucket_public_access_test.py index 1e0b5919ea..2085ef2ac2 100644 --- a/tests/providers/aws/services/s3/s3_bucket_public_access/s3_bucket_public_access_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_public_access/s3_bucket_public_access_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -16,19 +16,19 @@ class Test_s3_bucket_public_access: def test_no_buckets(self): from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access import ( @@ -55,19 +55,19 @@ class Test_s3_bucket_public_access: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access import ( @@ -108,19 +108,19 @@ class Test_s3_bucket_public_access: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access import ( @@ -170,19 +170,19 @@ class Test_s3_bucket_public_access: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access import ( @@ -201,7 +201,7 @@ class Test_s3_bucket_public_access: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -248,19 +248,19 @@ class Test_s3_bucket_public_access: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access import ( @@ -279,7 +279,7 @@ class Test_s3_bucket_public_access: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -315,19 +315,19 @@ class Test_s3_bucket_public_access: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access import ( @@ -346,7 +346,7 @@ class Test_s3_bucket_public_access: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -366,19 +366,19 @@ class Test_s3_bucket_public_access: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access import ( @@ -397,7 +397,7 @@ class Test_s3_bucket_public_access: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -417,14 +417,14 @@ class Test_s3_bucket_public_access: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): # To test this behaviour we need to set public_access_block to None - s3 = S3(audit_info) + s3 = S3(aws_provider) s3.buckets[0].public_access_block = None with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3_client", @@ -432,7 +432,7 @@ class Test_s3_bucket_public_access: ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_access.s3_bucket_public_access import ( diff --git a/tests/providers/aws/services/s3/s3_bucket_public_list_acl/s3_bucket_public_list_acl_test.py b/tests/providers/aws/services/s3/s3_bucket_public_list_acl/s3_bucket_public_list_acl_test.py index 314b331774..b05144b5c3 100644 --- a/tests/providers/aws/services/s3/s3_bucket_public_list_acl/s3_bucket_public_list_acl_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_public_list_acl/s3_bucket_public_list_acl_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -15,19 +15,19 @@ class Test_s3_bucket_public_list_acl: def test_no_buckets(self): from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl import ( @@ -54,19 +54,19 @@ class Test_s3_bucket_public_list_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl import ( @@ -107,19 +107,19 @@ class Test_s3_bucket_public_list_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl import ( @@ -169,19 +169,19 @@ class Test_s3_bucket_public_list_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl import ( @@ -200,7 +200,7 @@ class Test_s3_bucket_public_list_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -247,19 +247,19 @@ class Test_s3_bucket_public_list_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl import ( @@ -279,7 +279,7 @@ class Test_s3_bucket_public_list_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -326,19 +326,19 @@ class Test_s3_bucket_public_list_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl import ( @@ -358,7 +358,7 @@ class Test_s3_bucket_public_list_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -405,19 +405,19 @@ class Test_s3_bucket_public_list_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl import ( @@ -437,7 +437,7 @@ class Test_s3_bucket_public_list_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -484,19 +484,19 @@ class Test_s3_bucket_public_list_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl import ( @@ -516,7 +516,7 @@ class Test_s3_bucket_public_list_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -563,19 +563,19 @@ class Test_s3_bucket_public_list_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl import ( @@ -595,7 +595,7 @@ class Test_s3_bucket_public_list_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -642,19 +642,19 @@ class Test_s3_bucket_public_list_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_list_acl.s3_bucket_public_list_acl import ( @@ -674,6 +674,6 @@ class Test_s3_bucket_public_list_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/s3/s3_bucket_public_write_acl/s3_bucket_public_write_acl_test.py b/tests/providers/aws/services/s3/s3_bucket_public_write_acl/s3_bucket_public_write_acl_test.py index 5232d47351..7354fe4837 100644 --- a/tests/providers/aws/services/s3/s3_bucket_public_write_acl/s3_bucket_public_write_acl_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_public_write_acl/s3_bucket_public_write_acl_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -15,19 +15,19 @@ class Test_s3_bucket_public_write_acl: def test_no_buckets(self): from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl import ( @@ -54,19 +54,19 @@ class Test_s3_bucket_public_write_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl import ( @@ -107,19 +107,19 @@ class Test_s3_bucket_public_write_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl import ( @@ -169,19 +169,19 @@ class Test_s3_bucket_public_write_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl import ( @@ -200,7 +200,7 @@ class Test_s3_bucket_public_write_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -247,19 +247,19 @@ class Test_s3_bucket_public_write_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl import ( @@ -279,7 +279,7 @@ class Test_s3_bucket_public_write_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -326,19 +326,19 @@ class Test_s3_bucket_public_write_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl import ( @@ -358,7 +358,7 @@ class Test_s3_bucket_public_write_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -405,19 +405,19 @@ class Test_s3_bucket_public_write_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl import ( @@ -437,7 +437,7 @@ class Test_s3_bucket_public_write_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -484,19 +484,19 @@ class Test_s3_bucket_public_write_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl import ( @@ -516,7 +516,7 @@ class Test_s3_bucket_public_write_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -563,19 +563,19 @@ class Test_s3_bucket_public_write_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl import ( @@ -595,7 +595,7 @@ class Test_s3_bucket_public_write_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -642,19 +642,19 @@ class Test_s3_bucket_public_write_acl: ) from prowler.providers.aws.services.s3.s3_service import S3, S3Control - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl.s3control_client", - new=S3Control(audit_info), + new=S3Control(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_public_write_acl.s3_bucket_public_write_acl import ( @@ -674,6 +674,6 @@ class Test_s3_bucket_public_write_acl: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/s3/s3_bucket_secure_transport_policy/s3_bucket_secure_transport_policy_test.py b/tests/providers/aws/services/s3/s3_bucket_secure_transport_policy/s3_bucket_secure_transport_policy_test.py index d52a4134af..18e3f04bf9 100644 --- a/tests/providers/aws/services/s3/s3_bucket_secure_transport_policy/s3_bucket_secure_transport_policy_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_secure_transport_policy/s3_bucket_secure_transport_policy_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_s3_bucket_secure_transport_policy: @@ -19,15 +16,15 @@ class Test_s3_bucket_secure_transport_policy: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_secure_transport_policy.s3_bucket_secure_transport_policy.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_secure_transport_policy.s3_bucket_secure_transport_policy import ( @@ -46,7 +43,7 @@ class Test_s3_bucket_secure_transport_policy: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -82,15 +79,15 @@ class Test_s3_bucket_secure_transport_policy: ) from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_secure_transport_policy.s3_bucket_secure_transport_policy.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_secure_transport_policy.s3_bucket_secure_transport_policy import ( @@ -109,7 +106,7 @@ class Test_s3_bucket_secure_transport_policy: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 @@ -145,15 +142,15 @@ class Test_s3_bucket_secure_transport_policy: ) from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_secure_transport_policy.s3_bucket_secure_transport_policy.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_secure_transport_policy.s3_bucket_secure_transport_policy import ( @@ -172,6 +169,6 @@ class Test_s3_bucket_secure_transport_policy: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) assert result[0].region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/s3/s3_bucket_server_access_logging_enabled/s3_bucket_server_access_logging_enabled_test.py b/tests/providers/aws/services/s3/s3_bucket_server_access_logging_enabled/s3_bucket_server_access_logging_enabled_test.py index bf2f8071fe..f4fabead96 100644 --- a/tests/providers/aws/services/s3/s3_bucket_server_access_logging_enabled/s3_bucket_server_access_logging_enabled_test.py +++ b/tests/providers/aws/services/s3/s3_bucket_server_access_logging_enabled/s3_bucket_server_access_logging_enabled_test.py @@ -4,10 +4,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_s3_bucket_server_access_logging_enabled: @@ -19,15 +16,15 @@ class Test_s3_bucket_server_access_logging_enabled: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_server_access_logging_enabled.s3_bucket_server_access_logging_enabled.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_server_access_logging_enabled.s3_bucket_server_access_logging_enabled import ( @@ -46,7 +43,7 @@ class Test_s3_bucket_server_access_logging_enabled: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) @mock_aws @@ -112,15 +109,15 @@ class Test_s3_bucket_server_access_logging_enabled: from prowler.providers.aws.services.s3.s3_service import S3 - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.s3.s3_bucket_server_access_logging_enabled.s3_bucket_server_access_logging_enabled.s3_client", - new=S3(audit_info), + new=S3(aws_provider), ): # Test Check from prowler.providers.aws.services.s3.s3_bucket_server_access_logging_enabled.s3_bucket_server_access_logging_enabled import ( @@ -139,5 +136,5 @@ class Test_s3_bucket_server_access_logging_enabled: assert result[0].resource_id == bucket_name_us assert ( result[0].resource_arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name_us}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name_us}" ) diff --git a/tests/providers/aws/services/s3/s3_service_test.py b/tests/providers/aws/services/s3/s3_service_test.py index 2d79d36a7e..c5cc0ac450 100644 --- a/tests/providers/aws/services/s3/s3_service_test.py +++ b/tests/providers/aws/services/s3/s3_service_test.py @@ -4,10 +4,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.s3.s3_service import S3, S3Control -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -17,32 +17,32 @@ class Test_S3_Service: @mock_aws def test_service(self): # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert s3.service == "s3" # Test S3 Client @mock_aws def test_client(self): # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert s3.client.__class__.__name__ == "S3" # Test S3 Session @mock_aws def test__get_session__(self): # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert s3.session.__class__.__name__ == "Session" # Test S3 Session @mock_aws def test_audited_account(self): # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert s3.audited_account == AWS_ACCOUNT_NUMBER # Test S3 List Buckets @@ -55,14 +55,14 @@ class Test_S3_Service: s3_client.create_bucket(Bucket=bucket_name) # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert len(s3.buckets) == 1 assert s3.buckets[0].name == bucket_name assert ( s3.buckets[0].arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name}" ) assert not s3.buckets[0].object_lock @@ -80,13 +80,13 @@ class Test_S3_Service: VersioningConfiguration={"MFADelete": "Disabled", "Status": "Enabled"}, ) # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert len(s3.buckets) == 1 assert s3.buckets[0].name == bucket_name assert ( s3.buckets[0].arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name}" ) assert s3.buckets[0].versioning is True @@ -113,13 +113,13 @@ class Test_S3_Service: }, Bucket=bucket_name, ) - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert len(s3.buckets) == 1 assert s3.buckets[0].name == bucket_name assert ( s3.buckets[0].arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name}" ) assert s3.buckets[0].acl_grantees[0].display_name == "test" assert s3.buckets[0].acl_grantees[0].ID == "test_ID" @@ -193,13 +193,13 @@ class Test_S3_Service: }, ) # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert len(s3.buckets) == 1 assert s3.buckets[0].name == bucket_name assert ( s3.buckets[0].arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name}" ) assert s3.buckets[0].logging is True @@ -214,13 +214,13 @@ class Test_S3_Service: Bucket=bucket_name, Policy=ssl_policy, ) - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert len(s3.buckets) == 1 assert s3.buckets[0].name == bucket_name assert ( s3.buckets[0].arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name}" ) assert s3.buckets[0].policy == json.loads(ssl_policy) @@ -247,13 +247,13 @@ class Test_S3_Service: Bucket=bucket_name, ServerSideEncryptionConfiguration=sse_config ) # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert len(s3.buckets) == 1 assert s3.buckets[0].name == bucket_name assert ( s3.buckets[0].arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name}" ) assert s3.buckets[0].encryption == "aws:kms" @@ -269,13 +269,13 @@ class Test_S3_Service: ) # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert len(s3.buckets) == 1 assert s3.buckets[0].name == bucket_name assert ( s3.buckets[0].arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name}" ) assert s3.buckets[0].ownership == "BucketOwnerEnforced" @@ -299,13 +299,13 @@ class Test_S3_Service: }, ) # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert len(s3.buckets) == 1 assert s3.buckets[0].name == bucket_name assert ( s3.buckets[0].arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name}" ) assert s3.buckets[0].public_access_block.block_public_acls assert s3.buckets[0].public_access_block.ignore_public_acls @@ -329,8 +329,8 @@ class Test_S3_Service: }, ) # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert len(s3.buckets) == 1 assert s3.buckets[0].tags == [ @@ -352,8 +352,8 @@ class Test_S3_Service: }, ) # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3control = S3Control(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3control = S3Control(aws_provider) assert s3control.account_public_access_block.block_public_acls assert s3control.account_public_access_block.ignore_public_acls assert s3control.account_public_access_block.block_public_policy @@ -373,12 +373,12 @@ class Test_S3_Service: ) # S3 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - s3 = S3(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + s3 = S3(aws_provider) assert len(s3.buckets) == 1 assert s3.buckets[0].name == bucket_name assert ( s3.buckets[0].arn - == f"arn:{audit_info.audited_partition}:s3:::{bucket_name}" + == f"arn:{aws_provider.identity.partition}:s3:::{bucket_name}" ) assert s3.buckets[0].object_lock diff --git a/tests/providers/aws/services/sagemaker/sagemaker_models_network_isolation_enabled/sagemaker_models_network_isolation_enabled_test.py b/tests/providers/aws/services/sagemaker/sagemaker_models_network_isolation_enabled/sagemaker_models_network_isolation_enabled_test.py index 3ab35950a9..6585cd3425 100644 --- a/tests/providers/aws/services/sagemaker/sagemaker_models_network_isolation_enabled/sagemaker_models_network_isolation_enabled_test.py +++ b/tests/providers/aws/services/sagemaker/sagemaker_models_network_isolation_enabled/sagemaker_models_network_isolation_enabled_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.sagemaker.sagemaker_service import Model -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 test_notebook_instance = "test-notebook-instance" notebook_instance_arn = f"arn:aws:sagemaker:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:notebook-instance/{test_notebook_instance}" diff --git a/tests/providers/aws/services/sagemaker/sagemaker_models_vpc_settings_configured/sagemaker_models_vpc_settings_configured_test.py b/tests/providers/aws/services/sagemaker/sagemaker_models_vpc_settings_configured/sagemaker_models_vpc_settings_configured_test.py index 1d10eb0faa..ffd2552221 100644 --- a/tests/providers/aws/services/sagemaker/sagemaker_models_vpc_settings_configured/sagemaker_models_vpc_settings_configured_test.py +++ b/tests/providers/aws/services/sagemaker/sagemaker_models_vpc_settings_configured/sagemaker_models_vpc_settings_configured_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.sagemaker.sagemaker_service import Model -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 test_notebook_instance = "test-notebook-instance" notebook_instance_arn = f"arn:aws:sagemaker:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:notebook-instance/{test_notebook_instance}" diff --git a/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_encryption_enabled/sagemaker_notebook_instance_encryption_enabled_test.py b/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_encryption_enabled/sagemaker_notebook_instance_encryption_enabled_test.py index 16a9d3c30f..5a2e68338b 100644 --- a/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_encryption_enabled/sagemaker_notebook_instance_encryption_enabled_test.py +++ b/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_encryption_enabled/sagemaker_notebook_instance_encryption_enabled_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.sagemaker.sagemaker_service import NotebookInstance -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 test_notebook_instance = "test-notebook-instance" notebook_instance_arn = f"arn:aws:sagemaker:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:notebook-instance/{test_notebook_instance}" diff --git a/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_root_access_disabled/sagemaker_notebook_instance_root_access_disabled_test.py b/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_root_access_disabled/sagemaker_notebook_instance_root_access_disabled_test.py index 7ce5a7e538..0b94b1420e 100644 --- a/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_root_access_disabled/sagemaker_notebook_instance_root_access_disabled_test.py +++ b/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_root_access_disabled/sagemaker_notebook_instance_root_access_disabled_test.py @@ -2,10 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.sagemaker.sagemaker_service import NotebookInstance -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 test_notebook_instance = "test-notebook-instance" notebook_instance_arn = f"arn:aws:sagemaker:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:notebook-instance/{test_notebook_instance}" diff --git a/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_vpc_settings_configured/sagemaker_notebook_instance_vpc_settings_configured_test.py b/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_vpc_settings_configured/sagemaker_notebook_instance_vpc_settings_configured_test.py index 5c01364172..d373572336 100644 --- a/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_vpc_settings_configured/sagemaker_notebook_instance_vpc_settings_configured_test.py +++ b/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_vpc_settings_configured/sagemaker_notebook_instance_vpc_settings_configured_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.sagemaker.sagemaker_service import NotebookInstance -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 test_notebook_instance = "test-notebook-instance" notebook_instance_arn = f"arn:aws:sagemaker:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:notebook-instance/{test_notebook_instance}" diff --git a/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_without_direct_internet_access_configured/sagemaker_notebook_instance_without_direct_internet_access_configured_test.py b/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_without_direct_internet_access_configured/sagemaker_notebook_instance_without_direct_internet_access_configured_test.py index 6b968db27e..fd5598e0cf 100644 --- a/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_without_direct_internet_access_configured/sagemaker_notebook_instance_without_direct_internet_access_configured_test.py +++ b/tests/providers/aws/services/sagemaker/sagemaker_notebook_instance_without_direct_internet_access_configured/sagemaker_notebook_instance_without_direct_internet_access_configured_test.py @@ -2,10 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.sagemaker.sagemaker_service import NotebookInstance -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 test_notebook_instance = "test-notebook-instance" notebook_instance_arn = f"arn:aws:sagemaker:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:notebook-instance/{test_notebook_instance}" diff --git a/tests/providers/aws/services/sagemaker/sagemaker_service_test.py b/tests/providers/aws/services/sagemaker/sagemaker_service_test.py index f5f7bac6c2..d315128ae2 100644 --- a/tests/providers/aws/services/sagemaker/sagemaker_service_test.py +++ b/tests/providers/aws/services/sagemaker/sagemaker_service_test.py @@ -4,10 +4,10 @@ from uuid import uuid4 import botocore from prowler.providers.aws.services.sagemaker.sagemaker_service import SageMaker -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) test_notebook_instance = "test-notebook-instance" @@ -90,8 +90,8 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -100,33 +100,33 @@ def mock_generate_regional_clients(service, audit_info): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_SageMaker_Service: # Test SageMaker Service def test_service(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sagemaker = SageMaker(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sagemaker = SageMaker(aws_provider) assert sagemaker.service == "sagemaker" # Test SageMaker client def test_client(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sagemaker = SageMaker(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sagemaker = SageMaker(aws_provider) for reg_client in sagemaker.regional_clients.values(): assert reg_client.__class__.__name__ == "SageMaker" # Test SageMaker session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sagemaker = SageMaker(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sagemaker = SageMaker(aws_provider) assert sagemaker.session.__class__.__name__ == "Session" # Test SageMaker list notebook instances def test_list_notebook_instances(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sagemaker = SageMaker(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sagemaker = SageMaker(aws_provider) assert len(sagemaker.sagemaker_notebook_instances) == 1 assert sagemaker.sagemaker_notebook_instances[0].name == test_notebook_instance assert sagemaker.sagemaker_notebook_instances[0].arn == notebook_instance_arn @@ -137,8 +137,8 @@ class Test_SageMaker_Service: # Test SageMaker list models def test_list_models(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sagemaker = SageMaker(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sagemaker = SageMaker(aws_provider) assert len(sagemaker.sagemaker_models) == 1 assert sagemaker.sagemaker_models[0].name == test_model assert sagemaker.sagemaker_models[0].arn == test_arn_model @@ -149,8 +149,8 @@ class Test_SageMaker_Service: # Test SageMaker list training jobs def test_list_training_jobs(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sagemaker = SageMaker(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sagemaker = SageMaker(aws_provider) assert len(sagemaker.sagemaker_training_jobs) == 1 assert sagemaker.sagemaker_training_jobs[0].name == test_training_job assert sagemaker.sagemaker_training_jobs[0].arn == test_arn_training_job @@ -161,8 +161,8 @@ class Test_SageMaker_Service: # Test SageMaker describe notebook instance def test_describe_notebook_instance(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sagemaker = SageMaker(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sagemaker = SageMaker(aws_provider) assert len(sagemaker.sagemaker_notebook_instances) == 1 assert sagemaker.sagemaker_notebook_instances[0].root_access assert sagemaker.sagemaker_notebook_instances[0].subnet_id == subnet_id @@ -171,16 +171,16 @@ class Test_SageMaker_Service: # Test SageMaker describe model def test_describe_model(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sagemaker = SageMaker(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sagemaker = SageMaker(aws_provider) assert len(sagemaker.sagemaker_models) == 1 assert sagemaker.sagemaker_models[0].network_isolation assert sagemaker.sagemaker_models[0].vpc_config_subnets == [subnet_id] # Test SageMaker describe training jobs def test_describe_training_jobs(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sagemaker = SageMaker(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sagemaker = SageMaker(aws_provider) assert len(sagemaker.sagemaker_training_jobs) == 1 assert sagemaker.sagemaker_training_jobs[0].container_traffic_encryption assert sagemaker.sagemaker_training_jobs[0].network_isolation diff --git a/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_intercontainer_encryption_enabled/sagemaker_training_jobs_intercontainer_encryption_enabled_test.py b/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_intercontainer_encryption_enabled/sagemaker_training_jobs_intercontainer_encryption_enabled_test.py index ffd12f9051..dde8cc45f0 100644 --- a/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_intercontainer_encryption_enabled/sagemaker_training_jobs_intercontainer_encryption_enabled_test.py +++ b/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_intercontainer_encryption_enabled/sagemaker_training_jobs_intercontainer_encryption_enabled_test.py @@ -2,10 +2,7 @@ from re import search from unittest import mock from prowler.providers.aws.services.sagemaker.sagemaker_service import TrainingJob -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 test_training_job = "test-training-job" training_job_arn = f"arn:aws:sagemaker:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:training-job/{test_training_job}" diff --git a/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_network_isolation_enabled/sagemaker_training_jobs_network_isolation_enabled_test.py b/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_network_isolation_enabled/sagemaker_training_jobs_network_isolation_enabled_test.py index 29308fa24d..47241fed54 100644 --- a/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_network_isolation_enabled/sagemaker_training_jobs_network_isolation_enabled_test.py +++ b/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_network_isolation_enabled/sagemaker_training_jobs_network_isolation_enabled_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.sagemaker.sagemaker_service import TrainingJob -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 test_training_job = "test-training-job" training_job_arn = f"arn:aws:sagemaker:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:training-job/{test_training_job}" diff --git a/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_volume_and_output_encryption_enabled/sagemaker_training_jobs_volume_and_output_encryption_enabled_test.py b/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_volume_and_output_encryption_enabled/sagemaker_training_jobs_volume_and_output_encryption_enabled_test.py index c894df0e80..585b54a915 100644 --- a/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_volume_and_output_encryption_enabled/sagemaker_training_jobs_volume_and_output_encryption_enabled_test.py +++ b/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_volume_and_output_encryption_enabled/sagemaker_training_jobs_volume_and_output_encryption_enabled_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.sagemaker.sagemaker_service import TrainingJob -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 test_training_job = "test-training-job" training_job_arn = f"arn:aws:sagemaker:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:training-job/{test_training_job}" diff --git a/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_vpc_settings_configured/sagemaker_training_jobs_vpc_settings_configured_test.py b/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_vpc_settings_configured/sagemaker_training_jobs_vpc_settings_configured_test.py index 8c57eea3bb..089e186667 100644 --- a/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_vpc_settings_configured/sagemaker_training_jobs_vpc_settings_configured_test.py +++ b/tests/providers/aws/services/sagemaker/sagemaker_training_jobs_vpc_settings_configured/sagemaker_training_jobs_vpc_settings_configured_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.sagemaker.sagemaker_service import TrainingJob -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 test_training_job = "test-training-job" training_job_arn = f"arn:aws:sagemaker:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:training-job/{test_training_job}" diff --git a/tests/providers/aws/services/secretsmanager/secretsmanager_automatic_rotation_enabled/secretsmanager_automatic_rotation_enabled_test.py b/tests/providers/aws/services/secretsmanager/secretsmanager_automatic_rotation_enabled/secretsmanager_automatic_rotation_enabled_test.py index 4508411100..3134106e5c 100644 --- a/tests/providers/aws/services/secretsmanager/secretsmanager_automatic_rotation_enabled/secretsmanager_automatic_rotation_enabled_test.py +++ b/tests/providers/aws/services/secretsmanager/secretsmanager_automatic_rotation_enabled/secretsmanager_automatic_rotation_enabled_test.py @@ -1,10 +1,7 @@ from unittest import mock from prowler.providers.aws.services.secretsmanager.secretsmanager_service import Secret -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 class Test_secretsmanager_automatic_rotation_enabled: diff --git a/tests/providers/aws/services/secretsmanager/secretsmanager_service_test.py b/tests/providers/aws/services/secretsmanager/secretsmanager_service_test.py index 248b3c3991..65d88352f9 100644 --- a/tests/providers/aws/services/secretsmanager/secretsmanager_service_test.py +++ b/tests/providers/aws/services/secretsmanager/secretsmanager_service_test.py @@ -8,15 +8,12 @@ from moto import mock_aws from prowler.providers.aws.services.secretsmanager.secretsmanager_service import ( SecretsManager, ) -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -25,15 +22,15 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_SecretsManager_Service: # Test SecretsManager Client @mock_aws def test__get_client__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - secretsmanager = SecretsManager(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + secretsmanager = SecretsManager(aws_provider) assert ( secretsmanager.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ == "SecretsManager" @@ -42,15 +39,15 @@ class Test_SecretsManager_Service: # Test SecretsManager Session @mock_aws def test__get_session__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - secretsmanager = SecretsManager(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + secretsmanager = SecretsManager(aws_provider) assert secretsmanager.session.__class__.__name__ == "Session" # Test SecretsManager Service @mock_aws def test__get_service__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - secretsmanager = SecretsManager(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + secretsmanager = SecretsManager(aws_provider) assert secretsmanager.service == "secretsmanager" @mock_aws @@ -126,8 +123,8 @@ class Test_SecretsManager_Service: ) # Set partition for the service - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - secretsmanager = SecretsManager(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + secretsmanager = SecretsManager(aws_provider) assert len(secretsmanager.secrets) == 1 assert secretsmanager.secrets diff --git a/tests/providers/aws/services/securityhub/securityhub_enabled/securityhub_enabled_test.py b/tests/providers/aws/services/securityhub/securityhub_enabled/securityhub_enabled_test.py index 076717e85c..f73003bb58 100644 --- a/tests/providers/aws/services/securityhub/securityhub_enabled/securityhub_enabled_test.py +++ b/tests/providers/aws/services/securityhub/securityhub_enabled/securityhub_enabled_test.py @@ -3,7 +3,7 @@ from unittest import mock from prowler.providers.aws.services.securityhub.securityhub_service import ( SecurityHubHub, ) -from tests.providers.aws.audit_info_utils import AWS_ACCOUNT_ARN, AWS_REGION_EU_WEST_1 +from tests.providers.aws.utils import AWS_ACCOUNT_ARN, AWS_REGION_EU_WEST_1 class Test_securityhub_enabled: @@ -149,7 +149,7 @@ class Test_securityhub_enabled: def test_securityhub_hub_active_without_integrations_or_standards_muted(self): securityhub_client = mock.MagicMock - securityhub_client.audit_config = {"allowlist_non_default_regions": True} + securityhub_client.audit_config = {"mute_non_default_regions": True} securityhub_client.region = AWS_REGION_EU_WEST_1 securityhub_client.securityhubs = [ SecurityHubHub( diff --git a/tests/providers/aws/services/securityhub/securityhub_service_test.py b/tests/providers/aws/services/securityhub/securityhub_service_test.py index e9f9700c92..2f5a75ea1e 100644 --- a/tests/providers/aws/services/securityhub/securityhub_service_test.py +++ b/tests/providers/aws/services/securityhub/securityhub_service_test.py @@ -3,10 +3,7 @@ from unittest.mock import patch import botocore from prowler.providers.aws.services.securityhub.securityhub_service import SecurityHub -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider # Mocking Access Analyzer Calls make_api_call = botocore.client.BaseClient._make_api_call @@ -44,8 +41,8 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -55,13 +52,13 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_SecurityHub_Service: # Test SecurityHub Client def test__get_client__(self): - security_hub = SecurityHub(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])) + security_hub = SecurityHub(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])) assert ( security_hub.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ == "SecurityHub" @@ -69,12 +66,12 @@ class Test_SecurityHub_Service: # Test SecurityHub Session def test__get_session__(self): - security_hub = SecurityHub(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])) + security_hub = SecurityHub(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])) assert security_hub.session.__class__.__name__ == "Session" def test__describe_hub__(self): # Set partition for the service - securityhub = SecurityHub(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])) + securityhub = SecurityHub(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])) assert len(securityhub.securityhubs) == 1 assert ( securityhub.securityhubs[0].arn diff --git a/tests/providers/aws/services/shield/shield_advanced_protection_in_associated_elastic_ips/shield_advanced_protection_in_associated_elastic_ips_test.py b/tests/providers/aws/services/shield/shield_advanced_protection_in_associated_elastic_ips/shield_advanced_protection_in_associated_elastic_ips_test.py index c3277df419..02ed188495 100644 --- a/tests/providers/aws/services/shield/shield_advanced_protection_in_associated_elastic_ips/shield_advanced_protection_in_associated_elastic_ips_test.py +++ b/tests/providers/aws/services/shield/shield_advanced_protection_in_associated_elastic_ips/shield_advanced_protection_in_associated_elastic_ips_test.py @@ -5,16 +5,16 @@ from mock import patch from moto import mock_aws from prowler.providers.aws.services.shield.shield_service import Protection -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -23,7 +23,7 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_shield_advanced_protection_in_associated_elastic_ips: @@ -39,11 +39,11 @@ class Test_shield_advanced_protection_in_associated_elastic_ips: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_associated_elastic_ips.shield_advanced_protection_in_associated_elastic_ips.ec2_client", - new=EC2(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=EC2(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_associated_elastic_ips.shield_advanced_protection_in_associated_elastic_ips import ( @@ -84,11 +84,11 @@ class Test_shield_advanced_protection_in_associated_elastic_ips: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_associated_elastic_ips.shield_advanced_protection_in_associated_elastic_ips.ec2_client", - new=EC2(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=EC2(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_associated_elastic_ips.shield_advanced_protection_in_associated_elastic_ips import ( @@ -128,11 +128,11 @@ class Test_shield_advanced_protection_in_associated_elastic_ips: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_associated_elastic_ips.shield_advanced_protection_in_associated_elastic_ips.ec2_client", - new=EC2(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=EC2(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_associated_elastic_ips.shield_advanced_protection_in_associated_elastic_ips import ( @@ -172,11 +172,11 @@ class Test_shield_advanced_protection_in_associated_elastic_ips: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_associated_elastic_ips.shield_advanced_protection_in_associated_elastic_ips.ec2_client", - new=EC2(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=EC2(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_associated_elastic_ips.shield_advanced_protection_in_associated_elastic_ips import ( diff --git a/tests/providers/aws/services/shield/shield_advanced_protection_in_classic_load_balancers/shield_advanced_protection_in_classic_load_balancers_test.py b/tests/providers/aws/services/shield/shield_advanced_protection_in_classic_load_balancers/shield_advanced_protection_in_classic_load_balancers_test.py index 158ec0f73d..0de173bd94 100644 --- a/tests/providers/aws/services/shield/shield_advanced_protection_in_classic_load_balancers/shield_advanced_protection_in_classic_load_balancers_test.py +++ b/tests/providers/aws/services/shield/shield_advanced_protection_in_classic_load_balancers/shield_advanced_protection_in_classic_load_balancers_test.py @@ -4,10 +4,10 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.shield.shield_service import Protection -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -24,11 +24,11 @@ class Test_shield_advanced_protection_in_classic_load_balancers: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_classic_load_balancers.shield_advanced_protection_in_classic_load_balancers.elb_client", - new=ELB(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=ELB(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_classic_load_balancers.shield_advanced_protection_in_classic_load_balancers import ( @@ -83,11 +83,11 @@ class Test_shield_advanced_protection_in_classic_load_balancers: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_classic_load_balancers.shield_advanced_protection_in_classic_load_balancers.elb_client", - new=ELB(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=ELB(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_classic_load_balancers.shield_advanced_protection_in_classic_load_balancers import ( @@ -141,11 +141,11 @@ class Test_shield_advanced_protection_in_classic_load_balancers: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_classic_load_balancers.shield_advanced_protection_in_classic_load_balancers.elb_client", - new=ELB(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=ELB(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_classic_load_balancers.shield_advanced_protection_in_classic_load_balancers import ( @@ -199,11 +199,11 @@ class Test_shield_advanced_protection_in_classic_load_balancers: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_classic_load_balancers.shield_advanced_protection_in_classic_load_balancers.elb_client", - new=ELB(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=ELB(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_classic_load_balancers.shield_advanced_protection_in_classic_load_balancers import ( diff --git a/tests/providers/aws/services/shield/shield_advanced_protection_in_cloudfront_distributions/shield_advanced_protection_in_cloudfront_distributions_test.py b/tests/providers/aws/services/shield/shield_advanced_protection_in_cloudfront_distributions/shield_advanced_protection_in_cloudfront_distributions_test.py index 336930c14c..3d7883db61 100644 --- a/tests/providers/aws/services/shield/shield_advanced_protection_in_cloudfront_distributions/shield_advanced_protection_in_cloudfront_distributions_test.py +++ b/tests/providers/aws/services/shield/shield_advanced_protection_in_cloudfront_distributions/shield_advanced_protection_in_cloudfront_distributions_test.py @@ -2,10 +2,7 @@ from unittest import mock from prowler.providers.aws.services.cloudfront.cloudfront_service import Distribution from prowler.providers.aws.services.shield.shield_service import Protection -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 class Test_shield_advanced_protection_in_cloudfront_distributions: diff --git a/tests/providers/aws/services/shield/shield_advanced_protection_in_global_accelerators/shield_advanced_protection_in_global_accelerators_test.py b/tests/providers/aws/services/shield/shield_advanced_protection_in_global_accelerators/shield_advanced_protection_in_global_accelerators_test.py index 2c7046fc80..7b435287c8 100644 --- a/tests/providers/aws/services/shield/shield_advanced_protection_in_global_accelerators/shield_advanced_protection_in_global_accelerators_test.py +++ b/tests/providers/aws/services/shield/shield_advanced_protection_in_global_accelerators/shield_advanced_protection_in_global_accelerators_test.py @@ -4,10 +4,7 @@ from prowler.providers.aws.services.globalaccelerator.globalaccelerator_service Accelerator, ) from prowler.providers.aws.services.shield.shield_service import Protection -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 class Test_shield_advanced_protection_in_global_accelerators: diff --git a/tests/providers/aws/services/shield/shield_advanced_protection_in_internet_facing_load_balancers/shield_advanced_protection_in_internet_facing_load_balancers_test.py b/tests/providers/aws/services/shield/shield_advanced_protection_in_internet_facing_load_balancers/shield_advanced_protection_in_internet_facing_load_balancers_test.py index c47683b858..1f9d36124a 100644 --- a/tests/providers/aws/services/shield/shield_advanced_protection_in_internet_facing_load_balancers/shield_advanced_protection_in_internet_facing_load_balancers_test.py +++ b/tests/providers/aws/services/shield/shield_advanced_protection_in_internet_facing_load_balancers/shield_advanced_protection_in_internet_facing_load_balancers_test.py @@ -5,15 +5,12 @@ from mock import patch from moto import mock_aws from prowler.providers.aws.services.shield.shield_service import Protection -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -22,7 +19,7 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_shield_advanced_protection_in_internet_facing_load_balancers: @@ -38,11 +35,11 @@ class Test_shield_advanced_protection_in_internet_facing_load_balancers: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_internet_facing_load_balancers.shield_advanced_protection_in_internet_facing_load_balancers.elbv2_client", - new=ELBv2(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=ELBv2(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_internet_facing_load_balancers.shield_advanced_protection_in_internet_facing_load_balancers import ( @@ -105,11 +102,11 @@ class Test_shield_advanced_protection_in_internet_facing_load_balancers: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_internet_facing_load_balancers.shield_advanced_protection_in_internet_facing_load_balancers.elbv2_client", - new=ELBv2(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=ELBv2(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_internet_facing_load_balancers.shield_advanced_protection_in_internet_facing_load_balancers import ( @@ -180,11 +177,11 @@ class Test_shield_advanced_protection_in_internet_facing_load_balancers: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_internet_facing_load_balancers.shield_advanced_protection_in_internet_facing_load_balancers.elbv2_client", - new=ELBv2(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=ELBv2(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_internet_facing_load_balancers.shield_advanced_protection_in_internet_facing_load_balancers import ( @@ -238,11 +235,11 @@ class Test_shield_advanced_protection_in_internet_facing_load_balancers: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_internet_facing_load_balancers.shield_advanced_protection_in_internet_facing_load_balancers.elbv2_client", - new=ELBv2(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=ELBv2(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_internet_facing_load_balancers.shield_advanced_protection_in_internet_facing_load_balancers import ( @@ -304,11 +301,11 @@ class Test_shield_advanced_protection_in_internet_facing_load_balancers: "prowler.providers.aws.services.shield.shield_service.Shield", new=shield_client, ), mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]), + "prowler.providers.common.common.get_global_provider", + return_value=set_mocked_aws_provider([AWS_REGION_EU_WEST_1]), ), mock.patch( "prowler.providers.aws.services.shield.shield_advanced_protection_in_internet_facing_load_balancers.shield_advanced_protection_in_internet_facing_load_balancers.elbv2_client", - new=ELBv2(set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1])), + new=ELBv2(set_mocked_aws_provider([AWS_REGION_EU_WEST_1])), ): # Test Check from prowler.providers.aws.services.shield.shield_advanced_protection_in_internet_facing_load_balancers.shield_advanced_protection_in_internet_facing_load_balancers import ( diff --git a/tests/providers/aws/services/shield/shield_advanced_protection_in_route53_hosted_zones/shield_advanced_protection_in_route53_hosted_zones_test.py b/tests/providers/aws/services/shield/shield_advanced_protection_in_route53_hosted_zones/shield_advanced_protection_in_route53_hosted_zones_test.py index 8a65fe8115..e3f460eda2 100644 --- a/tests/providers/aws/services/shield/shield_advanced_protection_in_route53_hosted_zones/shield_advanced_protection_in_route53_hosted_zones_test.py +++ b/tests/providers/aws/services/shield/shield_advanced_protection_in_route53_hosted_zones/shield_advanced_protection_in_route53_hosted_zones_test.py @@ -2,7 +2,7 @@ from unittest import mock from prowler.providers.aws.services.route53.route53_service import HostedZone from prowler.providers.aws.services.shield.shield_service import Protection -from tests.providers.aws.audit_info_utils import AWS_REGION_EU_WEST_1 +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1 class Test_shield_advanced_protection_in_route53_hosted_zones: diff --git a/tests/providers/aws/services/shield/shield_service_test.py b/tests/providers/aws/services/shield/shield_service_test.py index 47e00ec73e..5fcef8170d 100644 --- a/tests/providers/aws/services/shield/shield_service_test.py +++ b/tests/providers/aws/services/shield/shield_service_test.py @@ -2,10 +2,10 @@ import botocore from mock import patch from prowler.providers.aws.services.shield.shield_service import Shield -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking Access Analyzer Calls @@ -36,34 +36,34 @@ class Test_Shield_Service: # Test Shield Service def test_service(self): # Shield client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - shield = Shield(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + shield = Shield(aws_provider) assert shield.service == "shield" # Test Shield Client def test_client(self): # Shield client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - shield = Shield(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + shield = Shield(aws_provider) assert shield.client.__class__.__name__ == "Shield" # Test Shield Session def test__get_session__(self): # Shield client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - shield = Shield(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + shield = Shield(aws_provider) assert shield.session.__class__.__name__ == "Session" def test__get_subscription_state__(self): # Shield client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - shield = Shield(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + shield = Shield(aws_provider) assert shield.enabled def test__list_protections__(self): # Shield client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - shield = Shield(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + shield = Shield(aws_provider) protection_id = "a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" protection_name = "Protection for CloudFront distribution" cloudfront_distribution_id = "E198WC25FXOWY8" diff --git a/tests/providers/aws/services/sns/sns_service_test.py b/tests/providers/aws/services/sns/sns_service_test.py index 9d0cfa6db4..bf4696fa12 100644 --- a/tests/providers/aws/services/sns/sns_service_test.py +++ b/tests/providers/aws/services/sns/sns_service_test.py @@ -7,10 +7,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.sns.sns_service import SNS -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) topic_name = "test-topic" @@ -37,8 +37,8 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -47,27 +47,27 @@ def mock_generate_regional_clients(service, audit_info): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_SNS_Service: # Test SNS Service def test_service(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sns = SNS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sns = SNS(aws_provider) assert sns.service == "sns" # Test SNS client def test_client(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sns = SNS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sns = SNS(aws_provider) for reg_client in sns.regional_clients.values(): assert reg_client.__class__.__name__ == "SNS" # Test SNS session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sns = SNS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sns = SNS(aws_provider) assert sns.session.__class__.__name__ == "Session" @mock_aws @@ -81,8 +81,8 @@ class Test_SNS_Service: ], ) - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sns = SNS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sns = SNS(aws_provider) assert len(sns.topics) == 1 assert sns.topics[0].name == topic_name @@ -101,8 +101,8 @@ class Test_SNS_Service: sns_client = client("sns", region_name=AWS_REGION_EU_WEST_1) sns_client.create_topic(Name=topic_name) - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sns = SNS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sns = SNS(aws_provider) assert len(sns.topics) == 1 assert ( diff --git a/tests/providers/aws/services/sns/sns_topics_kms_encryption_at_rest_enabled/sns_topics_kms_encryption_at_rest_enabled_test.py b/tests/providers/aws/services/sns/sns_topics_kms_encryption_at_rest_enabled/sns_topics_kms_encryption_at_rest_enabled_test.py index 29ec8b130a..df2855f89e 100644 --- a/tests/providers/aws/services/sns/sns_topics_kms_encryption_at_rest_enabled/sns_topics_kms_encryption_at_rest_enabled_test.py +++ b/tests/providers/aws/services/sns/sns_topics_kms_encryption_at_rest_enabled/sns_topics_kms_encryption_at_rest_enabled_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.sns.sns_service import Topic -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 kms_key_id = str(uuid4()) topic_name = "test-topic" diff --git a/tests/providers/aws/services/sns/sns_topics_not_publicly_accessible/sns_topics_not_publicly_accessible_test.py b/tests/providers/aws/services/sns/sns_topics_not_publicly_accessible/sns_topics_not_publicly_accessible_test.py index ad6704f1aa..2be9ac514d 100644 --- a/tests/providers/aws/services/sns/sns_topics_not_publicly_accessible/sns_topics_not_publicly_accessible_test.py +++ b/tests/providers/aws/services/sns/sns_topics_not_publicly_accessible/sns_topics_not_publicly_accessible_test.py @@ -2,10 +2,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.sns.sns_service import Topic -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 kms_key_id = str(uuid4()) topic_name = "test-topic" diff --git a/tests/providers/aws/services/sqs/sqs_queues_not_publicly_accessible/sqs_queues_not_publicly_accessible_test.py b/tests/providers/aws/services/sqs/sqs_queues_not_publicly_accessible/sqs_queues_not_publicly_accessible_test.py index ea2a45d4b0..5c8dc1bc91 100644 --- a/tests/providers/aws/services/sqs/sqs_queues_not_publicly_accessible/sqs_queues_not_publicly_accessible_test.py +++ b/tests/providers/aws/services/sqs/sqs_queues_not_publicly_accessible/sqs_queues_not_publicly_accessible_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.sqs.sqs_service import Queue -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 test_queue_name = str(uuid4()) test_queue_url = f"https://sqs.{AWS_REGION_EU_WEST_1}.amazonaws.com/{AWS_ACCOUNT_NUMBER}/{test_queue_name}" diff --git a/tests/providers/aws/services/sqs/sqs_queues_server_side_encryption_enabled/sqs_queues_server_side_encryption_enabled_test.py b/tests/providers/aws/services/sqs/sqs_queues_server_side_encryption_enabled/sqs_queues_server_side_encryption_enabled_test.py index e5f005dfac..e88a323015 100644 --- a/tests/providers/aws/services/sqs/sqs_queues_server_side_encryption_enabled/sqs_queues_server_side_encryption_enabled_test.py +++ b/tests/providers/aws/services/sqs/sqs_queues_server_side_encryption_enabled/sqs_queues_server_side_encryption_enabled_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.sqs.sqs_service import Queue -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 test_kms_key_id = str(uuid4()) test_queue_name = str(uuid4()) diff --git a/tests/providers/aws/services/sqs/sqs_service_test.py b/tests/providers/aws/services/sqs/sqs_service_test.py index 42d784a66c..306ce8a27b 100644 --- a/tests/providers/aws/services/sqs/sqs_service_test.py +++ b/tests/providers/aws/services/sqs/sqs_service_test.py @@ -7,10 +7,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.sqs.sqs_service import SQS -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) test_queue = "test-queue" @@ -39,8 +39,8 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -49,27 +49,27 @@ def mock_generate_regional_clients(service, audit_info): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_SQS_Service: # Test SQS Service def test_service(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sqs = SQS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sqs = SQS(aws_provider) assert sqs.service == "sqs" # Test SQS client def test_client(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sqs = SQS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sqs = SQS(aws_provider) for reg_client in sqs.regional_clients.values(): assert reg_client.__class__.__name__ == "SQS" # Test SQS session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sqs = SQS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sqs = SQS(aws_provider) assert sqs.session.__class__.__name__ == "Session" @mock_aws @@ -77,8 +77,8 @@ class Test_SQS_Service: def test__list_queues__(self): sqs_client = client("sqs", region_name=AWS_REGION_EU_WEST_1) queue = sqs_client.create_queue(QueueName=test_queue, tags={"test": "test"}) - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sqs = SQS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sqs = SQS(aws_provider) assert len(sqs.queues) == 1 assert sqs.queues[0].id == queue["QueueUrl"] assert sqs.queues[0].name == test_queue @@ -96,8 +96,8 @@ class Test_SQS_Service: # sqs_client = client("sqs", region_name=AWS_REGION_EU_WEST_1) # for i in range(0,1050): # sqs_client.create_queue(QueueName=f"{test_queue}-{i}", tags={"test": "test"}) - # audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - # sqs = SQS(audit_info) + # aws_provider =set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + # sqs = SQS(aws_provider) # assert len(sqs.queues) > 1000 @mock_aws @@ -107,8 +107,8 @@ class Test_SQS_Service: queue = sqs_client.create_queue( QueueName=test_queue, ) - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - sqs = SQS(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + sqs = SQS(aws_provider) assert len(sqs.queues) == 1 assert sqs.queues[0].id == queue["QueueUrl"] assert sqs.queues[0].region == AWS_REGION_EU_WEST_1 diff --git a/tests/providers/aws/services/ssm/ssm_document_secrets/ssm_document_secrets_test.py b/tests/providers/aws/services/ssm/ssm_document_secrets/ssm_document_secrets_test.py index 4f20a3578c..cace44e681 100644 --- a/tests/providers/aws/services/ssm/ssm_document_secrets/ssm_document_secrets_test.py +++ b/tests/providers/aws/services/ssm/ssm_document_secrets/ssm_document_secrets_test.py @@ -1,10 +1,7 @@ from unittest import mock from prowler.providers.aws.services.ssm.ssm_service import Document -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_US_EAST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1 class Test_ssm_documents_secrets: diff --git a/tests/providers/aws/services/ssm/ssm_documents_set_as_public/ssm_documents_set_as_public_test.py b/tests/providers/aws/services/ssm/ssm_documents_set_as_public/ssm_documents_set_as_public_test.py index a932c9e474..9b1988f97f 100644 --- a/tests/providers/aws/services/ssm/ssm_documents_set_as_public/ssm_documents_set_as_public_test.py +++ b/tests/providers/aws/services/ssm/ssm_documents_set_as_public/ssm_documents_set_as_public_test.py @@ -1,10 +1,7 @@ from unittest import mock from prowler.providers.aws.services.ssm.ssm_service import Document -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_US_EAST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1 class Test_ssm_documents_set_as_public: diff --git a/tests/providers/aws/services/ssm/ssm_managed_compliant_patching/ssm_managed_compliant_patching_test.py b/tests/providers/aws/services/ssm/ssm_managed_compliant_patching/ssm_managed_compliant_patching_test.py index ce70cc011a..adb12538cb 100644 --- a/tests/providers/aws/services/ssm/ssm_managed_compliant_patching/ssm_managed_compliant_patching_test.py +++ b/tests/providers/aws/services/ssm/ssm_managed_compliant_patching/ssm_managed_compliant_patching_test.py @@ -4,10 +4,7 @@ from prowler.providers.aws.services.ssm.ssm_service import ( ComplianceResource, ResourceStatus, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_US_EAST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1 class Test_ssm_managed_compliant_patching: diff --git a/tests/providers/aws/services/ssm/ssm_service_test.py b/tests/providers/aws/services/ssm/ssm_service_test.py index b92254a2c4..7132b41648 100644 --- a/tests/providers/aws/services/ssm/ssm_service_test.py +++ b/tests/providers/aws/services/ssm/ssm_service_test.py @@ -6,10 +6,10 @@ from boto3 import client from moto import mock_aws from prowler.providers.aws.services.ssm.ssm_service import SSM, ResourceStatus -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) # Mocking Access Analyzer Calls @@ -66,8 +66,8 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -129,26 +129,26 @@ mainSteps: # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_SSM_Service: # Test SSM Client @mock_aws def test__get_client__(self): - ssm = SSM(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + ssm = SSM(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert ssm.regional_clients[AWS_REGION_US_EAST_1].__class__.__name__ == "SSM" # Test SSM Session @mock_aws def test__get_session__(self): - ssm = SSM(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + ssm = SSM(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert ssm.session.__class__.__name__ == "Session" # Test SSM Service @mock_aws def test__get_service__(self): - ssm = SSM(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + ssm = SSM(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) assert ssm.service == "ssm" @mock_aws @@ -172,7 +172,7 @@ class Test_SSM_Service: AccountIdsToAdd=[AWS_ACCOUNT_NUMBER], ) - ssm = SSM(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + ssm = SSM(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) document_arn = f"arn:aws:ssm:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:document/{ssm_document_name}" @@ -190,7 +190,7 @@ class Test_SSM_Service: @mock_aws def test__list_resource_compliance_summaries__(self): - ssm = SSM(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) + ssm = SSM(set_mocked_aws_provider([AWS_REGION_US_EAST_1])) instance_id = "i-1234567890abcdef0" assert len(ssm.compliance_resources) == 1 assert ssm.compliance_resources 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 e21e159f9c..186ee07e99 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 @@ -4,10 +4,7 @@ from prowler.providers.aws.services.ssmincidents.ssmincidents_service import ( ReplicationSet, ResponsePlan, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_US_EAST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1 REPLICATION_SET_ARN = "arn:aws:ssm-incidents::111122223333:replication-set/40bd98f0-4110-2dee-b35e-b87006f9e172" RESPONSE_PLAN_ARN = "arn:aws:ssm-incidents::111122223333:response-plan/example-response" diff --git a/tests/providers/aws/services/ssmincidents/ssmincidents_service_test.py b/tests/providers/aws/services/ssmincidents/ssmincidents_service_test.py index bc1547b0c5..c9732d0414 100644 --- a/tests/providers/aws/services/ssmincidents/ssmincidents_service_test.py +++ b/tests/providers/aws/services/ssmincidents/ssmincidents_service_test.py @@ -6,10 +6,7 @@ import botocore from prowler.providers.aws.services.ssmincidents.ssmincidents_service import ( SSMIncidents, ) -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider REPLICATION_SET_ARN = "arn:aws:ssm-incidents::111122223333:replication-set/40bd98f0-4110-2dee-b35e-b87006f9e172" RESPONSE_PLAN_ARN = "arn:aws:ssm-incidents::111122223333:response-plan/example-response" @@ -54,8 +51,8 @@ def mock_make_api_call(self, operation_name, kwargs): return make_api_call(self, operation_name, kwargs) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_US_EAST_1 ) regional_client.region = AWS_REGION_US_EAST_1 @@ -65,31 +62,31 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_SSMIncidents_Service: def test__get_client__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - ssmincidents = SSMIncidents(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + ssmincidents = SSMIncidents(aws_provider) assert ( ssmincidents.regional_clients[AWS_REGION_US_EAST_1].__class__.__name__ == "SSMIncidents" ) def test__get_service__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - ssmincidents = SSMIncidents(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + ssmincidents = SSMIncidents(aws_provider) assert ssmincidents.service == "ssm-incidents" def test__list_replication_sets__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - ssmincidents = SSMIncidents(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + ssmincidents = SSMIncidents(aws_provider) assert len(ssmincidents.replication_set) == 1 def test__get_replication_set__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - ssmincidents = SSMIncidents(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + ssmincidents = SSMIncidents(aws_provider) assert ssmincidents.replication_set[0].arn == REPLICATION_SET_ARN assert ssmincidents.replication_set[0].status == "ACTIVE" for region in ssmincidents.replication_set[0].region_map: @@ -98,8 +95,8 @@ class Test_SSMIncidents_Service: assert region.sse_kms_id == "DefaultKey" def test__list_response_plans__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - ssmincidents = SSMIncidents(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + ssmincidents = SSMIncidents(aws_provider) assert len(ssmincidents.response_plans) == 1 assert ssmincidents.response_plans[0].arn == RESPONSE_PLAN_ARN assert ssmincidents.response_plans[0].name == "test" @@ -107,7 +104,7 @@ class Test_SSMIncidents_Service: assert ssmincidents.response_plans[0].tags == {"tag_test": "tag_value"} def test__list_tags_for_resource__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - ssmincidents = SSMIncidents(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + ssmincidents = SSMIncidents(aws_provider) assert len(ssmincidents.response_plans) == 1 assert ssmincidents.response_plans[0].tags == {"tag_test": "tag_value"} 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 6c7b228075..3b4d35320d 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 @@ -4,7 +4,7 @@ from prowler.providers.aws.services.trustedadvisor.trustedadvisor_service import Check, PremiumSupport, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, 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 b7f2187f89..8a7b4e1f05 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 @@ -3,7 +3,7 @@ from unittest import mock from prowler.providers.aws.services.trustedadvisor.trustedadvisor_service import ( PremiumSupport, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_ARN, AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, diff --git a/tests/providers/aws/services/trustedadvisor/trustedadvisor_service_test.py b/tests/providers/aws/services/trustedadvisor/trustedadvisor_service_test.py index 1e09d63c96..4528836912 100644 --- a/tests/providers/aws/services/trustedadvisor/trustedadvisor_service_test.py +++ b/tests/providers/aws/services/trustedadvisor/trustedadvisor_service_test.py @@ -6,10 +6,7 @@ from moto import mock_aws from prowler.providers.aws.services.trustedadvisor.trustedadvisor_service import ( TrustedAdvisor, ) -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider make_api_call = botocore.client.BaseClient._make_api_call @@ -40,27 +37,27 @@ class Test_TrustedAdvisor_Service: # Test TrustedAdvisor Service def test_service(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - trustedadvisor = TrustedAdvisor(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + trustedadvisor = TrustedAdvisor(aws_provider) assert trustedadvisor.service == "support" # Test TrustedAdvisor client def test_client(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - trustedadvisor = TrustedAdvisor(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + trustedadvisor = TrustedAdvisor(aws_provider) assert trustedadvisor.client.__class__.__name__ == "Support" # Test TrustedAdvisor session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - trustedadvisor = TrustedAdvisor(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + trustedadvisor = TrustedAdvisor(aws_provider) assert trustedadvisor.session.__class__.__name__ == "Session" @mock_aws # Test TrustedAdvisor session def test__describe_trusted_advisor_checks__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) - trustedadvisor = TrustedAdvisor(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) + trustedadvisor = TrustedAdvisor(aws_provider) assert trustedadvisor.premium_support.enabled assert len(trustedadvisor.checks) == 104 # Default checks assert trustedadvisor.checks[0].region == AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/vpc/vpc_different_regions/vpc_different_regions_test.py b/tests/providers/aws/services/vpc/vpc_different_regions/vpc_different_regions_test.py index 4fd860f612..9199b7aa53 100644 --- a/tests/providers/aws/services/vpc/vpc_different_regions/vpc_different_regions_test.py +++ b/tests/providers/aws/services/vpc/vpc_different_regions/vpc_different_regions_test.py @@ -3,12 +3,11 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_ARN, +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -17,17 +16,17 @@ class Test_vpc_different_regions: def test_no_vpcs(self): from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_different_regions.vpc_different_regions.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ) as vpc_client: # Remove all VPCs vpc_client.vpcs.clear() @@ -53,17 +52,17 @@ class Test_vpc_different_regions: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_different_regions.vpc_different_regions.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_different_regions.vpc_different_regions import ( @@ -80,7 +79,10 @@ class Test_vpc_different_regions: result[0].status_extended == "VPCs found in more than one region." ) assert result[0].resource_id == AWS_ACCOUNT_NUMBER - assert result[0].resource_arn == AWS_ACCOUNT_ARN + assert ( + result[0].resource_arn + == f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:vpc" + ) assert result[0].resource_tags == [] @mock_aws @@ -91,17 +93,17 @@ class Test_vpc_different_regions: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_different_regions.vpc_different_regions.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_different_regions.vpc_different_regions import ( @@ -116,5 +118,8 @@ class Test_vpc_different_regions: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].status_extended == "VPCs found only in one region." assert result[0].resource_id == AWS_ACCOUNT_NUMBER - assert result[0].resource_arn == AWS_ACCOUNT_ARN + assert ( + result[0].resource_arn + == f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:vpc" + ) assert result[0].resource_tags == [] diff --git a/tests/providers/aws/services/vpc/vpc_endpoint_connections_trust_boundaries/vpc_endpoint_connections_trust_boundaries_test.py b/tests/providers/aws/services/vpc/vpc_endpoint_connections_trust_boundaries/vpc_endpoint_connections_trust_boundaries_test.py index 74c1fa496e..296a58b159 100644 --- a/tests/providers/aws/services/vpc/vpc_endpoint_connections_trust_boundaries/vpc_endpoint_connections_trust_boundaries_test.py +++ b/tests/providers/aws/services/vpc/vpc_endpoint_connections_trust_boundaries/vpc_endpoint_connections_trust_boundaries_test.py @@ -4,10 +4,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) TRUSTED_AWS_ACCOUNT_NUMBER = "111122223333" @@ -19,17 +19,17 @@ class Test_vpc_endpoint_connections_trust_boundaries: def test_vpc_no_endpoints(self): from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries import ( @@ -58,17 +58,17 @@ class Test_vpc_endpoint_connections_trust_boundaries: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries import ( @@ -109,17 +109,17 @@ class Test_vpc_endpoint_connections_trust_boundaries: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries import ( @@ -171,17 +171,17 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries import ( @@ -231,17 +231,17 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries import ( @@ -294,17 +294,17 @@ class Test_vpc_endpoint_connections_trust_boundaries: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries import ( @@ -355,20 +355,20 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = { + aws_provider._audit_config = { "trusted_account_ids": [TRUSTED_AWS_ACCOUNT_NUMBER] } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries import ( @@ -418,20 +418,20 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = { + aws_provider._audit_config = { "trusted_account_ids": [TRUSTED_AWS_ACCOUNT_NUMBER] } with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries import ( @@ -486,17 +486,17 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries import ( @@ -546,17 +546,17 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries import ( @@ -613,17 +613,17 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries import ( @@ -680,17 +680,17 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_connections_trust_boundaries.vpc_endpoint_connections_trust_boundaries import ( diff --git a/tests/providers/aws/services/vpc/vpc_endpoint_services_allowed_principals_trust_boundaries/vpc_endpoint_services_allowed_principals_trust_boundaries_test.py b/tests/providers/aws/services/vpc/vpc_endpoint_services_allowed_principals_trust_boundaries/vpc_endpoint_services_allowed_principals_trust_boundaries_test.py index 885294759b..1adea5364e 100644 --- a/tests/providers/aws/services/vpc/vpc_endpoint_services_allowed_principals_trust_boundaries/vpc_endpoint_services_allowed_principals_trust_boundaries_test.py +++ b/tests/providers/aws/services/vpc/vpc_endpoint_services_allowed_principals_trust_boundaries/vpc_endpoint_services_allowed_principals_trust_boundaries_test.py @@ -3,10 +3,10 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) AWS_ACCOUNT_ARN = f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" @@ -19,19 +19,17 @@ class Test_vpc_endpoint_services_allowed_principals_trust_boundaries: def test_no_vpc_endpoint_services(self): from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info( - audited_regions=[AWS_REGION_US_EAST_1] - ) + aws_provider = set_mocked_aws_provider(audited_regions=[AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_endpoint_services_allowed_principals_trust_boundaries import ( @@ -73,19 +71,17 @@ class Test_vpc_endpoint_services_allowed_principals_trust_boundaries: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info( - audited_regions=[AWS_REGION_US_EAST_1] - ) + aws_provider = set_mocked_aws_provider(audited_regions=[AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_endpoint_services_allowed_principals_trust_boundaries import ( @@ -141,19 +137,17 @@ class Test_vpc_endpoint_services_allowed_principals_trust_boundaries: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info( - audited_regions=[AWS_REGION_US_EAST_1] - ) + aws_provider = set_mocked_aws_provider(audited_regions=[AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_endpoint_services_allowed_principals_trust_boundaries import ( @@ -209,19 +203,17 @@ class Test_vpc_endpoint_services_allowed_principals_trust_boundaries: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info( - audited_regions=[AWS_REGION_US_EAST_1] - ) + aws_provider = set_mocked_aws_provider(audited_regions=[AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_endpoint_services_allowed_principals_trust_boundaries import ( @@ -277,19 +269,17 @@ class Test_vpc_endpoint_services_allowed_principals_trust_boundaries: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info( - audited_regions=[AWS_REGION_US_EAST_1] - ) + aws_provider = set_mocked_aws_provider(audited_regions=[AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = {"trusted_account_ids": []} + aws_provider._audit_config = {"trusted_account_ids": []} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_endpoint_services_allowed_principals_trust_boundaries import ( @@ -347,21 +337,17 @@ class Test_vpc_endpoint_services_allowed_principals_trust_boundaries: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info( - audited_regions=[AWS_REGION_US_EAST_1] - ) + aws_provider = set_mocked_aws_provider(audited_regions=[AWS_REGION_US_EAST_1]) # Set config variable - current_audit_info.audit_config = { - "trusted_account_ids": [AWS_ACCOUNT_NUMBER_2] - } + aws_provider._audit_config = {"trusted_account_ids": [AWS_ACCOUNT_NUMBER_2]} with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_endpoint_services_allowed_principals_trust_boundaries.vpc_endpoint_services_allowed_principals_trust_boundaries import ( diff --git a/tests/providers/aws/services/vpc/vpc_flow_logs_enabled/vpc_flow_logs_enabled_test.py b/tests/providers/aws/services/vpc/vpc_flow_logs_enabled/vpc_flow_logs_enabled_test.py index f6cc27bc9f..fc725dd2f2 100644 --- a/tests/providers/aws/services/vpc/vpc_flow_logs_enabled/vpc_flow_logs_enabled_test.py +++ b/tests/providers/aws/services/vpc/vpc_flow_logs_enabled/vpc_flow_logs_enabled_test.py @@ -3,11 +3,11 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -16,16 +16,16 @@ class Test_vpc_flow_logs_enabled: def test_vpc_only_default_vpcs(self): from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.vpc.vpc_flow_logs_enabled.vpc_flow_logs_enabled.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_flow_logs_enabled.vpc_flow_logs_enabled import ( @@ -67,16 +67,16 @@ class Test_vpc_flow_logs_enabled: + ":role/test-role", ) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.vpc.vpc_flow_logs_enabled.vpc_flow_logs_enabled.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_flow_logs_enabled.vpc_flow_logs_enabled import ( @@ -104,16 +104,16 @@ class Test_vpc_flow_logs_enabled: vpc = ec2_client.create_vpc(CidrBlock="10.0.0.0/16")["Vpc"] - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.vpc.vpc_flow_logs_enabled.vpc_flow_logs_enabled.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_flow_logs_enabled.vpc_flow_logs_enabled import ( @@ -142,17 +142,17 @@ class Test_vpc_flow_logs_enabled: ec2_client.create_vpc(CidrBlock="10.0.0.0/16")["Vpc"] - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - current_audit_info.ignore_unused_services = True + aws_provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.vpc.vpc_flow_logs_enabled.vpc_flow_logs_enabled.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_flow_logs_enabled.vpc_flow_logs_enabled import ( @@ -174,17 +174,17 @@ class Test_vpc_flow_logs_enabled: vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16") subnet = ec2.create_subnet(VpcId=vpc.id, CidrBlock="10.0.0.0/18") ec2.create_network_interface(SubnetId=subnet.id) - current_audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - current_audit_info.ignore_unused_services = True + aws_provider._ignore_unused_services = True with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ), mock.patch( "prowler.providers.aws.services.vpc.vpc_flow_logs_enabled.vpc_flow_logs_enabled.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_flow_logs_enabled.vpc_flow_logs_enabled import ( diff --git a/tests/providers/aws/services/vpc/vpc_peering_routing_tables_with_least_privilege/vpc_peering_routing_tables_with_least_privilege_test.py b/tests/providers/aws/services/vpc/vpc_peering_routing_tables_with_least_privilege/vpc_peering_routing_tables_with_least_privilege_test.py index 3fca4ab057..4d7979432e 100644 --- a/tests/providers/aws/services/vpc/vpc_peering_routing_tables_with_least_privilege/vpc_peering_routing_tables_with_least_privilege_test.py +++ b/tests/providers/aws/services/vpc/vpc_peering_routing_tables_with_least_privilege/vpc_peering_routing_tables_with_least_privilege_test.py @@ -3,10 +3,7 @@ from unittest import mock from boto3 import client, resource from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_vpc_peering_routing_tables_with_least_privilege: @@ -14,15 +11,15 @@ class Test_vpc_peering_routing_tables_with_least_privilege: def test_vpc_no_peering_connections(self): from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_peering_routing_tables_with_least_privilege.vpc_peering_routing_tables_with_least_privilege.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): # Test Check from prowler.providers.aws.services.vpc.vpc_peering_routing_tables_with_least_privilege.vpc_peering_routing_tables_with_least_privilege import ( @@ -64,15 +61,15 @@ class Test_vpc_peering_routing_tables_with_least_privilege: from prowler.providers.aws.services.vpc.vpc_service import VPC, Route - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_peering_routing_tables_with_least_privilege.vpc_peering_routing_tables_with_least_privilege.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ) as service_client: # Test Check from prowler.providers.aws.services.vpc.vpc_peering_routing_tables_with_least_privilege.vpc_peering_routing_tables_with_least_privilege import ( @@ -129,15 +126,15 @@ class Test_vpc_peering_routing_tables_with_least_privilege: from prowler.providers.aws.services.vpc.vpc_service import VPC, Route - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_peering_routing_tables_with_least_privilege.vpc_peering_routing_tables_with_least_privilege.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ) as service_client: # Test Check from prowler.providers.aws.services.vpc.vpc_peering_routing_tables_with_least_privilege.vpc_peering_routing_tables_with_least_privilege import ( @@ -196,15 +193,15 @@ class Test_vpc_peering_routing_tables_with_least_privilege: from prowler.providers.aws.services.vpc.vpc_service import VPC, Route - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_peering_routing_tables_with_least_privilege.vpc_peering_routing_tables_with_least_privilege.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ) as service_client: # Test Check from prowler.providers.aws.services.vpc.vpc_peering_routing_tables_with_least_privilege.vpc_peering_routing_tables_with_least_privilege import ( diff --git a/tests/providers/aws/services/vpc/vpc_service_test.py b/tests/providers/aws/services/vpc/vpc_service_test.py index c4317fc932..c02ed1e3b9 100644 --- a/tests/providers/aws/services/vpc/vpc_service_test.py +++ b/tests/providers/aws/services/vpc/vpc_service_test.py @@ -4,11 +4,11 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC, Route -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) @@ -18,20 +18,20 @@ class Test_VPC_Service: @mock_aws def test_service(self): # VPC client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - vpc = VPC(audit_info) + vpc = VPC(aws_provider) assert vpc.service == "ec2" # Test VPC Client @mock_aws def test_client(self): # VPC client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - vpc = VPC(audit_info) + vpc = VPC(aws_provider) for regional_client in vpc.regional_clients.values(): assert regional_client.__class__.__name__ == "EC2" @@ -39,20 +39,20 @@ class Test_VPC_Service: @mock_aws def test__get_session__(self): # VPC client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - vpc = VPC(audit_info) + vpc = VPC(aws_provider) assert vpc.session.__class__.__name__ == "Session" # Test VPC Session @mock_aws def test_audited_account(self): # VPC client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - vpc = VPC(audit_info) + vpc = VPC(aws_provider) assert vpc.audited_account == AWS_ACCOUNT_NUMBER # Test VPC Describe VPCs @@ -73,10 +73,10 @@ class Test_VPC_Service: ], )["Vpc"] # VPC client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - vpc = VPC(audit_info) + vpc = VPC(aws_provider) assert ( len(vpc.vpcs) == 3 ) # Number of AWS regions + created VPC, one default VPC per region @@ -104,10 +104,10 @@ class Test_VPC_Service: + ":role/test-role", ) # VPC client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - vpc = VPC(audit_info) + vpc = VPC(aws_provider) # Search created VPC among default ones for vpc_iter in vpc.vpcs.values(): if vpc_iter.id == new_vpc["VpcId"]: @@ -139,10 +139,10 @@ class Test_VPC_Service: VpcPeeringConnectionId=vpc_pcx_id ) # VPC client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - vpc = VPC(audit_info) + vpc = VPC(aws_provider) assert len(vpc.vpc_peering_connections) == 1 assert vpc.vpc_peering_connections[0].id == vpc_pcx_id assert vpc.vpc_peering_connections[0].tags == [ @@ -180,10 +180,10 @@ class Test_VPC_Service: # ) # VPC client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - vpc = VPC(audit_info) + vpc = VPC(aws_provider) vpc.vpc_peering_connections[0].route_tables = [ Route( id=main_route_table_id, @@ -229,10 +229,10 @@ class Test_VPC_Service: ], )["VpcEndpoint"]["VpcEndpointId"] # VPC client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - vpc = VPC(audit_info) + vpc = VPC(aws_provider) assert len(vpc.vpc_endpoints) == 1 assert vpc.vpc_endpoints[0].id == endpoint assert vpc.vpc_endpoints[0].tags == [ @@ -278,10 +278,10 @@ class Test_VPC_Service: endpoint_service = endpoint["ServiceConfiguration"]["ServiceName"] # VPC client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - vpc = VPC(audit_info) + vpc = VPC(aws_provider) for vpce in vpc.vpc_endpoint_services: assert vpce.arn == endpoint_arn @@ -307,10 +307,10 @@ class Test_VPC_Service: AvailabilityZone=f"{AWS_REGION_US_EAST_1}a", ) # VPC client for this test class - audit_info = set_mocked_aws_audit_info( + aws_provider = set_mocked_aws_provider( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] ) - vpc = VPC(audit_info) + vpc = VPC(aws_provider) assert ( len(vpc.vpcs) == 3 ) # Number of AWS regions + created VPC, one default VPC per region diff --git a/tests/providers/aws/services/vpc/vpc_subnet_different_az/vpc_subnet_different_az_test.py b/tests/providers/aws/services/vpc/vpc_subnet_different_az/vpc_subnet_different_az_test.py index bf082e9916..98bcf497d3 100644 --- a/tests/providers/aws/services/vpc/vpc_subnet_different_az/vpc_subnet_different_az_test.py +++ b/tests/providers/aws/services/vpc/vpc_subnet_different_az/vpc_subnet_different_az_test.py @@ -3,10 +3,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_vpc_subnet_different_az: @@ -41,15 +38,15 @@ class Test_vpc_subnet_different_az: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_subnet_different_az.vpc_subnet_different_az.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): from prowler.providers.aws.services.vpc.vpc_subnet_different_az.vpc_subnet_different_az import ( vpc_subnet_different_az, @@ -97,15 +94,15 @@ class Test_vpc_subnet_different_az: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_subnet_different_az.vpc_subnet_different_az.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): from prowler.providers.aws.services.vpc.vpc_subnet_different_az.vpc_subnet_different_az import ( vpc_subnet_different_az, @@ -138,15 +135,15 @@ class Test_vpc_subnet_different_az: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_subnet_different_az.vpc_subnet_different_az.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): from prowler.providers.aws.services.vpc.vpc_subnet_different_az.vpc_subnet_different_az import ( vpc_subnet_different_az, diff --git a/tests/providers/aws/services/vpc/vpc_subnet_no_public_ip_by_default/vpc_subnet_no_public_ip_by_default_test.py b/tests/providers/aws/services/vpc/vpc_subnet_no_public_ip_by_default/vpc_subnet_no_public_ip_by_default_test.py index 543db22e46..ef3691e27e 100644 --- a/tests/providers/aws/services/vpc/vpc_subnet_no_public_ip_by_default/vpc_subnet_no_public_ip_by_default_test.py +++ b/tests/providers/aws/services/vpc/vpc_subnet_no_public_ip_by_default/vpc_subnet_no_public_ip_by_default_test.py @@ -3,10 +3,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_vpc_subnet_no_public_ip_by_default: @@ -37,15 +34,15 @@ class Test_vpc_subnet_no_public_ip_by_default: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_subnet_no_public_ip_by_default.vpc_subnet_no_public_ip_by_default.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): from prowler.providers.aws.services.vpc.vpc_subnet_no_public_ip_by_default.vpc_subnet_no_public_ip_by_default import ( vpc_subnet_no_public_ip_by_default, @@ -81,15 +78,15 @@ class Test_vpc_subnet_no_public_ip_by_default: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_subnet_no_public_ip_by_default.vpc_subnet_no_public_ip_by_default.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): from prowler.providers.aws.services.vpc.vpc_subnet_no_public_ip_by_default.vpc_subnet_no_public_ip_by_default import ( vpc_subnet_no_public_ip_by_default, diff --git a/tests/providers/aws/services/vpc/vpc_subnet_separate_private_public/vpc_subnet_separate_private_public_test.py b/tests/providers/aws/services/vpc/vpc_subnet_separate_private_public/vpc_subnet_separate_private_public_test.py index 9cccbf9e81..ac14ebed6e 100644 --- a/tests/providers/aws/services/vpc/vpc_subnet_separate_private_public/vpc_subnet_separate_private_public_test.py +++ b/tests/providers/aws/services/vpc/vpc_subnet_separate_private_public/vpc_subnet_separate_private_public_test.py @@ -3,10 +3,7 @@ from unittest import mock from boto3 import client from moto import mock_aws -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_US_EAST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_US_EAST_1, set_mocked_aws_provider class Test_vpc_subnet_separate_private_public: @@ -45,15 +42,15 @@ class Test_vpc_subnet_separate_private_public: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_subnet_separate_private_public.vpc_subnet_separate_private_public.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): from prowler.providers.aws.services.vpc.vpc_subnet_separate_private_public.vpc_subnet_separate_private_public import ( vpc_subnet_separate_private_public, @@ -107,15 +104,15 @@ class Test_vpc_subnet_separate_private_public: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_subnet_separate_private_public.vpc_subnet_separate_private_public.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): from prowler.providers.aws.services.vpc.vpc_subnet_separate_private_public.vpc_subnet_separate_private_public import ( vpc_subnet_separate_private_public, @@ -184,15 +181,15 @@ class Test_vpc_subnet_separate_private_public: from prowler.providers.aws.services.vpc.vpc_service import VPC - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_US_EAST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.vpc.vpc_subnet_separate_private_public.vpc_subnet_separate_private_public.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): from prowler.providers.aws.services.vpc.vpc_subnet_separate_private_public.vpc_subnet_separate_private_public import ( vpc_subnet_separate_private_public, diff --git a/tests/providers/aws/services/waf/waf_service_test.py b/tests/providers/aws/services/waf/waf_service_test.py index c6c2305ca6..e28a91be42 100644 --- a/tests/providers/aws/services/waf/waf_service_test.py +++ b/tests/providers/aws/services/waf/waf_service_test.py @@ -3,10 +3,7 @@ from unittest.mock import patch import botocore from prowler.providers.aws.services.waf.waf_service import WAF -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider # Mocking WAF-Regional Calls make_api_call = botocore.client.BaseClient._make_api_call @@ -31,8 +28,8 @@ def mock_make_api_call(self, operation_name, kwarg): # Mock generate_regional_clients() -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -42,37 +39,37 @@ def mock_generate_regional_clients(service, audit_info): # Patch every AWS call using Boto3 and generate_regional_clients to have 1 client @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_WAF_Service: # Test WAF Service def test_service(self): # WAF client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - waf = WAF(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + waf = WAF(aws_provider) assert waf.service == "waf-regional" # Test WAF Client def test_client(self): # WAF client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - waf = WAF(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + waf = WAF(aws_provider) for regional_client in waf.regional_clients.values(): assert regional_client.__class__.__name__ == "WAFRegional" # Test WAF Session def test__get_session__(self): # WAF client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - waf = WAF(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + waf = WAF(aws_provider) assert waf.session.__class__.__name__ == "Session" # Test WAF Describe Web ACLs def test__list_web_acls__(self): # WAF client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - waf = WAF(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + waf = WAF(aws_provider) assert len(waf.web_acls) == 1 assert waf.web_acls[0].name == "my-web-acl" assert waf.web_acls[0].region == AWS_REGION_EU_WEST_1 @@ -81,8 +78,8 @@ class Test_WAF_Service: # Test WAF Describe Web ACLs Resources def test__list_resources_for_web_acl__(self): # WAF client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - waf = WAF(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + waf = WAF(aws_provider) assert len(waf.web_acls) == 1 assert len(waf.web_acls[0].albs) == 1 assert "alb-arn" in waf.web_acls[0].albs diff --git a/tests/providers/aws/services/wafv2/wafv2_service_test.py b/tests/providers/aws/services/wafv2/wafv2_service_test.py index f8af8ce43b..f610d3cdbd 100644 --- a/tests/providers/aws/services/wafv2/wafv2_service_test.py +++ b/tests/providers/aws/services/wafv2/wafv2_service_test.py @@ -2,10 +2,7 @@ from boto3 import client, resource from moto import mock_aws from prowler.providers.aws.services.wafv2.wafv2_service import WAFv2 -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider class Test_WAFv2_Service: @@ -13,16 +10,16 @@ class Test_WAFv2_Service: @mock_aws def test_service(self): # WAFv2 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - wafv2 = WAFv2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + wafv2 = WAFv2(aws_provider) assert wafv2.service == "wafv2" # Test WAFv2 Client @mock_aws def test_client(self): # WAFv2 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - wafv2 = WAFv2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + wafv2 = WAFv2(aws_provider) for regional_client in wafv2.regional_clients.values(): assert regional_client.__class__.__name__ == "WAFV2" @@ -30,8 +27,8 @@ class Test_WAFv2_Service: @mock_aws def test__get_session__(self): # WAFv2 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - wafv2 = WAFv2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + wafv2 = WAFv2(aws_provider) assert wafv2.session.__class__.__name__ == "Session" # Test WAFv2 Describe Web ACLs @@ -49,8 +46,8 @@ class Test_WAFv2_Service: }, )["Summary"] # WAFv2 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - wafv2 = WAFv2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + wafv2 = WAFv2(aws_provider) assert len(wafv2.web_acls) == 1 assert wafv2.web_acls[0].name == waf["Name"] assert wafv2.web_acls[0].region == AWS_REGION_EU_WEST_1 @@ -98,8 +95,8 @@ class Test_WAFv2_Service: wafv2.associate_web_acl(WebACLArn=waf["ARN"], ResourceArn=lb["LoadBalancerArn"]) # WAFv2 client for this test class - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - wafv2 = WAFv2(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + wafv2 = WAFv2(aws_provider) wafv2.web_acls[0].albs.append(lb["LoadBalancerArn"]) assert len(wafv2.web_acls) == 1 assert len(wafv2.web_acls[0].albs) == 1 diff --git a/tests/providers/aws/services/wafv2/wafv2_webacl_logging_enabled/wafv2_webacl_logging_enabled_test.py b/tests/providers/aws/services/wafv2/wafv2_webacl_logging_enabled/wafv2_webacl_logging_enabled_test.py index 1f557324c7..b94ccd912d 100644 --- a/tests/providers/aws/services/wafv2/wafv2_webacl_logging_enabled/wafv2_webacl_logging_enabled_test.py +++ b/tests/providers/aws/services/wafv2/wafv2_webacl_logging_enabled/wafv2_webacl_logging_enabled_test.py @@ -2,10 +2,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.wafv2.wafv2_service import WebAclv2 -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 waf_id = str(uuid4()) waf_name = "waf-example" diff --git a/tests/providers/aws/services/wellarchitected/wellarchitected_service_test.py b/tests/providers/aws/services/wellarchitected/wellarchitected_service_test.py index 8a32598aaa..fea710ec37 100644 --- a/tests/providers/aws/services/wellarchitected/wellarchitected_service_test.py +++ b/tests/providers/aws/services/wellarchitected/wellarchitected_service_test.py @@ -6,10 +6,10 @@ import botocore from prowler.providers.aws.services.wellarchitected.wellarchitected_service import ( WellArchitected, ) -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) workload_id = str(uuid4()) @@ -40,8 +40,8 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -50,33 +50,33 @@ def mock_generate_regional_clients(service, audit_info): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_WellArchitected_Service: # Test WellArchitected Service def test_service(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - wellarchitected = WellArchitected(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + wellarchitected = WellArchitected(aws_provider) assert wellarchitected.service == "wellarchitected" # Test WellArchitected client def test_client(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - wellarchitected = WellArchitected(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + wellarchitected = WellArchitected(aws_provider) for reg_client in wellarchitected.regional_clients.values(): assert reg_client.__class__.__name__ == "WellArchitected" # Test WellArchitected session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - wellarchitected = WellArchitected(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + wellarchitected = WellArchitected(aws_provider) assert wellarchitected.session.__class__.__name__ == "Session" # Test WellArchitected list workloads def test__list_workloads__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - wellarchitected = WellArchitected(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + wellarchitected = WellArchitected(aws_provider) assert len(wellarchitected.workloads) == 1 assert wellarchitected.workloads[0].id == workload_id assert ( diff --git a/tests/providers/aws/services/wellarchitected/wellarchitected_workload_no_high_or_medium_risks/wellarchitected_workload_no_high_or_medium_risks_test.py b/tests/providers/aws/services/wellarchitected/wellarchitected_workload_no_high_or_medium_risks/wellarchitected_workload_no_high_or_medium_risks_test.py index 99e0ce765f..950404830e 100644 --- a/tests/providers/aws/services/wellarchitected/wellarchitected_workload_no_high_or_medium_risks/wellarchitected_workload_no_high_or_medium_risks_test.py +++ b/tests/providers/aws/services/wellarchitected/wellarchitected_workload_no_high_or_medium_risks/wellarchitected_workload_no_high_or_medium_risks_test.py @@ -5,10 +5,7 @@ from uuid import uuid4 from prowler.providers.aws.services.wellarchitected.wellarchitected_service import ( Workload, ) -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 workload_id = str(uuid4()) diff --git a/tests/providers/aws/services/workspaces/workspaces_service_test.py b/tests/providers/aws/services/workspaces/workspaces_service_test.py index 4b66ad908d..00fb7b25bd 100644 --- a/tests/providers/aws/services/workspaces/workspaces_service_test.py +++ b/tests/providers/aws/services/workspaces/workspaces_service_test.py @@ -4,10 +4,7 @@ from uuid import uuid4 import botocore from prowler.providers.aws.services.workspaces.workspaces_service import WorkSpaces -from tests.providers.aws.audit_info_utils import ( - AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, -) +from tests.providers.aws.utils import AWS_REGION_EU_WEST_1, set_mocked_aws_provider workspace_id = str(uuid4()) @@ -35,8 +32,8 @@ def mock_make_api_call(self, operation_name, kwarg): return make_api_call(self, operation_name, kwarg) -def mock_generate_regional_clients(service, audit_info): - regional_client = audit_info.audit_session.client( +def mock_generate_regional_clients(provider, service): + regional_client = provider._session.current_session.client( service, region_name=AWS_REGION_EU_WEST_1 ) regional_client.region = AWS_REGION_EU_WEST_1 @@ -45,33 +42,33 @@ def mock_generate_regional_clients(service, audit_info): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) @patch( - "prowler.providers.aws.lib.service.service.generate_regional_clients", + "prowler.providers.aws.aws_provider.AwsProvider.generate_regional_clients", new=mock_generate_regional_clients, ) class Test_WorkSpaces_Service: # Test WorkSpaces Service def test_service(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - workspaces = WorkSpaces(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + workspaces = WorkSpaces(aws_provider) assert workspaces.service == "workspaces" # Test WorkSpaces client def test_client(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - workspaces = WorkSpaces(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + workspaces = WorkSpaces(aws_provider) for reg_client in workspaces.regional_clients.values(): assert reg_client.__class__.__name__ == "WorkSpaces" # Test WorkSpaces session def test__get_session__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - workspaces = WorkSpaces(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + workspaces = WorkSpaces(aws_provider) assert workspaces.session.__class__.__name__ == "Session" # Test WorkSpaces describe workspaces def test__describe_workspaces__(self): - audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) - workspaces = WorkSpaces(audit_info) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) + workspaces = WorkSpaces(aws_provider) assert len(workspaces.workspaces) == 1 assert workspaces.workspaces[0].id == workspace_id assert workspaces.workspaces[0].region == AWS_REGION_EU_WEST_1 diff --git a/tests/providers/aws/services/workspaces/workspaces_volume_encryption_enabled/workspaces_volume_encryption_enabled_test.py b/tests/providers/aws/services/workspaces/workspaces_volume_encryption_enabled/workspaces_volume_encryption_enabled_test.py index 5ae74c3ff5..6767547fdb 100644 --- a/tests/providers/aws/services/workspaces/workspaces_volume_encryption_enabled/workspaces_volume_encryption_enabled_test.py +++ b/tests/providers/aws/services/workspaces/workspaces_volume_encryption_enabled/workspaces_volume_encryption_enabled_test.py @@ -3,10 +3,7 @@ from unittest import mock from uuid import uuid4 from prowler.providers.aws.services.workspaces.workspaces_service import WorkSpace -from tests.providers.aws.audit_info_utils import ( - AWS_ACCOUNT_NUMBER, - AWS_REGION_EU_WEST_1, -) +from tests.providers.aws.utils import AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1 WORKSPACE_ID = str(uuid4()) WORKSPACE_ARN = f"arn:aws:workspaces:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:workspace/{WORKSPACE_ID}" diff --git a/tests/providers/aws/services/workspaces/workspaces_vpc_2private_1public_subnets_nat/workspaces_vpc_2private_1public_subnets_nat_test.py b/tests/providers/aws/services/workspaces/workspaces_vpc_2private_1public_subnets_nat/workspaces_vpc_2private_1public_subnets_nat_test.py index 55522532c9..5e49989fb6 100644 --- a/tests/providers/aws/services/workspaces/workspaces_vpc_2private_1public_subnets_nat/workspaces_vpc_2private_1public_subnets_nat_test.py +++ b/tests/providers/aws/services/workspaces/workspaces_vpc_2private_1public_subnets_nat/workspaces_vpc_2private_1public_subnets_nat_test.py @@ -6,10 +6,10 @@ from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from prowler.providers.aws.services.workspaces.workspaces_service import WorkSpace -from tests.providers.aws.audit_info_utils import ( +from tests.providers.aws.utils import ( AWS_ACCOUNT_NUMBER, AWS_REGION_EU_WEST_1, - set_mocked_aws_audit_info, + set_mocked_aws_provider, ) WORKSPACE_ID = str(uuid4()) @@ -52,15 +52,15 @@ class Test_workspaces_vpc_2private_1public_subnets_nat: ) ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.workspaces.workspaces_vpc_2private_1public_subnets_nat.workspaces_vpc_2private_1public_subnets_nat.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): with mock.patch( "prowler.providers.aws.services.workspaces.workspaces_vpc_2private_1public_subnets_nat.workspaces_vpc_2private_1public_subnets_nat.workspaces_client", @@ -120,15 +120,15 @@ class Test_workspaces_vpc_2private_1public_subnets_nat: ) ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.workspaces.workspaces_vpc_2private_1public_subnets_nat.workspaces_vpc_2private_1public_subnets_nat.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): with mock.patch( "prowler.providers.aws.services.workspaces.workspaces_vpc_2private_1public_subnets_nat.workspaces_vpc_2private_1public_subnets_nat.workspaces_client", @@ -205,15 +205,15 @@ class Test_workspaces_vpc_2private_1public_subnets_nat: ) ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.workspaces.workspaces_vpc_2private_1public_subnets_nat.workspaces_vpc_2private_1public_subnets_nat.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): with mock.patch( "prowler.providers.aws.services.workspaces.workspaces_vpc_2private_1public_subnets_nat.workspaces_vpc_2private_1public_subnets_nat.workspaces_client", @@ -309,15 +309,15 @@ class Test_workspaces_vpc_2private_1public_subnets_nat: ) ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.workspaces.workspaces_vpc_2private_1public_subnets_nat.workspaces_vpc_2private_1public_subnets_nat.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): with mock.patch( "prowler.providers.aws.services.workspaces.workspaces_vpc_2private_1public_subnets_nat.workspaces_vpc_2private_1public_subnets_nat.workspaces_client", @@ -421,15 +421,15 @@ class Test_workspaces_vpc_2private_1public_subnets_nat: ) ) - current_audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) + aws_provider = set_mocked_aws_provider([AWS_REGION_EU_WEST_1]) with mock.patch( - "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info", - new=current_audit_info, + "prowler.providers.common.common.get_global_provider", + return_value=aws_provider, ): with mock.patch( "prowler.providers.aws.services.workspaces.workspaces_vpc_2private_1public_subnets_nat.workspaces_vpc_2private_1public_subnets_nat.vpc_client", - new=VPC(current_audit_info), + new=VPC(aws_provider), ): with mock.patch( "prowler.providers.aws.services.workspaces.workspaces_vpc_2private_1public_subnets_nat.workspaces_vpc_2private_1public_subnets_nat.workspaces_client", diff --git a/tests/providers/aws/audit_info_utils.py b/tests/providers/aws/utils.py similarity index 59% rename from tests/providers/aws/audit_info_utils.py rename to tests/providers/aws/utils.py index d24c797a98..b4ca0b7e07 100644 --- a/tests/providers/aws/audit_info_utils.py +++ b/tests/providers/aws/utils.py @@ -1,6 +1,10 @@ -from boto3 import session +from argparse import Namespace -from prowler.providers.aws.lib.audit_info.models import AWS_Assume_Role, AWS_Audit_Info +from boto3 import session +from botocore.config import Config +from moto import mock_aws + +from prowler.providers.aws.aws_provider import AwsProvider from prowler.providers.common.models import Audit_Metadata # Root AWS Account @@ -73,49 +77,56 @@ AWS_CHINA_PARTITION = "aws-cn" AWS_ISO_PARTITION = "aws-iso" -# Mocked AWS Audit Info -def set_mocked_aws_audit_info( - audited_regions: [str] = [], +# Mocked AWS Provider +# This here causes to call this function mocking the AWS calls +@mock_aws +def set_mocked_aws_provider( + audited_regions: list[str] = [], audited_account: str = AWS_ACCOUNT_NUMBER, audited_account_arn: str = AWS_ACCOUNT_ARN, audited_partition: str = AWS_COMMERCIAL_PARTITION, - expected_checks: [str] = [], + expected_checks: list[str] = [], profile_region: str = None, audit_config: dict = {}, ignore_unused_services: bool = False, - assumed_role_info: AWS_Assume_Role = None, + # assumed_role_info: AWSAssumeRole = None, audit_session: session.Session = session.Session( profile_name=None, botocore_session=None, ), original_session: session.Session = None, enabled_regions: set = None, -): - audit_info = AWS_Audit_Info( - session_config=None, - original_session=original_session, - audit_session=audit_session, - audited_account=audited_account, - audited_account_arn=audited_account_arn, - audited_user_id=None, - audited_partition=audited_partition, - audited_identity_arn=None, - profile=None, - profile_region=profile_region, - credentials=None, - assumed_role_info=assumed_role_info, - audited_regions=audited_regions, - organizations_metadata=None, - audit_resources=[], - mfa_enabled=False, - audit_metadata=Audit_Metadata( - services_scanned=0, - expected_checks=expected_checks, - completed_checks=0, - audit_progress=0, - ), - audit_config=audit_config, - ignore_unused_services=ignore_unused_services, - enabled_regions=enabled_regions if enabled_regions else set(audited_regions), +) -> AwsProvider: + # Create default AWS Provider + provider = AwsProvider(Namespace()) + # Mock Session + provider._session.session_config = None + provider._session.original_session = original_session + provider._session.current_session = audit_session + provider._session.session_config = Config() + # Mock Identity + provider._identity.account = audited_account + provider._identity.account_arn = audited_account_arn + provider._identity.user_id = None + provider._identity.partition = audited_partition + provider._identity.identity_arn = None + provider._identity.profile = None + provider._identity.profile_region = profile_region + provider._identity.audited_regions = audited_regions + # Mock Configiration + provider._ignore_unused_services = ignore_unused_services + provider._enabled_regions = ( + enabled_regions if enabled_regions else set(audited_regions) ) - return audit_info + # TODO: we can create the organizations metadata here with moto + provider._organizations_metadata = None + provider._audit_resources = [] + provider._audit_config = audit_config + provider.audit_metadata = Audit_Metadata( + services_scanned=0, + expected_checks=expected_checks, + completed_checks=0, + audit_progress=0, + ) + + return provider diff --git a/tests/providers/common/audit_info_test.py b/tests/providers/common/audit_info_test.py index 2a252bde66..bfbcbb2953 100644 --- a/tests/providers/common/audit_info_test.py +++ b/tests/providers/common/audit_info_test.py @@ -6,7 +6,6 @@ from mock import patch from moto import mock_aws from prowler.config.config import default_config_file_path -from prowler.providers.aws.lib.audit_info.models import AWS_Assume_Role, AWS_Audit_Info from prowler.providers.azure.azure_provider import Azure_Provider from prowler.providers.azure.lib.audit_info.models import ( Azure_Audit_Info, @@ -107,6 +106,7 @@ def mock_get_context_user_roles(*_): class Test_Set_Audit_Info: # Mocked Audit Info def set_mocked_audit_info(self): + # TODO(Audit_Info): use provider here, and common helper from utils audit_info = AWS_Audit_Info( session_config=None, original_session=None, @@ -388,6 +388,7 @@ class Test_Set_Audit_Info: } audit_info = set_provider_audit_info(provider, arguments) + # TODO(Audit_Info): use provider here assert isinstance(audit_info, AWS_Audit_Info) def test_set_audit_info_aws_bad_session_duration(self): diff --git a/tests/providers/common/common_outputs_test.py b/tests/providers/common/common_outputs_test.py index d5877e1821..8893ca209d 100644 --- a/tests/providers/common/common_outputs_test.py +++ b/tests/providers/common/common_outputs_test.py @@ -1,16 +1,13 @@ from argparse import Namespace from os import rmdir -from boto3 import session from mock import patch -from prowler.providers.aws.lib.audit_info.audit_info import AWS_Audit_Info from prowler.providers.azure.lib.audit_info.audit_info import ( Azure_Audit_Info, AzureIdentityInfo, AzureRegionConfig, ) -from prowler.providers.common.models import Audit_Metadata from prowler.providers.common.outputs import ( Aws_Output_Options, Azure_Output_Options, @@ -66,37 +63,6 @@ class Test_Common_Output_Options: ) return audit_info - # Mocked AWS Audit Info - def set_mocked_aws_audit_info(self): - audit_info = AWS_Audit_Info( - session_config=None, - original_session=None, - audit_session=session.Session( - profile_name=None, - botocore_session=None, - ), - audited_account=AWS_ACCOUNT_NUMBER, - audited_account_arn=f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root", - audited_user_id="test-user", - audited_partition="aws", - audited_identity_arn="test-user-arn", - profile=None, - profile_region=None, - credentials=None, - assumed_role_info=None, - audited_regions=None, - organizations_metadata=None, - audit_resources=None, - mfa_enabled=False, - audit_metadata=Audit_Metadata( - services_scanned=0, - expected_checks=[], - completed_checks=0, - audit_progress=0, - ), - ) - return audit_info - def test_set_provider_output_options_aws(self): # Set the cloud provider provider = "aws"