diff --git a/poetry.lock b/poetry.lock index 5e1a7276..6c2c7ede 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1643,19 +1643,19 @@ test = ["pytest", "pytest-cov"] [[package]] name = "moto" -version = "4.2.13" +version = "5.0.0" description = "" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "moto-4.2.13-py2.py3-none-any.whl", hash = "sha256:93e0fd13b624bd79115494f833308c3641b2be0fc9f4f18aa9264aa01f6168e0"}, - {file = "moto-4.2.13.tar.gz", hash = "sha256:01aef6a489a725c8d725bd3dc6f70ff1bedaee3e2641752e4b471ff0ede4b4d7"}, + {file = "moto-5.0.0-py2.py3-none-any.whl", hash = "sha256:1d01de681da1453335ec09ba43db521e577cbd58d25ddfb61e5965534b8be539"}, + {file = "moto-5.0.0.tar.gz", hash = "sha256:4a94a147ee70e85e0842da8d1093728c66085165775d1d302f0f77538bf92b95"}, ] [package.dependencies] aws-xray-sdk = {version = ">=0.93,<0.96 || >0.96", optional = true, markers = "extra == \"all\""} boto3 = ">=1.9.201" -botocore = ">=1.12.201" +botocore = ">=1.14.0" cfn-lint = {version = ">=0.40.0", optional = true, markers = "extra == \"all\""} cryptography = ">=3.3.1" docker = {version = ">=3.0.0", optional = true, markers = "extra == \"all\""} @@ -1671,7 +1671,7 @@ python-dateutil = ">=2.1,<3.0.0" python-jose = {version = ">=3.1.0,<4.0.0", extras = ["cryptography"], optional = true, markers = "extra == \"all\""} PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"all\""} requests = ">=2.5" -responses = ">=0.13.0" +responses = ">=0.15.0" setuptools = {version = "*", optional = true, markers = "extra == \"all\""} sshpubkeys = {version = ">=3.1.0", optional = true, markers = "extra == \"all\""} werkzeug = ">=0.5,<2.2.0 || >2.2.0,<2.2.1 || >2.2.1" @@ -1686,18 +1686,13 @@ awslambda = ["docker (>=3.0.0)"] batch = ["docker (>=3.0.0)"] cloudformation = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.5.0)", "py-partiql-parser (==0.5.0)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"] cognitoidp = ["ecdsa (!=0.15)", "python-jose[cryptography] (>=3.1.0,<4.0.0)"] -ds = ["sshpubkeys (>=3.1.0)"] dynamodb = ["docker (>=3.0.0)", "py-partiql-parser (==0.5.0)"] dynamodbstreams = ["docker (>=3.0.0)", "py-partiql-parser (==0.5.0)"] -ebs = ["sshpubkeys (>=3.1.0)"] ec2 = ["sshpubkeys (>=3.1.0)"] -efs = ["sshpubkeys (>=3.1.0)"] -eks = ["sshpubkeys (>=3.1.0)"] glue = ["pyparsing (>=3.0.7)"] iotdata = ["jsondiff (>=1.1.2)"] proxy = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=2.5.1)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "multipart", "openapi-spec-validator (>=0.5.0)", "py-partiql-parser (==0.5.0)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"] -resourcegroupstaggingapi = ["PyYAML (>=5.1)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.5.0)", "py-partiql-parser (==0.5.0)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "sshpubkeys (>=3.1.0)"] -route53resolver = ["sshpubkeys (>=3.1.0)"] +resourcegroupstaggingapi = ["PyYAML (>=5.1)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.5.0)", "py-partiql-parser (==0.5.0)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)"] s3 = ["PyYAML (>=5.1)", "py-partiql-parser (==0.5.0)"] s3crc32c = ["PyYAML (>=5.1)", "crc32c", "py-partiql-parser (==0.5.0)"] server = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "flask (!=2.2.0,!=2.2.1)", "flask-cors", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.5.0)", "py-partiql-parser (==0.5.0)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"] @@ -2809,8 +2804,7 @@ files = [ {file = "ruamel.yaml.clib-0.2.7-cp310-cp310-win32.whl", hash = "sha256:763d65baa3b952479c4e972669f679fe490eee058d5aa85da483ebae2009d231"}, {file = "ruamel.yaml.clib-0.2.7-cp310-cp310-win_amd64.whl", hash = "sha256:d000f258cf42fec2b1bbf2863c61d7b8918d31ffee905da62dede869254d3b8a"}, {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:045e0626baf1c52e5527bd5db361bc83180faaba2ff586e763d3d5982a876a9e"}, - {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-macosx_13_0_arm64.whl", hash = "sha256:1a6391a7cabb7641c32517539ca42cf84b87b667bad38b78d4d42dd23e957c81"}, - {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-manylinux2014_aarch64.whl", hash = "sha256:9c7617df90c1365638916b98cdd9be833d31d337dbcd722485597b43c4a215bf"}, + {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-macosx_12_6_arm64.whl", hash = "sha256:721bc4ba4525f53f6a611ec0967bdcee61b31df5a56801281027a3a6d1c2daf5"}, {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:41d0f1fa4c6830176eef5b276af04c89320ea616655d01327d5ce65e50575c94"}, {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-win32.whl", hash = "sha256:f6d3d39611ac2e4f62c3128a9eed45f19a6608670c5a2f4f07f24e8de3441d38"}, {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-win_amd64.whl", hash = "sha256:da538167284de58a52109a9b89b8f6a53ff8437dd6dc26d33b57bf6699153122"}, @@ -3366,4 +3360,4 @@ docs = ["mkdocs", "mkdocs-material"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "002286855c4fae550222268dc43da4d7200a412c1bbed75bfe16494272759371" +content-hash = "5cff9a377b9a0ddd11edc23b7d08ecf78f5c79163848f50cb75bf118440376b4" diff --git a/pyproject.toml b/pyproject.toml index 0fb8ab56..35b2fab5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,7 @@ docker = "7.0.0" flake8 = "7.0.0" freezegun = "1.4.0" mock = "5.1.0" -moto = {extras = ["all"], version = "4.2.13"} +moto = {extras = ["all"], version = "5.0.0"} openapi-schema-validator = "0.6.2" openapi-spec-validator = "0.7.1" pylint = "3.0.3" diff --git a/tests/lib/check/check_test.py b/tests/lib/check/check_test.py index 1f628d92..bfa1d88a 100644 --- a/tests/lib/check/check_test.py +++ b/tests/lib/check/check_test.py @@ -6,7 +6,7 @@ from pkgutil import ModuleInfo from boto3 import client from fixtures.bulk_checks_metadata import test_bulk_checks_metadata from mock import patch -from moto import mock_s3 +from moto import mock_aws from prowler.lib.check.check import ( exclude_checks_to_run, @@ -456,7 +456,7 @@ class Test_Check: provider = test["input"]["provider"] assert parse_checks_from_file(check_file, provider) == test["expected"] - @mock_s3 + @mock_aws def test_parse_checks_from_folder(self): test_checks_folder = ( f"{pathlib.Path().absolute()}/tests/lib/check/fixtures/checks_folder" diff --git a/tests/providers/aws/aws_provider_test.py b/tests/providers/aws/aws_provider_test.py index eed14ce3..e986a812 100644 --- a/tests/providers/aws/aws_provider_test.py +++ b/tests/providers/aws/aws_provider_test.py @@ -2,7 +2,7 @@ from re import search import boto3 from mock import patch -from moto import mock_iam, mock_sts +from moto import mock_aws from prowler.providers.aws.aws_provider import ( AWS_Provider, @@ -29,8 +29,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_AWS_Provider: - @mock_iam - @mock_sts + @mock_aws def test_aws_provider_user_without_mfa(self): # sessionName = "ProwlerAssessmentSession" # Boto 3 client to create our user @@ -79,8 +78,7 @@ class Test_AWS_Provider: role_session_name="ProwlerAssessmentSession", ) - @mock_iam - @mock_sts + @mock_aws def test_aws_provider_user_with_mfa(self): # Boto 3 client to create our user iam_client = boto3.client("iam", region_name=AWS_REGION_US_EAST_1) @@ -129,8 +127,7 @@ class Test_AWS_Provider: role_session_name="ProwlerAssessmentSession", ) - @mock_iam - @mock_sts + @mock_aws def test_aws_provider_assume_role_with_mfa(self): # Variables role_name = "test-role" @@ -208,8 +205,7 @@ class Test_AWS_Provider: assume_role_response["AssumedRoleUser"]["AssumedRoleId"] ) == 21 + 1 + len(sessionName) - @mock_iam - @mock_sts + @mock_aws def test_aws_provider_assume_role_without_mfa(self): # Variables role_name = "test-role" @@ -279,8 +275,7 @@ class Test_AWS_Provider: assume_role_response["AssumedRoleUser"]["AssumedRoleId"] ) == 21 + 1 + len(sessionName) - @mock_iam - @mock_sts + @mock_aws def test_assume_role_with_sts_endpoint_region(self): # Variables role_name = "test-role" diff --git a/tests/providers/aws/lib/allowlist/allowlist_test.py b/tests/providers/aws/lib/allowlist/allowlist_test.py index f59c1523..896a5b66 100644 --- a/tests/providers/aws/lib/allowlist/allowlist_test.py +++ b/tests/providers/aws/lib/allowlist/allowlist_test.py @@ -1,7 +1,7 @@ import yaml from boto3 import resource from mock import MagicMock -from moto import mock_dynamodb, mock_s3 +from moto import mock_aws from prowler.providers.aws.lib.allowlist.allowlist import ( allowlist_findings, @@ -25,7 +25,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_Allowlist: # Test S3 allowlist - @mock_s3 + @mock_aws def test_s3_allowlist(self): audit_info = set_mocked_aws_audit_info() # Create bucket and upload allowlist yaml @@ -44,7 +44,7 @@ class Test_Allowlist: ) # Test DynamoDB allowlist - @mock_dynamodb + @mock_aws def test_dynamo_allowlist(self): audit_info = set_mocked_aws_audit_info() # Create table and put item @@ -88,7 +88,7 @@ class Test_Allowlist: )["Accounts"]["*"]["Checks"]["iam_user_hardware_mfa_enabled"]["Resources"] ) - @mock_dynamodb + @mock_aws def test_dynamo_allowlist_with_tags(self): audit_info = set_mocked_aws_audit_info() # Create table and put item diff --git a/tests/providers/aws/lib/credentials/credentials_test.py b/tests/providers/aws/lib/credentials/credentials_test.py index 84bbd372..6397cc3d 100644 --- a/tests/providers/aws/lib/credentials/credentials_test.py +++ b/tests/providers/aws/lib/credentials/credentials_test.py @@ -3,7 +3,7 @@ import re import boto3 import botocore from mock import patch -from moto import mock_iam, mock_sts +from moto import mock_aws from prowler.providers.aws.lib.arn.arn import parse_iam_credentials_arn from prowler.providers.aws.lib.credentials.credentials import ( @@ -41,8 +41,7 @@ def mock_get_caller_identity_gov_cloud(self, operation_name, kwarg): class Test_AWS_Credentials: - @mock_sts - @mock_iam + @mock_aws def test_validate_credentials_commercial_partition_with_regions(self): # AWS Region for AWS COMMERCIAL aws_region = "eu-west-1" @@ -77,8 +76,7 @@ class Test_AWS_Credentials: assert re.match("[0-9a-zA-Z]{20}", get_caller_identity["UserId"]) assert get_caller_identity["Account"] == AWS_ACCOUNT_NUMBER - @mock_sts - @mock_iam + @mock_aws def test_validate_credentials_commercial_partition_with_regions_none_and_profile_region_so_profile_region( self, ): @@ -115,8 +113,7 @@ class Test_AWS_Credentials: assert re.match("[0-9a-zA-Z]{20}", get_caller_identity["UserId"]) assert get_caller_identity["Account"] == AWS_ACCOUNT_NUMBER - @mock_sts - @mock_iam + @mock_aws def test_validate_credentials_commercial_partition_with_0_regions_and_profile_region_so_profile_region( self, ): @@ -153,8 +150,7 @@ class Test_AWS_Credentials: assert re.match("[0-9a-zA-Z]{20}", get_caller_identity["UserId"]) assert get_caller_identity["Account"] == AWS_ACCOUNT_NUMBER - @mock_sts - @mock_iam + @mock_aws def test_validate_credentials_commercial_partition_without_regions_and_profile_region_so_us_east_1( self, ): @@ -191,8 +187,7 @@ class Test_AWS_Credentials: assert re.match("[0-9a-zA-Z]{20}", get_caller_identity["UserId"]) assert get_caller_identity["Account"] == AWS_ACCOUNT_NUMBER - @mock_sts - @mock_iam + @mock_aws def test_validate_credentials_commercial_partition_with_regions_none_and_profile_region_but_sts_endpoint_region( self, ): @@ -232,8 +227,7 @@ class Test_AWS_Credentials: assert re.match("[0-9a-zA-Z]{20}", get_caller_identity["UserId"]) assert get_caller_identity["Account"] == AWS_ACCOUNT_NUMBER - @mock_sts - @mock_iam + @mock_aws def test_validate_credentials_china_partition_without_regions_and_profile_region_so_us_east_1( self, ): @@ -270,8 +264,7 @@ class Test_AWS_Credentials: assert re.match("[0-9a-zA-Z]{20}", get_caller_identity["UserId"]) assert get_caller_identity["Account"] == AWS_ACCOUNT_NUMBER - @mock_sts - @mock_iam + @mock_aws @patch( "botocore.client.BaseClient._make_api_call", new=mock_get_caller_identity_china ) @@ -312,8 +305,7 @@ class Test_AWS_Credentials: assert re.match("[0-9a-zA-Z]{20}", get_caller_identity["UserId"]) assert get_caller_identity["Account"] == AWS_ACCOUNT_NUMBER - @mock_sts - @mock_iam + @mock_aws @patch( "botocore.client.BaseClient._make_api_call", new=mock_get_caller_identity_china ) @@ -359,8 +351,7 @@ class Test_AWS_Credentials: assert re.match("[0-9a-zA-Z]{20}", get_caller_identity["UserId"]) assert get_caller_identity["Account"] == AWS_ACCOUNT_NUMBER - @mock_sts - @mock_iam + @mock_aws @patch( "botocore.client.BaseClient._make_api_call", new=mock_get_caller_identity_gov_cloud, @@ -402,8 +393,7 @@ class Test_AWS_Credentials: assert re.match("[0-9a-zA-Z]{20}", get_caller_identity["UserId"]) assert get_caller_identity["Account"] == AWS_ACCOUNT_NUMBER - @mock_sts - @mock_iam + @mock_aws @patch( "botocore.client.BaseClient._make_api_call", new=mock_get_caller_identity_gov_cloud, @@ -450,8 +440,7 @@ class Test_AWS_Credentials: assert re.match("[0-9a-zA-Z]{20}", get_caller_identity["UserId"]) assert get_caller_identity["Account"] == AWS_ACCOUNT_NUMBER - @mock_iam - @mock_sts + @mock_aws def test_create_sts_session(self): aws_region = "eu-west-1" # Create a mock IAM user @@ -474,8 +463,7 @@ class Test_AWS_Credentials: assert sts_client._endpoint._endpoint_prefix == "sts" assert sts_client._endpoint.host == f"https://sts.{aws_region}.amazonaws.com" - @mock_iam - @mock_sts + @mock_aws def test_create_sts_session_gov_cloud(self): aws_region = "us-gov-east-1" # Create a mock IAM user @@ -498,8 +486,7 @@ class Test_AWS_Credentials: assert sts_client._endpoint._endpoint_prefix == "sts" assert sts_client._endpoint.host == f"https://sts.{aws_region}.amazonaws.com" - @mock_iam - @mock_sts + @mock_aws def test_create_sts_session_china(self): aws_region = "cn-north-1" # Create a mock IAM user diff --git a/tests/providers/aws/lib/organizations/organizations_test.py b/tests/providers/aws/lib/organizations/organizations_test.py index 53953cfd..8891141e 100644 --- a/tests/providers/aws/lib/organizations/organizations_test.py +++ b/tests/providers/aws/lib/organizations/organizations_test.py @@ -1,7 +1,7 @@ import json import boto3 -from moto import mock_iam, mock_organizations, mock_sts +from moto import mock_aws from prowler.providers.aws.lib.organizations.organizations import ( get_organizations_metadata, @@ -11,9 +11,7 @@ AWS_ACCOUNT_NUMBER = "123456789012" class Test_AWS_Organizations: - @mock_organizations - @mock_sts - @mock_iam + @mock_aws def test_organizations(self): client = boto3.client("organizations", region_name="us-east-1") iam_client = boto3.client("iam", region_name="us-east-1") diff --git a/tests/providers/aws/lib/s3/s3_test.py b/tests/providers/aws/lib/s3/s3_test.py index 7f82c395..454d83a2 100644 --- a/tests/providers/aws/lib/s3/s3_test.py +++ b/tests/providers/aws/lib/s3/s3_test.py @@ -3,7 +3,7 @@ from pathlib import Path import boto3 from mock import MagicMock -from moto import mock_s3 +from moto import mock_aws from prowler.config.config import csv_file_suffix from prowler.providers.aws.lib.s3.s3 import get_s3_object_path, send_to_s3_bucket @@ -21,7 +21,7 @@ OUTPUT_MODE_CIS_1_4_AWS = "cis_1.4_aws" class TestS3: - @mock_s3 + @mock_aws def test_send_to_s3_bucket(self): # Mock Audit Info audit_info = MagicMock() @@ -60,7 +60,7 @@ class TestS3: == "binary/octet-stream" ) - @mock_s3 + @mock_aws def test_send_to_s3_bucket_compliance(self): # Mock Audit Info audit_info = MagicMock() 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 ef61a1e1..402c75f8 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_apigateway, mock_iam, mock_lambda +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_apigateway_restapi_authorizers_enabled: - @mock_apigateway + @mock_aws def test_apigateway_no_rest_apis(self): from prowler.providers.aws.services.apigateway.apigateway_service import ( APIGateway, @@ -39,9 +39,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert len(result) == 0 - @mock_apigateway - @mock_iam - @mock_lambda + @mock_aws def test_apigateway_one_rest_api_with_lambda_authorizer(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -107,7 +105,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] - @mock_apigateway + @mock_aws def test_apigateway_one_rest_api_without_lambda_authorizer(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -152,9 +150,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] - @mock_apigateway - @mock_iam - @mock_lambda + @mock_aws def test_apigateway_one_rest_api_without_api_or_methods_authorizer(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -215,9 +211,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] - @mock_apigateway - @mock_iam - @mock_lambda + @mock_aws def test_apigateway_one_rest_api_without_api_auth_but_one_method_auth(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -278,9 +272,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] - @mock_apigateway - @mock_iam - @mock_lambda + @mock_aws def test_apigateway_one_rest_api_without_api_auth_but_methods_auth_and_not(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -348,9 +340,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] - @mock_apigateway - @mock_iam - @mock_lambda + @mock_aws def test_apigateway_one_rest_api_without_api_auth_but_methods_not_auth_and_auth( self, ): @@ -420,9 +410,7 @@ class Test_apigateway_restapi_authorizers_enabled: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] - @mock_apigateway - @mock_iam - @mock_lambda + @mock_aws def test_apigateway_one_rest_api_without_authorizers_with_various_resources_without_endpoints( self, ): 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 fba588b0..8b16ed62 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_apigateway +from moto import mock_aws from prowler.providers.aws.services.apigateway.apigateway_service import Stage from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_apigateway_restapi_client_certificate_enabled: - @mock_apigateway + @mock_aws def test_apigateway_no_stages(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -45,7 +45,7 @@ class Test_apigateway_restapi_client_certificate_enabled: assert len(result) == 0 - @mock_apigateway + @mock_aws def test_apigateway_one_stage_without_certificate(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_apigateway_restapi_client_certificate_enabled: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [None] - @mock_apigateway + @mock_aws def test_apigateway_one_stage_with_certificate(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) 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 05bdb9d1..2d8197ff 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_apigateway +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_apigateway_restapi_public: - @mock_apigateway + @mock_aws def test_apigateway_no_rest_apis(self): from prowler.providers.aws.services.apigateway.apigateway_service import ( APIGateway, @@ -38,7 +38,7 @@ class Test_apigateway_restapi_public: assert len(result) == 0 - @mock_apigateway + @mock_aws def test_apigateway_one_private_rest_api(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -88,7 +88,7 @@ class Test_apigateway_restapi_public: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] - @mock_apigateway + @mock_aws def test_apigateway_one_public_rest_api(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) 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 15f33ae7..f68469c9 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_apigateway +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -13,7 +13,7 @@ API_GW_NAME = "test-rest-api" class Test_apigateway_restapi_public_with_authorizer: - @mock_apigateway + @mock_aws def test_apigateway_no_rest_apis(self): from prowler.providers.aws.services.apigateway.apigateway_service import ( APIGateway, @@ -40,7 +40,7 @@ class Test_apigateway_restapi_public_with_authorizer: assert len(result) == 0 - @mock_apigateway + @mock_aws def test_apigateway_one_public_rest_api_without_authorizer(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -90,7 +90,7 @@ class Test_apigateway_restapi_public_with_authorizer: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [{}] - @mock_apigateway + @mock_aws def test_apigateway_one_public_rest_api_with_authorizer(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) 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 575c1c0b..8c84a5b6 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_apigateway +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_apigateway_restapi_logging_enabled: - @mock_apigateway + @mock_aws def test_apigateway_no_rest_apis(self): from prowler.providers.aws.services.apigateway.apigateway_service import ( APIGateway, @@ -38,7 +38,7 @@ class Test_apigateway_restapi_logging_enabled: assert len(result) == 0 - @mock_apigateway + @mock_aws def test_apigateway_one_rest_api_with_logging(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -120,7 +120,7 @@ class Test_apigateway_restapi_logging_enabled: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [None] - @mock_apigateway + @mock_aws def test_apigateway_one_rest_api_without_logging(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) diff --git a/tests/providers/aws/services/apigateway/apigateway_service_test.py b/tests/providers/aws/services/apigateway/apigateway_service_test.py index 6ca41c09..e4156f95 100644 --- a/tests/providers/aws/services/apigateway/apigateway_service_test.py +++ b/tests/providers/aws/services/apigateway/apigateway_service_test.py @@ -1,5 +1,5 @@ from boto3 import client -from moto import mock_apigateway +from moto import mock_aws from prowler.providers.aws.services.apigateway.apigateway_service import APIGateway from tests.providers.aws.audit_info_utils import ( @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_APIGateway_Service: # Test APIGateway Service - @mock_apigateway + @mock_aws def test_service(self): # APIGateway client for this test class audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) @@ -19,7 +19,7 @@ class Test_APIGateway_Service: assert apigateway.service == "apigateway" # Test APIGateway Client - @mock_apigateway + @mock_aws def test_client(self): # APIGateway client for this test class audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) @@ -28,7 +28,7 @@ class Test_APIGateway_Service: assert regional_client.__class__.__name__ == "APIGateway" # Test APIGateway Session - @mock_apigateway + @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]) @@ -36,7 +36,7 @@ class Test_APIGateway_Service: assert apigateway.session.__class__.__name__ == "Session" # Test APIGateway Session - @mock_apigateway + @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]) @@ -44,7 +44,7 @@ class Test_APIGateway_Service: assert apigateway.audited_account == AWS_ACCOUNT_NUMBER # Test APIGateway Get Rest APIs - @mock_apigateway + @mock_aws def test__get_rest_apis__(self): # Generate APIGateway Client apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -60,7 +60,7 @@ class Test_APIGateway_Service: ) # Test APIGateway Get Authorizers - @mock_apigateway + @mock_aws def test__get_authorizers__(self): # Generate APIGateway Client apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -80,7 +80,7 @@ class Test_APIGateway_Service: assert apigateway.rest_apis[0].authorizer is True # Test APIGateway Get Rest API - @mock_apigateway + @mock_aws def test__get_rest_api__(self): # Generate APIGateway Client apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -97,7 +97,7 @@ class Test_APIGateway_Service: assert apigateway.rest_apis[0].tags == [{"test": "test"}] # Test APIGateway Get Stages - @mock_apigateway + @mock_aws def test__get_stages__(self): # Generate APIGateway Client apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -148,7 +148,7 @@ class Test_APIGateway_Service: assert apigateway.rest_apis[0].stages[0].logging is True # Test APIGateway __get_resources__ - @mock_apigateway + @mock_aws def test__get_resources__(self): apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) 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 2fbb4dc1..8e037ec5 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_apigateway, mock_wafv2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_apigateway_restapi_waf_acl_attached: - @mock_apigateway + @mock_aws def test_apigateway_no_rest_apis(self): from prowler.providers.aws.services.apigateway.apigateway_service import ( APIGateway, @@ -38,8 +38,7 @@ class Test_apigateway_restapi_waf_acl_attached: assert len(result) == 0 - @mock_apigateway - @mock_wafv2 + @mock_aws def test_apigateway_one_rest_api_with_waf(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) @@ -126,7 +125,7 @@ class Test_apigateway_restapi_waf_acl_attached: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [None] - @mock_apigateway + @mock_aws def test_apigateway_one_rest_api_without_waf(self): # Create APIGateway Mocked Resources apigateway_client = client("apigateway", region_name=AWS_REGION_US_EAST_1) 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 d5b3377a..8b0f74aa 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 @@ -3,7 +3,7 @@ from unittest import mock import botocore from boto3 import client from mock import patch -from moto import mock_apigatewayv2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -39,7 +39,7 @@ def mock_make_api_call(self, operation_name, kwarg): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) class Test_apigatewayv2_api_access_logging_enabled: - @mock_apigatewayv2 + @mock_aws def test_apigateway_no_apis(self): from prowler.providers.aws.services.apigatewayv2.apigatewayv2_service import ( ApiGatewayV2, @@ -66,7 +66,7 @@ class Test_apigatewayv2_api_access_logging_enabled: assert len(result) == 0 - @mock_apigatewayv2 + @mock_aws def test_apigateway_one_api_with_logging_in_stage(self): # Create ApiGatewayV2 Mocked Resources apigatewayv2_client = client("apigatewayv2", region_name=AWS_REGION_US_EAST_1) 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 6b919358..8196c218 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 @@ -3,7 +3,7 @@ from unittest import mock import botocore from boto3 import client from mock import patch -from moto import mock_apigatewayv2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -39,7 +39,7 @@ def mock_make_api_call(self, operation_name, kwarg): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) class Test_apigatewayv2_api_authorizers_enabled: - @mock_apigatewayv2 + @mock_aws def test_apigateway_no_apis(self): from prowler.providers.aws.services.apigatewayv2.apigatewayv2_service import ( ApiGatewayV2, @@ -66,7 +66,7 @@ class Test_apigatewayv2_api_authorizers_enabled: assert len(result) == 0 - @mock_apigatewayv2 + @mock_aws def test_apigateway_one_api_with_authorizer(self): # Create ApiGatewayV2 Mocked Resources apigatewayv2_client = client("apigatewayv2", region_name=AWS_REGION_US_EAST_1) diff --git a/tests/providers/aws/services/apigatewayv2/apigatewayv2_service_test.py b/tests/providers/aws/services/apigatewayv2/apigatewayv2_service_test.py index dd3c0230..67234e28 100644 --- a/tests/providers/aws/services/apigatewayv2/apigatewayv2_service_test.py +++ b/tests/providers/aws/services/apigatewayv2/apigatewayv2_service_test.py @@ -1,7 +1,7 @@ import botocore from boto3 import client from mock import patch -from moto import mock_apigatewayv2 +from moto import mock_aws from prowler.providers.aws.services.apigatewayv2.apigatewayv2_service import ( ApiGatewayV2, @@ -42,7 +42,7 @@ def mock_make_api_call(self, operation_name, kwarg): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) class Test_ApiGatewayV2_Service: # Test ApiGatewayV2 Service - @mock_apigatewayv2 + @mock_aws def test_service(self): # ApiGatewayV2 client for this test class audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) @@ -50,7 +50,7 @@ class Test_ApiGatewayV2_Service: assert apigatewayv2.service == "apigatewayv2" # Test ApiGatewayV2 Client - @mock_apigatewayv2 + @mock_aws def test_client(self): # ApiGatewayV2 client for this test class audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) @@ -59,7 +59,7 @@ class Test_ApiGatewayV2_Service: assert regional_client.__class__.__name__ == "ApiGatewayV2" # Test ApiGatewayV2 Session - @mock_apigatewayv2 + @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]) @@ -67,7 +67,7 @@ class Test_ApiGatewayV2_Service: assert apigatewayv2.session.__class__.__name__ == "Session" # Test ApiGatewayV2 Session - @mock_apigatewayv2 + @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]) @@ -75,7 +75,7 @@ class Test_ApiGatewayV2_Service: assert apigatewayv2.audited_account == AWS_ACCOUNT_NUMBER # Test ApiGatewayV2 Get APIs - @mock_apigatewayv2 + @mock_aws def test__get_apis__(self): # Generate ApiGatewayV2 Client apigatewayv2_client = client("apigatewayv2", region_name=AWS_REGION_US_EAST_1) @@ -90,7 +90,7 @@ class Test_ApiGatewayV2_Service: assert apigatewayv2.apis[0].tags == [{"test": "test"}] # Test ApiGatewayV2 Get Authorizers - @mock_apigatewayv2 + @mock_aws def test__get_authorizers__(self): # Generate ApiGatewayV2 Client apigatewayv2_client = client("apigatewayv2", region_name=AWS_REGION_US_EAST_1) @@ -110,7 +110,7 @@ class Test_ApiGatewayV2_Service: assert apigatewayv2.apis[0].authorizer is True # Test ApiGatewayV2 Get Stages - @mock_apigatewayv2 + @mock_aws def test__get_stages__(self): # Generate ApiGatewayV2 Client apigatewayv2_client = client("apigatewayv2", region_name=AWS_REGION_US_EAST_1) diff --git a/tests/providers/aws/services/athena/athena_service_test.py b/tests/providers/aws/services/athena/athena_service_test.py index 28920c95..5daed07a 100644 --- a/tests/providers/aws/services/athena/athena_service_test.py +++ b/tests/providers/aws/services/athena/athena_service_test.py @@ -1,6 +1,6 @@ from botocore.client import BaseClient from mock import patch -from moto import mock_athena +from moto import mock_aws from prowler.providers.aws.services.athena.athena_service import Athena from tests.providers.aws.audit_info_utils import ( @@ -54,7 +54,7 @@ def mock_generate_regional_clients(service, audit_info): ) class Test_Athena_Service: # Test Athena Get Workgrups - @mock_athena + @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]) @@ -78,7 +78,7 @@ class Test_Athena_Service: # Test Athena Get Workgrups # We mock the get_work_group to return an encrypted workgroup @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) - @mock_athena + @mock_aws def test__get_workgroups__encrypted(self): default_workgroup_name = "primary" audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) 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 f01d4f39..4753afa4 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 @@ -1,7 +1,7 @@ from unittest import mock from mock import patch -from moto import mock_athena +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -15,7 +15,7 @@ ATHENA_PRIMARY_WORKGROUP_ARN = f"arn:aws:athena:{AWS_REGION_EU_WEST_1}:{AWS_ACCO class Test_athena_workgroup_encryption: - @mock_athena + @mock_aws def test_primary_workgroup_not_encrypted(self): from prowler.providers.aws.services.athena.athena_service import Athena @@ -46,7 +46,7 @@ class Test_athena_workgroup_encryption: assert result[0].region == AWS_REGION_EU_WEST_1 assert result[0].resource_tags == [] - @mock_athena + @mock_aws def test_primary_workgroup_not_encrypted_ignoring(self): from prowler.providers.aws.services.athena.athena_service import Athena @@ -69,7 +69,7 @@ class Test_athena_workgroup_encryption: assert len(result) == 0 - @mock_athena + @mock_aws # We mock the get_work_group to return an encrypted workgroup @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) def test_primary_workgroup_encrypted(self): 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 21cf8555..f7bc1c0d 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 @@ -1,7 +1,7 @@ from unittest import mock from mock import patch -from moto import mock_athena +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -15,7 +15,7 @@ ATHENA_PRIMARY_WORKGROUP_ARN = f"arn:aws:athena:{AWS_REGION_EU_WEST_1}:{AWS_ACCO class Test_athena_workgroup_enforce_configuration: - @mock_athena + @mock_aws def test_primary_workgroup_configuration_not_enforced(self): from prowler.providers.aws.services.athena.athena_service import Athena @@ -46,7 +46,7 @@ class Test_athena_workgroup_enforce_configuration: assert result[0].region == AWS_REGION_EU_WEST_1 assert result[0].resource_tags == [] - @mock_athena + @mock_aws def test_primary_workgroup_configuration_not_enforced_ignoring(self): from prowler.providers.aws.services.athena.athena_service import Athena @@ -69,7 +69,7 @@ class Test_athena_workgroup_enforce_configuration: assert len(result) == 0 - @mock_athena + @mock_aws # We mock the get_work_group to return a workgroup not enforcing configuration @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) def test_primary_workgroup_configuration_enforced(self): 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 8b510f03..6a40b341 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 @@ -3,7 +3,7 @@ from pathlib import Path from unittest import mock from boto3 import client -from moto import mock_autoscaling +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -15,7 +15,7 @@ FIXTURES_DIR_NAME = "fixtures" class Test_autoscaling_find_secrets_ec2_launch_configuration: - @mock_autoscaling + @mock_aws def test_no_autoscaling(self): autoscaling_client = client("autoscaling", region_name=AWS_REGION_US_EAST_1) autoscaling_client.launch_configurations = [] @@ -43,7 +43,7 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration: assert len(result) == 0 - @mock_autoscaling + @mock_aws def test_one_autoscaling_with_no_secrets(self): # Include launch_configurations to check launch_configuration_name = "tester" @@ -90,7 +90,7 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration: assert result[0].resource_arn == launch_configuration_arn assert result[0].region == AWS_REGION_US_EAST_1 - @mock_autoscaling + @mock_aws def test_one_autoscaling_with_secrets(self): # Include launch_configurations to check launch_configuration_name = "tester" @@ -137,7 +137,7 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration: assert result[0].resource_arn == launch_configuration_arn assert result[0].region == AWS_REGION_US_EAST_1 - @mock_autoscaling + @mock_aws def test_one_autoscaling_file_with_secrets(self): # Include launch_configurations to check f = open( @@ -189,7 +189,7 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration: assert result[0].resource_arn == launch_configuration_arn assert result[0].region == AWS_REGION_US_EAST_1 - @mock_autoscaling + @mock_aws def test_one_launch_configurations_without_user_data(self): # Include launch_configurations to check launch_configuration_name = "tester" @@ -235,7 +235,7 @@ class Test_autoscaling_find_secrets_ec2_launch_configuration: assert result[0].resource_arn == launch_configuration_arn assert result[0].region == AWS_REGION_US_EAST_1 - @mock_autoscaling + @mock_aws def test_one_autoscaling_file_with_secrets_gzip(self): # Include launch_configurations to check f = open( 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 d2b052ef..604ed90e 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_autoscaling +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -10,7 +10,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_autoscaling_group_multiple_az: - @mock_autoscaling + @mock_aws def test_no_autoscaling(self): autoscaling_client = client("autoscaling", region_name=AWS_REGION_US_EAST_1) autoscaling_client.groups = [] @@ -38,7 +38,7 @@ class Test_autoscaling_group_multiple_az: assert len(result) == 0 - @mock_autoscaling + @mock_aws def test_groups_with_multi_az(self): autoscaling_client = client("autoscaling", region_name=AWS_REGION_US_EAST_1) autoscaling_client.create_launch_configuration( @@ -94,7 +94,7 @@ class Test_autoscaling_group_multiple_az: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] - @mock_autoscaling + @mock_aws def test_groups_with_single_az(self): autoscaling_client = client("autoscaling", region_name=AWS_REGION_US_EAST_1) autoscaling_client.create_launch_configuration( @@ -149,7 +149,7 @@ class Test_autoscaling_group_multiple_az: assert result[0].resource_tags == [] assert result[0].resource_arn == autoscaling_group_arn - @mock_autoscaling + @mock_aws def test_groups_witd_and_without(self): autoscaling_client = client("autoscaling", region_name=AWS_REGION_US_EAST_1) autoscaling_client.create_launch_configuration( diff --git a/tests/providers/aws/services/autoscaling/autoscaling_service_test.py b/tests/providers/aws/services/autoscaling/autoscaling_service_test.py index f2eb5e37..23018143 100644 --- a/tests/providers/aws/services/autoscaling/autoscaling_service_test.py +++ b/tests/providers/aws/services/autoscaling/autoscaling_service_test.py @@ -1,7 +1,7 @@ from base64 import b64decode from boto3 import client -from moto import mock_autoscaling +from moto import mock_aws from prowler.providers.aws.services.autoscaling.autoscaling_service import AutoScaling from tests.providers.aws.audit_info_utils import ( @@ -13,7 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_AutoScaling_Service: # Test AutoScaling Service - @mock_autoscaling + @mock_aws def test_service(self): # AutoScaling client for this test class audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) @@ -21,7 +21,7 @@ class Test_AutoScaling_Service: assert autoscaling.service == "autoscaling" # Test AutoScaling Client - @mock_autoscaling + @mock_aws def test_client(self): # AutoScaling client for this test class audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) @@ -30,7 +30,7 @@ class Test_AutoScaling_Service: assert regional_client.__class__.__name__ == "AutoScaling" # Test AutoScaling Session - @mock_autoscaling + @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]) @@ -38,7 +38,7 @@ class Test_AutoScaling_Service: assert autoscaling.session.__class__.__name__ == "Session" # Test AutoScaling Session - @mock_autoscaling + @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]) @@ -46,7 +46,7 @@ class Test_AutoScaling_Service: assert autoscaling.audited_account == AWS_ACCOUNT_NUMBER # Test AutoScaling Get APIs - @mock_autoscaling + @mock_aws def test__describe_launch_configurations__(self): # Generate AutoScaling Client autoscaling_client = client("autoscaling", region_name=AWS_REGION_US_EAST_1) @@ -80,7 +80,7 @@ class Test_AutoScaling_Service: assert autoscaling.launch_configurations[1].name == "tester2" # Test Describe Auto Scaling Groups - @mock_autoscaling + @mock_aws def test__describe_auto_scaling_groups__(self): # Generate AutoScaling Client autoscaling_client = client("autoscaling", region_name=AWS_REGION_US_EAST_1) 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 230e3f3c..90a06de2 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 @@ -2,7 +2,7 @@ from unittest import mock from boto3 import client from mock import patch -from moto import mock_cloudtrail, mock_s3 +from moto import mock_aws from prowler.providers.aws.services.awslambda.awslambda_service import Function from tests.providers.aws.audit_info_utils import ( @@ -27,7 +27,7 @@ def mock_generate_regional_clients(service, audit_info): new=mock_generate_regional_clients, ) class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled: - @mock_cloudtrail + @mock_aws def test_no_functions(self): lambda_client = mock.MagicMock lambda_client.functions = {} @@ -58,8 +58,7 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled: assert len(result) == 0 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_lambda_not_recorded_by_cloudtrail(self): # Lambda Client lambda_client = mock.MagicMock @@ -121,8 +120,7 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled: ) assert result[0].resource_tags == [] - @mock_cloudtrail - @mock_s3 + @mock_aws def test_lambda_recorded_by_cloudtrail_classic_event_selector(self): # Lambda Client lambda_client = mock.MagicMock @@ -196,8 +194,7 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled: ) assert result[0].resource_tags == [] - @mock_cloudtrail - @mock_s3 + @mock_aws def test_lambda_recorded_by_cloudtrail_advanced_event_selector(self): # Lambda Client lambda_client = mock.MagicMock @@ -274,8 +271,7 @@ class Test_awslambda_function_invoke_api_operations_cloudtrail_logging_enabled: ) assert result[0].resource_tags == [] - @mock_cloudtrail - @mock_s3 + @mock_aws def test_all_lambdas_recorded_by_cloudtrail(self): # Lambda Client lambda_client = mock.MagicMock diff --git a/tests/providers/aws/services/awslambda/awslambda_service_test.py b/tests/providers/aws/services/awslambda/awslambda_service_test.py index 5a4ff328..07e6ef17 100644 --- a/tests/providers/aws/services/awslambda/awslambda_service_test.py +++ b/tests/providers/aws/services/awslambda/awslambda_service_test.py @@ -7,7 +7,7 @@ from unittest.mock import patch import mock from boto3 import client, resource -from moto import mock_iam, mock_lambda, mock_s3 +from moto import mock_aws from prowler.providers.aws.services.awslambda.awslambda_service import AuthType, Lambda from tests.providers.aws.audit_info_utils import ( @@ -85,9 +85,7 @@ class Test_Lambda_Service: awslambda = Lambda(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) assert awslambda.service == "lambda" - @mock_lambda - @mock_iam - @mock_s3 + @mock_aws def test__list_functions__(self): # Create IAM Lambda Role iam_client = client("iam", region_name=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 f3d0f1d4..6519f0b2 100644 --- a/tests/providers/aws/services/cloudformation/cloudformation_service_test.py +++ b/tests/providers/aws/services/cloudformation/cloudformation_service_test.py @@ -5,7 +5,7 @@ from unittest.mock import patch import boto3 import botocore from dateutil.tz import tzutc -from moto import mock_cloudformation +from moto import mock_aws from prowler.providers.aws.services.cloudformation.cloudformation_service import ( CloudFormation, @@ -135,7 +135,7 @@ def mock_generate_regional_clients(service, audit_info): ) class Test_CloudFormation_Service: # Test CloudFormation Client - @mock_cloudformation + @mock_aws def test__get_client__(self): cloudformation = CloudFormation( set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) @@ -146,7 +146,7 @@ class Test_CloudFormation_Service: ) # Test CloudFormation Service - @mock_cloudformation + @mock_aws def test__get_service__(self): cloudformation = CloudFormation( set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) @@ -157,14 +157,14 @@ class Test_CloudFormation_Service: ) # Test CloudFormation Session - @mock_cloudformation + @mock_aws def test__get_session__(self): cloudformation = CloudFormation( set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) ) assert cloudformation.session.__class__.__name__ == "Session" - @mock_cloudformation + @mock_aws def test__describe_stacks__(self): cloudformation_client = boto3.client( "cloudformation", region_name=AWS_REGION_EU_WEST_1 diff --git a/tests/providers/aws/services/cloudfront/cloudfront_service_test.py b/tests/providers/aws/services/cloudfront/cloudfront_service_test.py index 5f8b9f04..0718c02d 100644 --- a/tests/providers/aws/services/cloudfront/cloudfront_service_test.py +++ b/tests/providers/aws/services/cloudfront/cloudfront_service_test.py @@ -2,7 +2,7 @@ from unittest.mock import patch import botocore from boto3 import client -from moto import mock_cloudfront +from moto import mock_aws from prowler.providers.aws.services.cloudfront.cloudfront_service import ( CloudFront, @@ -151,30 +151,30 @@ def mock_make_api_call(self, operation_name, kwarg): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) class Test_CloudFront_Service: # Test CloudFront Client - @mock_cloudfront + @mock_aws def test__get_client__(self): cloudfront = CloudFront(set_mocked_aws_audit_info()) assert cloudfront.client.__class__.__name__ == "CloudFront" # Test CloudFront Session - @mock_cloudfront + @mock_aws def test__get_session__(self): cloudfront = CloudFront(set_mocked_aws_audit_info()) assert cloudfront.session.__class__.__name__ == "Session" # Test CloudFront Service - @mock_cloudfront + @mock_aws def test__get_service__(self): cloudfront = CloudFront(set_mocked_aws_audit_info()) assert cloudfront.service == "cloudfront" - @mock_cloudfront + @mock_aws def test__list_distributions__zero(self): cloudfront = CloudFront(set_mocked_aws_audit_info()) assert len(cloudfront.distributions) == 0 - @mock_cloudfront + @mock_aws def test__list_distributions__complete(self): cloudfront_client = client("cloudfront") config = example_distribution_config("ref") 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 98f8347a..39634ee1 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 @@ -3,7 +3,7 @@ from unittest.mock import patch import botocore from boto3 import client -from moto import mock_cloudtrail, mock_iam, mock_s3 +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 @@ -18,7 +18,7 @@ make_api_call = botocore.client.BaseClient._make_api_call class Test_cloudtrail_bucket_requires_mfa_delete: - @mock_cloudtrail + @mock_aws def test_no_trails(self): current_audit_info = set_mocked_aws_audit_info( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] @@ -40,8 +40,7 @@ class Test_cloudtrail_bucket_requires_mfa_delete: result = check.execute() assert len(result) == 0 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trails_with_no_mfa_bucket(self): current_audit_info = set_mocked_aws_audit_info( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] @@ -99,9 +98,7 @@ class Test_cloudtrail_bucket_requires_mfa_delete: return {"MFADelete": "Enabled", "Status": "Enabled"} return make_api_call(self, operation_name, kwarg) - @mock_cloudtrail - @mock_s3 - @mock_iam + @mock_aws # Patch with mock_make_api_call_getbucketversioning_mfadelete_enabled: @patch( "botocore.client.BaseClient._make_api_call", @@ -153,8 +150,7 @@ class Test_cloudtrail_bucket_requires_mfa_delete: assert result[0].resource_arn == trail_us["TrailARN"] assert result[0].resource_tags == [] - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trails_with_no_mfa_bucket_cross(self): current_audit_info = set_mocked_aws_audit_info( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] @@ -204,9 +200,7 @@ class Test_cloudtrail_bucket_requires_mfa_delete: assert result[0].resource_arn == trail_us["TrailARN"] assert result[0].resource_tags == [] - @mock_cloudtrail - @mock_s3 - @mock_iam + @mock_aws # Patch with mock_make_api_call_getbucketversioning_mfadelete_enabled: @patch( "botocore.client.BaseClient._make_api_call", 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 aaf90ee1..b79997dd 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 @@ -3,7 +3,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -13,8 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudtrail_cloudwatch_logging_enabled: - @mock_cloudtrail - @mock_s3 + @mock_aws def test_no_trails(self): current_audit_info = set_mocked_aws_audit_info( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] @@ -41,8 +40,7 @@ class Test_cloudtrail_cloudwatch_logging_enabled: result = check.execute() assert len(result) == 0 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trails_sending_logs_during_and_not_last_day(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -129,8 +127,7 @@ class Test_cloudtrail_cloudwatch_logging_enabled: assert report.resource_tags == [] assert report.region == AWS_REGION_EU_WEST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_multi_region_and_single_region_logging_and_not(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -218,8 +215,7 @@ class Test_cloudtrail_cloudwatch_logging_enabled: ) assert report.resource_tags == [] - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trails_sending_and_not_sending_logs(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_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 ac148aa0..828bd6ed 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_s3 +from moto import mock_aws from prowler.providers.aws.services.cloudtrail.cloudtrail_service import Cloudtrail from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudtrail_insights_exist: - @mock_cloudtrail + @mock_aws def test_no_trails(self): current_audit_info = set_mocked_aws_audit_info( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] @@ -35,8 +35,7 @@ class Test_cloudtrail_insights_exist: result = check.execute() assert len(result) == 0 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trails_with_no_insight_selector(self): current_audit_info = set_mocked_aws_audit_info( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] @@ -81,8 +80,7 @@ class Test_cloudtrail_insights_exist: assert result[0].resource_arn == trail_us["TrailARN"] assert result[0].resource_tags == [] - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trails_with_insight_selector(self): current_audit_info = set_mocked_aws_audit_info( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] 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 66155500..d8e971e8 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_kms, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -12,8 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudtrail_kms_encryption_enabled: - @mock_cloudtrail - @mock_s3 + @mock_aws def test_no_trails(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -38,8 +37,7 @@ class Test_cloudtrail_kms_encryption_enabled: assert len(result) == 0 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_no_kms(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -84,9 +82,7 @@ class Test_cloudtrail_kms_encryption_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 - @mock_kms + @mock_aws def test_trail_kms(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 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 ea9d3977..36000979 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -12,8 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudtrail_log_file_validation_enabled: - @mock_cloudtrail - @mock_s3 + @mock_aws def test_no_trails(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -38,8 +37,7 @@ class Test_cloudtrail_log_file_validation_enabled: assert len(result) == 0 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_no_logging_validation(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -80,8 +78,7 @@ class Test_cloudtrail_log_file_validation_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_various_trails_with_and_without_logging_validation(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 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 a2c76c76..a7f68729 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -12,8 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudtrail_logs_s3_bucket_access_logging_enabled: - @mock_cloudtrail - @mock_s3 + @mock_aws def test_no_trails(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -44,8 +43,7 @@ class Test_cloudtrail_logs_s3_bucket_access_logging_enabled: assert len(result) == 0 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_bucket_not_logging(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -96,8 +94,7 @@ class Test_cloudtrail_logs_s3_bucket_access_logging_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_bucket_logging(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -168,8 +165,7 @@ class Test_cloudtrail_logs_s3_bucket_access_logging_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_bucket_cross_account(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 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 0e3dec79..262ee94b 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -12,8 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible: - @mock_cloudtrail - @mock_s3 + @mock_aws def test_not_trails(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -44,8 +43,7 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible: assert len(result) == 0 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_bucket_no_acl(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -95,8 +93,7 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_bucket_public_acl(self): s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) bucket_name_us = "bucket_test_us" @@ -164,8 +161,7 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_bucket_not_public_acl(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -232,8 +228,7 @@ class Test_cloudtrail_logs_s3_bucket_is_not_publicly_accessible: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_bucket_cross_account(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) 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 86a3da2e..cebbe0c8 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -13,7 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudtrail_multi_region_enabled: - @mock_cloudtrail + @mock_aws def test_no_trails(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -65,8 +65,7 @@ class Test_cloudtrail_multi_region_enabled: ) assert report.resource_tags == [] - @mock_cloudtrail - @mock_s3 + @mock_aws def test_various_trails_no_logging(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -142,8 +141,7 @@ class Test_cloudtrail_multi_region_enabled: ) assert report.resource_tags == [] - @mock_cloudtrail - @mock_s3 + @mock_aws def test_various_trails_with_and_without_logging(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -220,8 +218,7 @@ class Test_cloudtrail_multi_region_enabled: assert report.resource_tags == [] assert report.region == AWS_REGION_EU_WEST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_multiregion_logging_and_single_region_not_logging(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 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 a1d326d1..66506867 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudtrail_multi_region_enabled_logging_management_events: - @mock_cloudtrail + @mock_aws def test_no_trails(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -45,8 +45,7 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events: == "No trail found with multi-region enabled and logging management events." ) - @mock_cloudtrail - @mock_s3 + @mock_aws def test_compliant_trail_advanced_event_selector(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -102,8 +101,7 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events: == f"Trail {trail_name_us} from home region {AWS_REGION_US_EAST_1} is multi-region, is logging and have management events enabled." ) - @mock_cloudtrail - @mock_s3 + @mock_aws def test_non_compliant_trail_advanced_event_selector(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -159,8 +157,7 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events: == "No trail found with multi-region enabled and logging management events." ) - @mock_cloudtrail - @mock_s3 + @mock_aws def test_compliant_trail_classic_event_selector(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -215,8 +212,7 @@ class Test_cloudtrail_multi_region_enabled_logging_management_events: == f"Trail {trail_name_us} from home region {AWS_REGION_US_EAST_1} is multi-region, is logging and have management events enabled." ) - @mock_cloudtrail - @mock_s3 + @mock_aws def test_non_compliant_trail_classic_event_selector(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 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 cc5e6609..ba711f1e 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -11,8 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudtrail_s3_dataevents_read_enabled: - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_without_data_events(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -61,8 +60,7 @@ class Test_cloudtrail_s3_dataevents_read_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_without_data_events_ignoring(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -92,8 +90,7 @@ class Test_cloudtrail_s3_dataevents_read_enabled: assert len(result) == 0 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_without_data_events_ignoring_with_buckets(self): s3_client_us_east_1 = client("s3", region_name=AWS_REGION_US_EAST_1) bucket_name_us = "bucket_test_us" @@ -136,8 +133,7 @@ class Test_cloudtrail_s3_dataevents_read_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_without_s3_data_events(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -198,8 +194,7 @@ class Test_cloudtrail_s3_dataevents_read_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_with_s3_classic_data_events(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -260,8 +255,7 @@ class Test_cloudtrail_s3_dataevents_read_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_with_s3_advanced_data_events(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -322,8 +316,7 @@ class Test_cloudtrail_s3_dataevents_read_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_with_s3_three_colons(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 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 a7def7b8..f686d773 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -11,8 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudtrail_s3_dataevents_write_enabled: - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_without_data_events(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -61,8 +60,7 @@ class Test_cloudtrail_s3_dataevents_write_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_without_s3_data_events(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -123,8 +121,7 @@ class Test_cloudtrail_s3_dataevents_write_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_without_s3_data_events_ignoring(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -154,8 +151,7 @@ class Test_cloudtrail_s3_dataevents_write_enabled: assert len(result) == 0 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_without_s3_data_events_ignoring_with_buckets(self): s3_client_us_east_1 = client("s3", region_name=AWS_REGION_US_EAST_1) bucket_name_us = "bucket_test_us" @@ -197,8 +193,7 @@ class Test_cloudtrail_s3_dataevents_write_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_with_s3_data_events(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -259,8 +254,7 @@ class Test_cloudtrail_s3_dataevents_write_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_with_s3_advanced_data_events(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -320,8 +314,7 @@ class Test_cloudtrail_s3_dataevents_write_enabled: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_cloudtrail - @mock_s3 + @mock_aws def test_trail_with_s3_three_colons(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 diff --git a/tests/providers/aws/services/cloudtrail/cloudtrail_service_test.py b/tests/providers/aws/services/cloudtrail/cloudtrail_service_test.py index 939fb48b..37470b47 100644 --- a/tests/providers/aws/services/cloudtrail/cloudtrail_service_test.py +++ b/tests/providers/aws/services/cloudtrail/cloudtrail_service_test.py @@ -1,5 +1,5 @@ from boto3 import client -from moto import mock_cloudtrail, mock_s3 +from moto import mock_aws from prowler.providers.aws.services.cloudtrail.cloudtrail_service import Cloudtrail from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_Cloudtrail_Service: # Test Cloudtrail Service - @mock_cloudtrail + @mock_aws def test_service(self): audit_info = set_mocked_aws_audit_info( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] @@ -21,7 +21,7 @@ class Test_Cloudtrail_Service: assert cloudtrail.service == "cloudtrail" # Test Cloudtrail client - @mock_cloudtrail + @mock_aws def test_client(self): audit_info = set_mocked_aws_audit_info( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] @@ -31,7 +31,7 @@ class Test_Cloudtrail_Service: assert regional_client.__class__.__name__ == "CloudTrail" # Test Cloudtrail session - @mock_cloudtrail + @mock_aws def test__get_session__(self): audit_info = set_mocked_aws_audit_info( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] @@ -40,7 +40,7 @@ class Test_Cloudtrail_Service: assert cloudtrail.session.__class__.__name__ == "Session" # Test Cloudtrail Session - @mock_cloudtrail + @mock_aws def test_audited_account(self): audit_info = set_mocked_aws_audit_info( [AWS_REGION_US_EAST_1, AWS_REGION_EU_WEST_1] @@ -48,8 +48,7 @@ class Test_Cloudtrail_Service: cloudtrail = Cloudtrail(audit_info) assert cloudtrail.audited_account == AWS_ACCOUNT_NUMBER - @mock_cloudtrail - @mock_s3 + @mock_aws def test_describe_trails(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -112,8 +111,7 @@ class Test_Cloudtrail_Service: {"Key": "test", "Value": "test"}, ] - @mock_cloudtrail - @mock_s3 + @mock_aws def test_status_trails(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -158,8 +156,7 @@ class Test_Cloudtrail_Service: assert not trail.latest_cloudwatch_delivery_time assert trail.s3_bucket == bucket_name_us - @mock_cloudtrail - @mock_s3 + @mock_aws def test_get_classic_event_selectors(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 @@ -207,8 +204,7 @@ class Test_Cloudtrail_Service: ) assert not trail.data_events[0].is_advanced - @mock_cloudtrail - @mock_s3 + @mock_aws def test_get_advanced_event_selectors(self): cloudtrail_client_us_east_1 = client( "cloudtrail", region_name=AWS_REGION_US_EAST_1 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 2c8e4a5e..1ddb0d1a 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_changes_to_network_acls_alarm_configured: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -70,10 +68,7 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -133,10 +128,7 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -202,10 +194,7 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -286,10 +275,7 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -382,10 +368,7 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -478,10 +461,7 @@ class Test_cloudwatch_changes_to_network_acls_alarm_configured: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 5452fa2e..f807e751 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_changes_to_network_gateways_alarm_configured: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -70,10 +68,7 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -133,10 +128,7 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -202,10 +194,7 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -286,10 +275,7 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -382,10 +368,7 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -478,10 +461,7 @@ class Test_cloudwatch_changes_to_network_gateways_alarm_configured: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 f1ba52a0..cadcb437 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -70,10 +68,7 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -133,10 +128,7 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -202,10 +194,7 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -286,10 +275,7 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -382,10 +368,7 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -478,10 +461,7 @@ class Test_cloudwatch_changes_to_network_route_tables_alarm_configured: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 46c0fefa..89cabfa2 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_changes_to_vpcs_alarm_configured: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -70,10 +68,7 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -133,10 +128,7 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -202,10 +194,7 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -286,10 +275,7 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -382,10 +368,7 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -478,10 +461,7 @@ class Test_cloudwatch_changes_to_vpcs_alarm_configured: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 043ed402..96557868 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_cross_account_sharing_disabled: - @mock_iam + @mock_aws def test_cloudwatch_without_cross_account_role(self): from prowler.providers.aws.services.iam.iam_service import IAM @@ -53,7 +53,7 @@ class Test_cloudwatch_cross_account_sharing_disabled: ) assert result[0].resource_id == AWS_ACCOUNT_NUMBER - @mock_iam + @mock_aws def test_cloudwatch_log_group_with_cross_account_role(self): # Generate Logs Client iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) 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 994b80f8..106c3094 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_logs +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -45,7 +45,7 @@ class Test_cloudwatch_log_group_kms_encryption_enabled: assert len(result) == 0 - @mock_logs + @mock_aws def test_cloudwatch_log_group_without_kms_key(self): # Generate Logs Client logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -93,7 +93,7 @@ class Test_cloudwatch_log_group_kms_encryption_enabled: ) assert result[0].resource_id == "test" - @mock_logs + @mock_aws def test_cloudwatch_log_group_with_kms_key(self): # Generate Logs Client logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) 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 e07a5988..eeb6720c 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_logs +from moto import mock_aws from moto.core.utils import unix_time_millis from tests.providers.aws.audit_info_utils import ( @@ -47,7 +47,7 @@ class Test_cloudwatch_log_group_no_secrets_in_logs: assert len(result) == 0 - @mock_logs + @mock_aws def test_cloudwatch_log_group_without_secrets(self): # Generate Logs Client logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -100,7 +100,7 @@ class Test_cloudwatch_log_group_no_secrets_in_logs: assert result[0].status_extended == "No secrets found in test log group." assert result[0].resource_id == "test" - @mock_logs + @mock_aws def test_cloudwatch_log_group_with_secrets(self): # Generate Logs Client logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) 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 7e5cba20..ba77b984 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_logs +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -47,7 +47,7 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled: assert len(result) == 0 - @mock_logs + @mock_aws def test_cloudwatch_log_group_without_retention_days_never_expires(self): # Generate Logs Client logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -100,7 +100,7 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs + @mock_aws def test_cloudwatch_log_group_with_compliant_retention_days(self): # Generate Logs Client logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -154,7 +154,7 @@ class Test_cloudwatch_log_group_retention_policy_specific_days_enabled: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs + @mock_aws def test_cloudwatch_log_group_with_no_compliant_retention_days(self): # Generate Logs Client logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) 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 020c5a34..d51e206b 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -72,10 +70,7 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -137,10 +132,7 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -208,10 +200,7 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -294,10 +283,7 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -392,10 +378,7 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -490,10 +473,7 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_c ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 010dec69..fc1c4b9e 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -72,10 +70,7 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -137,10 +132,7 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -208,10 +200,7 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -294,10 +283,7 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -392,10 +378,7 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -490,10 +473,7 @@ class Test_cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_c ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 c7a150eb..d825830f 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_log_metric_filter_authentication_failures: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -70,10 +68,7 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -133,10 +128,7 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -202,10 +194,7 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -286,10 +275,7 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -382,10 +368,7 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -478,10 +461,7 @@ class Test_cloudwatch_log_metric_filter_authentication_failures: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 b6cc560c..3bc9b82f 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_log_metric_filter_aws_organizations_changes: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -70,10 +68,7 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -133,10 +128,7 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -202,10 +194,7 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -286,10 +275,7 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -382,10 +368,7 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -478,10 +461,7 @@ class Test_cloudwatch_log_metric_filter_aws_organizations_changes: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 f8ce1a69..583af0d1 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -72,10 +70,7 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -137,10 +132,7 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -208,10 +200,7 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -294,10 +283,7 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -392,10 +378,7 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -490,10 +473,7 @@ class Test_cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 4b305d7e..86ebed4a 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -70,10 +68,7 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -133,10 +128,7 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -202,10 +194,7 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -286,10 +275,7 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -382,10 +368,7 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -478,10 +461,7 @@ class Test_cloudwatch_log_metric_filter_for_s3_bucket_policy_changes: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 a6f1491c..d3a7bd9f 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -70,10 +68,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -133,10 +128,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -202,10 +194,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -286,10 +275,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -382,10 +368,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -478,10 +461,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 1a44c3df..ec1abf59 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_log_metric_filter_root_usage: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -70,10 +68,7 @@ class Test_cloudwatch_log_metric_filter_root_usage: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -133,10 +128,7 @@ class Test_cloudwatch_log_metric_filter_root_usage: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -202,10 +194,7 @@ class Test_cloudwatch_log_metric_filter_root_usage: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -286,10 +275,7 @@ class Test_cloudwatch_log_metric_filter_root_usage: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -382,10 +368,7 @@ class Test_cloudwatch_log_metric_filter_root_usage: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -478,10 +461,7 @@ class Test_cloudwatch_log_metric_filter_root_usage: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 e4ed1e29..455b10f5 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -70,10 +68,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -133,10 +128,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -202,10 +194,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -286,10 +275,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -382,10 +368,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -478,10 +461,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 d08b2b93..30903353 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -70,10 +68,7 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -133,10 +128,7 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -202,10 +194,7 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -286,10 +275,7 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -382,10 +368,7 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -478,10 +461,7 @@ class Test_cloudwatch_log_metric_filter_sign_in_without_mfa: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) 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 24d766a8..bb4de718 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_cloudtrail, mock_cloudwatch, mock_logs, mock_s3 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,9 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: - @mock_logs - @mock_cloudtrail - @mock_cloudwatch + @mock_aws def test_cloudwatch_no_log_groups(self): from prowler.providers.aws.services.cloudtrail.cloudtrail_service import ( Cloudtrail, @@ -70,10 +68,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_no_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) s3_client = client("s3", region_name=AWS_REGION_US_EAST_1) @@ -133,10 +128,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -202,10 +194,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -286,10 +275,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -382,10 +368,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_quotes(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -478,10 +461,7 @@ class Test_cloudwatch_log_metric_filter_unauthorized_api_calls: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_logs - @mock_cloudtrail - @mock_cloudwatch - @mock_s3 + @mock_aws def test_cloudwatch_trail_with_log_group_with_metric_and_alarm_with_newlines(self): cloudtrail_client = client("cloudtrail", region_name=AWS_REGION_US_EAST_1) cloudwatch_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) diff --git a/tests/providers/aws/services/cloudwatch/cloudwatch_service_test.py b/tests/providers/aws/services/cloudwatch/cloudwatch_service_test.py index 558ff4b0..b339c6c0 100644 --- a/tests/providers/aws/services/cloudwatch/cloudwatch_service_test.py +++ b/tests/providers/aws/services/cloudwatch/cloudwatch_service_test.py @@ -1,5 +1,5 @@ from boto3 import client -from moto import mock_cloudwatch, mock_logs +from moto import mock_aws from prowler.providers.aws.services.cloudwatch.cloudwatch_service import ( CloudWatch, @@ -14,7 +14,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_CloudWatch_Service: # Test CloudWatch Service - @mock_cloudwatch + @mock_aws def test_service(self): # CloudWatch client for this test class audit_info = set_mocked_aws_audit_info( @@ -24,7 +24,7 @@ class Test_CloudWatch_Service: assert cloudwatch.service == "cloudwatch" # Test CloudWatch Client - @mock_cloudwatch + @mock_aws def test_client(self): # CloudWatch client for this test class audit_info = set_mocked_aws_audit_info( @@ -35,7 +35,7 @@ class Test_CloudWatch_Service: assert client_.__class__.__name__ == "CloudWatch" # Test CloudWatch Session - @mock_cloudwatch + @mock_aws def test__get_session__(self): # CloudWatch client for this test class audit_info = set_mocked_aws_audit_info( @@ -45,7 +45,7 @@ class Test_CloudWatch_Service: assert cloudwatch.session.__class__.__name__ == "Session" # Test CloudWatch Session - @mock_cloudwatch + @mock_aws def test_audited_account(self): # CloudWatch client for this test class audit_info = set_mocked_aws_audit_info( @@ -55,7 +55,7 @@ class Test_CloudWatch_Service: assert cloudwatch.audited_account == AWS_ACCOUNT_NUMBER # Test Logs Service - @mock_logs + @mock_aws def test_logs_service(self): # Logs client for this test class audit_info = set_mocked_aws_audit_info( @@ -65,7 +65,7 @@ class Test_CloudWatch_Service: assert logs.service == "logs" # Test Logs Client - @mock_logs + @mock_aws def test_logs_client(self): # Logs client for this test class audit_info = set_mocked_aws_audit_info( @@ -76,7 +76,7 @@ class Test_CloudWatch_Service: assert client_.__class__.__name__ == "CloudWatchLogs" # Test Logs Session - @mock_logs + @mock_aws def test__logs_get_session__(self): # Logs client for this test class audit_info = set_mocked_aws_audit_info( @@ -86,7 +86,7 @@ class Test_CloudWatch_Service: assert logs.session.__class__.__name__ == "Session" # Test Logs Session - @mock_logs + @mock_aws def test_logs_audited_account(self): # Logs client for this test class audit_info = set_mocked_aws_audit_info( @@ -96,7 +96,7 @@ class Test_CloudWatch_Service: assert logs.audited_account == AWS_ACCOUNT_NUMBER # Test CloudWatch Alarms - @mock_cloudwatch + @mock_aws def test__describe_alarms__(self): # CloudWatch client for this test class cw_client = client("cloudwatch", region_name=AWS_REGION_US_EAST_1) @@ -135,7 +135,7 @@ class Test_CloudWatch_Service: ] # Test Logs Filters - @mock_logs + @mock_aws def test__describe_metric_filters__(self): # Logs client for this test class logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -163,7 +163,7 @@ class Test_CloudWatch_Service: assert logs.metric_filters[0].region == AWS_REGION_US_EAST_1 # Test Logs Filters - @mock_logs + @mock_aws def test__describe_log_groups__(self): # Logs client for this test class logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) @@ -193,7 +193,7 @@ class Test_CloudWatch_Service: {"tag_key_1": "tag_value_1", "tag_key_2": "tag_value_2"} ] - @mock_logs + @mock_aws def test__describe_log_groups__never_expire(self): # Logs client for this test class logs_client = client("logs", region_name=AWS_REGION_US_EAST_1) diff --git a/tests/providers/aws/services/cognito/cognito_service_test.py b/tests/providers/aws/services/cognito/cognito_service_test.py index e1279555..6128c070 100644 --- a/tests/providers/aws/services/cognito/cognito_service_test.py +++ b/tests/providers/aws/services/cognito/cognito_service_test.py @@ -1,5 +1,5 @@ from boto3 import client -from moto import mock_cognitoidp +from moto import mock_aws from prowler.providers.aws.services.cognito.cognito_service import CognitoIDP from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_Cognito_Service: # Test Cognito Service - @mock_cognitoidp + @mock_aws def test_service(self): audit_info = set_mocked_aws_audit_info( audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] @@ -21,7 +21,7 @@ class Test_Cognito_Service: assert cognito.service == "cognito-idp" # Test Cognito client - @mock_cognitoidp + @mock_aws def test_client(self): audit_info = set_mocked_aws_audit_info( audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] @@ -31,7 +31,7 @@ class Test_Cognito_Service: assert regional_client.__class__.__name__ == "CognitoIdentityProvider" # Test Cognito session - @mock_cognitoidp + @mock_aws def test__get_session__(self): audit_info = set_mocked_aws_audit_info( audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] @@ -40,7 +40,7 @@ class Test_Cognito_Service: assert cognito.session.__class__.__name__ == "Session" # Test Cognito Session - @mock_cognitoidp + @mock_aws def test_audited_account(self): audit_info = set_mocked_aws_audit_info( audited_regions=[AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1] @@ -48,7 +48,7 @@ class Test_Cognito_Service: cognito = CognitoIDP(audit_info) assert cognito.audited_account == AWS_ACCOUNT_NUMBER - @mock_cognitoidp + @mock_aws def test_list_user_pools(self): user_pool_name_1 = "user_pool_test_1" user_pool_name_2 = "user_pool_test_2" @@ -67,7 +67,7 @@ class Test_Cognito_Service: ) assert user_pool.region == "eu-west-1" or user_pool.region == "us-east-1" - @mock_cognitoidp + @mock_aws def test_describe_user_pools(self): user_pool_name_1 = "user_pool_test_1" audit_info = set_mocked_aws_audit_info( @@ -88,7 +88,7 @@ class Test_Cognito_Service: assert user_pool.advanced_security_mode is not None assert user_pool.tags is not None - @mock_cognitoidp + @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( 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 80bc0069..852d852a 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_config +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -14,7 +14,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_config_recorder_all_regions_enabled: - @mock_config + @mock_aws def test_config_no_recorders(self): from prowler.providers.aws.services.config.config_service import Config @@ -48,7 +48,7 @@ class Test_config_recorder_all_regions_enabled: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].resource_id == AWS_ACCOUNT_NUMBER - @mock_config + @mock_aws def test_config_one_recoder_disabled(self): # Create Config Mocked Resources config_client = client("config", region_name=AWS_REGION_US_EAST_1) @@ -87,7 +87,7 @@ class Test_config_recorder_all_regions_enabled: assert recorder.resource_arn == AWS_ACCOUNT_ARN assert recorder.region == AWS_REGION_US_EAST_1 - @mock_config + @mock_aws def test_config_one_recoder_enabled(self): # Create Config Mocked Resources config_client = client("config", region_name=AWS_REGION_US_EAST_1) @@ -131,7 +131,7 @@ class Test_config_recorder_all_regions_enabled: assert recorder.resource_arn == AWS_ACCOUNT_ARN assert recorder.region == AWS_REGION_US_EAST_1 - @mock_config + @mock_aws def test_config_one_recorder_disabled_allowlisted(self): # Create Config Mocked Resources config_client = client("config", region_name=AWS_REGION_US_EAST_1) diff --git a/tests/providers/aws/services/config/config_service_test.py b/tests/providers/aws/services/config/config_service_test.py index bd62a9c5..45606d9d 100644 --- a/tests/providers/aws/services/config/config_service_test.py +++ b/tests/providers/aws/services/config/config_service_test.py @@ -1,5 +1,5 @@ from boto3 import client -from moto import mock_config +from moto import mock_aws from prowler.providers.aws.services.config.config_service import Config from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_Config_Service: # Test Config Service - @mock_config + @mock_aws def test_service(self): # Config client for this test class audit_info = set_mocked_aws_audit_info( @@ -22,7 +22,7 @@ class Test_Config_Service: assert config.service == "config" # Test Config Client - @mock_config + @mock_aws def test_client(self): # Config client for this test class audit_info = set_mocked_aws_audit_info( @@ -33,7 +33,7 @@ class Test_Config_Service: assert regional_client.__class__.__name__ == "ConfigService" # Test Config Session - @mock_config + @mock_aws def test__get_session__(self): # Config client for this test class audit_info = set_mocked_aws_audit_info( @@ -43,7 +43,7 @@ class Test_Config_Service: assert config.session.__class__.__name__ == "Session" # Test Config Session - @mock_config + @mock_aws def test_audited_account(self): # Config client for this test class audit_info = set_mocked_aws_audit_info( @@ -53,7 +53,7 @@ class Test_Config_Service: assert config.audited_account == AWS_ACCOUNT_NUMBER # Test Config Get Rest APIs - @mock_config + @mock_aws def test__describe_configuration_recorder_status__(self): # Generate Config Client config_client = client("config", region_name=AWS_REGION_US_EAST_1) diff --git a/tests/providers/aws/services/directoryservice/directoryservice_service_test.py b/tests/providers/aws/services/directoryservice/directoryservice_service_test.py index 41fc8bc9..bde1964f 100644 --- a/tests/providers/aws/services/directoryservice/directoryservice_service_test.py +++ b/tests/providers/aws/services/directoryservice/directoryservice_service_test.py @@ -2,7 +2,7 @@ from datetime import datetime from unittest.mock import patch import botocore -from moto import mock_ds +from moto import mock_aws from prowler.providers.aws.services.directoryservice.directoryservice_service import ( AuthenticationProtocol, @@ -119,7 +119,7 @@ def mock_generate_regional_clients(service, audit_info): ) class Test_DirectoryService_Service: # Test DirectoryService Client - @mock_ds + @mock_aws def test__get_client__(self): directoryservice = DirectoryService( set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) @@ -130,7 +130,7 @@ class Test_DirectoryService_Service: ) # Test DirectoryService Session - @mock_ds + @mock_aws def test__get_session__(self): directoryservice = DirectoryService( set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) @@ -138,14 +138,14 @@ class Test_DirectoryService_Service: assert directoryservice.session.__class__.__name__ == "Session" # Test DirectoryService Service - @mock_ds + @mock_aws def test__get_service__(self): directoryservice = DirectoryService( set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1, AWS_REGION_US_EAST_1]) ) assert directoryservice.service == "ds" - @mock_ds + @mock_aws def test__describe_directories__(self): # Set partition for the service directoryservice = DirectoryService( 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 414d12af..062378a3 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.dlm.dlm_service import LifecyclePolicy from tests.providers.aws.audit_info_utils import ( @@ -15,7 +15,7 @@ LIFECYCLE_POLICY_ID = "policy-XXXXXXXXXXXX" class Test_dlm_ebs_snapshot_lifecycle_policy_exists: - @mock_ec2 + @mock_aws def test_no_ebs_snapshot_no_lifecycle_policies(self): # DLM Mock Client dlm_client = mock.MagicMock @@ -48,7 +48,7 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists: result = check.execute() assert len(result) == 0 - @mock_ec2 + @mock_aws def test_one_ebs_snapshot_and_dlm_lifecycle_policy(self): # Generate EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -113,7 +113,7 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists: assert result[0].resource_id == AWS_ACCOUNT_NUMBER assert result[0].resource_arn == AWS_ACCOUNT_ARN - @mock_ec2 + @mock_aws def test_one_ebs_snapshot_and_no_dlm_lifecycle_policy(self): # Generate EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -166,7 +166,7 @@ class Test_dlm_ebs_snapshot_lifecycle_policy_exists: result = check.execute() assert len(result) == 0 - @mock_ec2 + @mock_aws def test_no_ebs_snapshot_and_dlm_lifecycle_policy(self): # DLM Mock Client dlm_client = mock.MagicMock 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 4541863c..0175b52c 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_dax +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -13,7 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_dynamodb_accelerator_cluster_encryption_enabled: - @mock_dax + @mock_aws def test_dax_no_clusters(self): from prowler.providers.aws.services.dynamodb.dynamodb_service import DAX @@ -38,7 +38,7 @@ class Test_dynamodb_accelerator_cluster_encryption_enabled: assert len(result) == 0 - @mock_dax + @mock_aws def test_dax_cluster_no_encryption(self): dax_client = client("dax", region_name=AWS_REGION_US_EAST_1) iam_role_arn = f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:role/aws-service-role/dax.amazonaws.com/AWSServiceRoleForDAX" @@ -80,7 +80,7 @@ class Test_dynamodb_accelerator_cluster_encryption_enabled: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] - @mock_dax + @mock_aws def test_dax_cluster_with_encryption(self): dax_client = client("dax", region_name=AWS_REGION_US_EAST_1) iam_role_arn = f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:role/aws-service-role/dax.amazonaws.com/AWSServiceRoleForDAX" diff --git a/tests/providers/aws/services/dynamodb/dynamodb_service_test.py b/tests/providers/aws/services/dynamodb/dynamodb_service_test.py index face5d48..eb4558a6 100644 --- a/tests/providers/aws/services/dynamodb/dynamodb_service_test.py +++ b/tests/providers/aws/services/dynamodb/dynamodb_service_test.py @@ -1,5 +1,5 @@ from boto3 import client -from moto import mock_dax, mock_dynamodb +from moto import mock_aws from prowler.providers.aws.services.dynamodb.dynamodb_service import DAX, DynamoDB from tests.providers.aws.audit_info_utils import ( @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_DynamoDB_Service: # Test Dynamo Service - @mock_dynamodb + @mock_aws def test_service(self): # Dynamo client for this test class audit_info = set_mocked_aws_audit_info() @@ -19,7 +19,7 @@ class Test_DynamoDB_Service: assert dynamodb.service == "dynamodb" # Test Dynamo Client - @mock_dynamodb + @mock_aws def test_client(self): # Dynamo client for this test class audit_info = set_mocked_aws_audit_info() @@ -28,7 +28,7 @@ class Test_DynamoDB_Service: assert regional_client.__class__.__name__ == "DynamoDB" # Test Dynamo Session - @mock_dynamodb + @mock_aws def test__get_session__(self): # Dynamo client for this test class audit_info = set_mocked_aws_audit_info() @@ -36,7 +36,7 @@ class Test_DynamoDB_Service: assert dynamodb.session.__class__.__name__ == "Session" # Test Dynamo Session - @mock_dynamodb + @mock_aws def test_audited_account(self): # Dynamo client for this test class audit_info = set_mocked_aws_audit_info() @@ -44,7 +44,7 @@ class Test_DynamoDB_Service: assert dynamodb.audited_account == AWS_ACCOUNT_NUMBER # Test DynamoDB List Tables - @mock_dynamodb + @mock_aws def test__list_tables__(self): # Generate DynamoDB Client dynamodb_client = client("dynamodb", region_name=AWS_REGION_US_EAST_1) @@ -83,7 +83,7 @@ class Test_DynamoDB_Service: assert dynamo.tables[1].region == AWS_REGION_US_EAST_1 # Test DynamoDB Describe Table - @mock_dynamodb + @mock_aws def test__describe_table__(self): # Generate DynamoDB Client dynamodb_client = client("dynamodb", region_name=AWS_REGION_US_EAST_1) @@ -115,7 +115,7 @@ class Test_DynamoDB_Service: ] # Test DynamoDB Describe Continuous Backups - @mock_dynamodb + @mock_aws def test__describe_continuous_backups__(self): # Generate DynamoDB Client dynamodb_client = client("dynamodb", region_name=AWS_REGION_US_EAST_1) @@ -146,7 +146,7 @@ class Test_DynamoDB_Service: assert dynamo.tables[0].region == AWS_REGION_US_EAST_1 # Test DAX Describe Clusters - @mock_dax + @mock_aws def test__describe_clusters__(self): # Generate DAX Client dax_client = client("dax", region_name=AWS_REGION_US_EAST_1) 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 c9823458..25f6cf4a 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_dynamodb +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_dynamodb_tables_kms_cmk_encryption_enabled: - @mock_dynamodb + @mock_aws def test_dynamodb_no_tables(self): from prowler.providers.aws.services.dynamodb.dynamodb_service import DynamoDB @@ -37,7 +37,7 @@ class Test_dynamodb_tables_kms_cmk_encryption_enabled: assert len(result) == 0 - @mock_dynamodb + @mock_aws def test_dynamodb_table_kms_encryption(self): dynamodb_client = client("dynamodb", region_name=AWS_REGION_US_EAST_1) table = dynamodb_client.create_table( @@ -82,7 +82,7 @@ class Test_dynamodb_tables_kms_cmk_encryption_enabled: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] - @mock_dynamodb + @mock_aws def test_dynamodb_table_default_encryption(self): dynamodb_client = client("dynamodb", region_name=AWS_REGION_US_EAST_1) table = dynamodb_client.create_table( 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 6c172f48..5da92896 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_dynamodb +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_dynamodb_tables_pitr_enabled: - @mock_dynamodb + @mock_aws def test_dynamodb_no_tables(self): from prowler.providers.aws.services.dynamodb.dynamodb_service import DynamoDB @@ -37,7 +37,7 @@ class Test_dynamodb_tables_pitr_enabled: assert len(result) == 0 - @mock_dynamodb + @mock_aws def test_dynamodb_table_no_pitr(self): dynamodb_client = client("dynamodb", region_name=AWS_REGION_US_EAST_1) table = dynamodb_client.create_table( @@ -84,7 +84,7 @@ class Test_dynamodb_tables_pitr_enabled: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] - @mock_dynamodb + @mock_aws def test_dynamodb_table_with_pitr(self): dynamodb_client = client("dynamodb", region_name=AWS_REGION_US_EAST_1) table = dynamodb_client.create_table( 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 5271f75f..69419791 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -13,7 +13,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_ami_public: - @mock_ec2 + @mock_aws def test_no_amis(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -38,7 +38,7 @@ class Test_ec2_ami_public: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_one_private_ami(self): ec2 = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -81,7 +81,7 @@ class Test_ec2_ami_public: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] - @mock_ec2 + @mock_aws def test_one_public_ami(self): ec2 = client("ec2", region_name=AWS_REGION_US_EAST_1) 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 a83b3faf..1cbf16fc 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -14,7 +14,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_ebs_default_encryption: - @mock_ec2 + @mock_aws def test_ec2_ebs_encryption_enabled(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -54,7 +54,7 @@ class Test_ec2_ebs_default_encryption: result.resource_arn == f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" ) - @mock_ec2 + @mock_aws def test_ec2_ebs_encryption_disabled(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -86,7 +86,7 @@ class Test_ec2_ebs_default_encryption: assert result[0].resource_id == AWS_ACCOUNT_NUMBER assert result[0].resource_arn == f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root" - @mock_ec2 + @mock_aws def test_ec2_ebs_encryption_disabled_ignored(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -113,7 +113,7 @@ class Test_ec2_ebs_default_encryption: # One result per region assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_ebs_encryption_disabled_ignoring_with_volumes(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 5793cc9b..4a29f7e0 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 @@ -2,7 +2,7 @@ from unittest import mock from boto3 import client, resource from mock import patch -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -24,7 +24,7 @@ def mock_generate_regional_clients(service, audit_info): new=mock_generate_regional_clients, ) class Test_ec2_ebs_public_snapshot: - @mock_ec2 + @mock_aws def test_ec2_default_snapshots(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -50,7 +50,7 @@ class Test_ec2_ebs_public_snapshot: # Default snapshots assert len(result) == 561 - @mock_ec2 + @mock_aws def test_ec2_public_snapshot(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) @@ -102,7 +102,7 @@ class Test_ec2_ebs_public_snapshot: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:snapshot/{snapshot.id}" ) - @mock_ec2 + @mock_aws def test_ec2_private_snapshot(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 46a7bd82..e55f93e8 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 @@ -2,7 +2,7 @@ from unittest import mock from boto3 import resource from mock import patch -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -24,7 +24,7 @@ def mock_generate_regional_clients(service, audit_info): new=mock_generate_regional_clients, ) class Test_ec2_ebs_snapshots_encrypted: - @mock_ec2 + @mock_aws def test_ec2_default_snapshots(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -50,7 +50,7 @@ class Test_ec2_ebs_snapshots_encrypted: # Default snapshots assert len(result) == 561 - @mock_ec2 + @mock_aws def test_ec2_unencrypted_snapshot(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) @@ -95,7 +95,7 @@ class Test_ec2_ebs_snapshots_encrypted: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:snapshot/{snapshot.id}" ) - @mock_ec2 + @mock_aws def test_ec2_encrypted_snapshot(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 1ddd4d31..1124be90 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import resource -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_ebs_volume_encryption: - @mock_ec2 + @mock_aws def test_ec2_no_volumes(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -36,7 +36,7 @@ class Test_ec2_ebs_volume_encryption: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_unencrypted_volume(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) @@ -77,7 +77,7 @@ class Test_ec2_ebs_volume_encryption: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:volume/{volume.id}" ) - @mock_ec2 + @mock_aws def test_ec2_encrypted_volume(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 9e761f86..d4e8b284 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 @@ -2,7 +2,7 @@ from unittest import mock from boto3 import resource from mock import patch -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -26,7 +26,7 @@ def mock_generate_regional_clients(service, audit_info): new=mock_generate_regional_clients, ) class Test_ec2_ebs_volume_snapshots_exists: - @mock_ec2 + @mock_aws def test_no_volumes(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -51,7 +51,7 @@ class Test_ec2_ebs_volume_snapshots_exists: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_volume_without_snapshots(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) volume = ec2.create_volume(Size=80, AvailabilityZone=AWS_REGION_US_EAST_1_AZA) @@ -88,7 +88,7 @@ class Test_ec2_ebs_volume_snapshots_exists: assert result[0].resource_tags is None assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_ec2_volume_with_snapshot(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) @@ -128,7 +128,7 @@ class Test_ec2_ebs_volume_snapshots_exists: assert result[0].resource_tags is None assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_ec2_volume_with_and_without_snapshot(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 924ceca9..794cc204 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -14,7 +14,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_elastic_ip_shodan: - @mock_ec2 + @mock_aws def test_ec2_one_instances_no_public_ip(self): # Create EC2 Mocked Resources ec2_client = client("ec2", AWS_REGION_US_EAST_1) @@ -45,7 +45,7 @@ class Test_ec2_elastic_ip_shodan: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_one_unattached_eip(self): # Create EC2 Mocked Resources ec2_client = client("ec2", AWS_REGION_US_EAST_1) @@ -76,7 +76,7 @@ class Test_ec2_elastic_ip_shodan: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_one_attached_eip_no_shodan_api_key(self): # Create EC2 Mocked Resources ec2_client = client("ec2", AWS_REGION_US_EAST_1) @@ -114,7 +114,7 @@ class Test_ec2_elastic_ip_shodan: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_one_attached_eip_shodan_api_key(self): # Create EC2 Mocked Resources ec2_client = client("ec2", AWS_REGION_US_EAST_1) 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 7cae5b48..19d21f34 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -14,7 +14,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_elastic_ip_unassigned: - @mock_ec2 + @mock_aws def test_no_eips(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -39,7 +39,7 @@ class Test_ec2_elastic_ip_unassigned: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_eip_unassociated(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -81,7 +81,7 @@ class Test_ec2_elastic_ip_unassigned: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:eip-allocation/{allocation_id}" ) - @mock_ec2 + @mock_aws def test_eip_associated(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) 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 2c1a9ca2..c47e133d 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import resource -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -13,7 +13,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_instance_detailed_monitoring_enabled: - @mock_ec2 + @mock_aws def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -38,7 +38,7 @@ class Test_ec2_instance_detailed_monitoring_enabled: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_instance_with_enhanced_monitoring_disabled(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) instance = ec2.create_instances( @@ -83,7 +83,7 @@ class Test_ec2_instance_detailed_monitoring_enabled: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" ) - @mock_ec2 + @mock_aws def test_instance_with_enhanced_monitoring_enabled(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) instance = ec2.create_instances( 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 e66005ed..c4050dd7 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import resource -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -14,7 +14,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_instance_imdsv2_enabled: - @mock_ec2 + @mock_aws def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -39,7 +39,7 @@ class Test_ec2_instance_imdsv2_enabled: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_one_compliant_ec2(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) instance = ec2.create_instances( @@ -90,7 +90,7 @@ class Test_ec2_instance_imdsv2_enabled: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" ) - @mock_ec2 + @mock_aws def test_one_uncompliant_ec2_metadata_server_disabled(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) instance = ec2.create_instances( @@ -141,7 +141,7 @@ class Test_ec2_instance_imdsv2_enabled: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" ) - @mock_ec2 + @mock_aws def test_one_uncompliant_ec2_metadata_server_enabled(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) instance = ec2.create_instances( 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 8bd84bee..c94bdaeb 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -14,7 +14,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_instance_internet_facing_with_instance_profile: - @mock_ec2 + @mock_aws def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -39,8 +39,7 @@ class Test_ec2_instance_internet_facing_with_instance_profile: assert len(result) == 0 - @mock_iam - @mock_ec2 + @mock_aws def test_one_compliant_ec2(self): iam = client("iam", "us-west-1") profile_name = "fake_profile" @@ -97,8 +96,7 @@ class Test_ec2_instance_internet_facing_with_instance_profile: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" ) - @mock_iam - @mock_ec2 + @mock_aws def test_one_non_compliant_ec2(self): iam = client("iam", "us-west-1") profile_name = "fake_profile" 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 7c5cd16b..9d17ec4d 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.ssm.ssm_service import ManagedInstance from tests.providers.aws.audit_info_utils import ( @@ -15,7 +15,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_instance_managed_by_ssm_test: - @mock_ec2 + @mock_aws def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -49,7 +49,7 @@ class Test_ec2_instance_managed_by_ssm_test: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_instance_managed_by_ssm_non_compliance_instance(self): ssm_client = mock.MagicMock ssm_client.managed_instances = {} @@ -102,7 +102,7 @@ class Test_ec2_instance_managed_by_ssm_test: ) assert result[0].resource_id == instance.id - @mock_ec2 + @mock_aws def test_ec2_instance_managed_by_ssm_compliance_instance(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) instance = ec2.create_instances( 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 55d39664..c5afd5fe 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 @@ -4,7 +4,7 @@ from unittest import mock from boto3 import resource from dateutil.tz import tzutc -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -16,7 +16,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_instance_older_than_specific_days: - @mock_ec2 + @mock_aws def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -42,7 +42,7 @@ class Test_ec2_instance_older_than_specific_days: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_one_compliant_ec2(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) instance = ec2.create_instances( @@ -86,7 +86,7 @@ class Test_ec2_instance_older_than_specific_days: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" ) - @mock_ec2 + @mock_aws def test_one_old_ec2(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) instance = ec2.create_instances( 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 ad441ce8..107f430b 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -14,7 +14,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_instance_profile_attached: - @mock_ec2 + @mock_aws def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -39,8 +39,7 @@ class Test_ec2_instance_profile_attached: assert len(result) == 0 - @mock_iam - @mock_ec2 + @mock_aws def test_one_compliant_ec2(self): iam = client("iam", "us-west-1") profile_name = "fake_profile" @@ -98,7 +97,7 @@ class Test_ec2_instance_profile_attached: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" ) - @mock_ec2 + @mock_aws def test_one_non_compliant_ec2(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16") 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 45cca490..08771f65 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import resource -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -14,7 +14,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_instance_public_ip: - @mock_ec2 + @mock_aws def test_ec2_no_instances(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -39,7 +39,7 @@ class Test_ec2_instance_public_ip: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_one_compliant_ec2(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16") @@ -91,7 +91,7 @@ class Test_ec2_instance_public_ip: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:instance/{instance.id}" ) - @mock_ec2 + @mock_aws def test_one_ec2_with_public_ip(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16") 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 033956aa..5361698c 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 @@ -3,7 +3,7 @@ from pathlib import Path from unittest import mock from boto3 import resource -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -18,7 +18,7 @@ FIXTURES_DIR_NAME = "fixtures" class Test_ec2_instance_secrets_user_data: - @mock_ec2 + @mock_aws def test_no_ec2(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -43,7 +43,7 @@ class Test_ec2_instance_secrets_user_data: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_one_ec2_with_no_secrets(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) instance = ec2.create_instances( @@ -87,7 +87,7 @@ class Test_ec2_instance_secrets_user_data: assert result[0].resource_tags is None assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_one_ec2_with_secrets(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) instance = ec2.create_instances( @@ -131,7 +131,7 @@ class Test_ec2_instance_secrets_user_data: assert result[0].resource_tags is None assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_one_ec2_file_with_secrets(self): # Include launch_configurations to check f = open( @@ -178,7 +178,7 @@ class Test_ec2_instance_secrets_user_data: assert result[0].resource_tags is None assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_one_launch_configurations_without_user_data(self): ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) instance = ec2.create_instances( @@ -219,7 +219,7 @@ class Test_ec2_instance_secrets_user_data: assert result[0].resource_tags is None assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_one_ec2_file_with_secrets_gzip(self): # Include launch_configurations to check f = open( 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 b5664e3c..e1621af9 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_networkacl_allow_ingress_any_port: - @mock_ec2 + @mock_aws def test_ec2_default_nacls(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -37,7 +37,7 @@ class Test_ec2_networkacl_allow_ingress_any_port: # One default nacl per region assert len(result) == 2 - @mock_ec2 + @mock_aws def test_ec2_non_default_compliant_nacl(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -72,7 +72,7 @@ class Test_ec2_networkacl_allow_ingress_any_port: == f"Network ACL {result[0].resource_id} has every port open to the Internet." ) - @mock_ec2 + @mock_aws def test_ec2_non_compliant_nacl(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -127,7 +127,7 @@ class Test_ec2_networkacl_allow_ingress_any_port: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" ) - @mock_ec2 + @mock_aws def test_ec2_compliant_nacl(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -182,7 +182,7 @@ class Test_ec2_networkacl_allow_ingress_any_port: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" ) - @mock_ec2 + @mock_aws def test_ec2_non_compliant_nacl_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -223,7 +223,7 @@ class Test_ec2_networkacl_allow_ingress_any_port: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_non_compliant_nacl_ignoring_with_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) 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 edb0aa50..5281f5e9 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_networkacl_allow_ingress_tcp_port_22: - @mock_ec2 + @mock_aws def test_ec2_default_nacls(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -37,7 +37,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: # One default nacl per region assert len(result) == 2 - @mock_ec2 + @mock_aws def test_ec2_non_default_compliant_nacl(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -72,7 +72,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: == f"Network ACL {result[0].resource_id} has SSH port 22 open to the Internet." ) - @mock_ec2 + @mock_aws def test_ec2_non_compliant_nacl(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -128,7 +128,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" ) - @mock_ec2 + @mock_aws def test_ec2_compliant_nacl(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -184,7 +184,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" ) - @mock_ec2 + @mock_aws def test_ec2_non_compliant_nacl_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -225,7 +225,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_22: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_non_compliant_nacl_ignoring_with_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) 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 02d8d78f..61041086 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_networkacl_allow_ingress_tcp_port_3389: - @mock_ec2 + @mock_aws def test_ec2_default_nacls(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -37,7 +37,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: # One default nacl per region assert len(result) == 2 - @mock_ec2 + @mock_aws def test_ec2_non_default_compliant_nacl(self): from prowler.providers.aws.services.ec2.ec2_service import EC2 @@ -72,7 +72,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: == f"Network ACL {result[0].resource_id} has Microsoft RDP port 3389 open to the Internet." ) - @mock_ec2 + @mock_aws def test_ec2_non_compliant_nacl(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -128,7 +128,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" ) - @mock_ec2 + @mock_aws def test_ec2_compliant_nacl(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -184,7 +184,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: == f"arn:{current_audit_info.audited_partition}:ec2:{AWS_REGION_US_EAST_1}:{current_audit_info.audited_account}:network-acl/{nacl_id}" ) - @mock_ec2 + @mock_aws def test_ec2_non_compliant_nacl_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -225,7 +225,7 @@ class Test_ec2_networkacl_allow_ingress_tcp_port_3389: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_non_compliant_nacl_ignoring_with_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) 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 647a851b..c815051e 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -52,7 +52,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -182,7 +182,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg_only_open_to_one_port(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -252,7 +252,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -288,7 +288,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_any_port: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 d743d896..4295c3bd 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -51,7 +51,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_2 assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_2 assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -183,7 +183,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_2 assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -218,7 +218,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_2 assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 72c93904..4f683cb4 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -51,7 +51,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21: assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -183,7 +183,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -218,7 +218,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 f3eb1b1a..cbf04492 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -13,7 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -50,7 +50,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22: assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -118,7 +118,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -182,7 +182,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -215,7 +215,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_22: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 8e2a32f5..e60e76fb 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -49,7 +49,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389: assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -82,7 +82,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) @@ -124,7 +124,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389: assert result[0].status == "PASS" assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -188,7 +188,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_3389: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) 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 b86c08ce..a9edee7c 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7199_9160_8888: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -51,7 +51,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7 assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7 assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -183,7 +183,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7 assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -218,7 +218,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_cassandra_7 assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 12a47a0e..d085d919 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsearch_kibana_9200_9300_5601: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -51,7 +51,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsear assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsear assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -183,7 +183,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsear assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -218,7 +218,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_elasticsear assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 f0594dee..c0071218 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -51,7 +51,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092: assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -183,7 +183,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -218,7 +218,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_kafka_9092: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 ec182d72..d32fe6dc 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_11211: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -51,7 +51,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_1 assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_1 assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -183,7 +183,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_1 assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -218,7 +218,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_memcached_1 assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 28be6de6..773b5da8 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -51,7 +51,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306: assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -183,7 +183,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -218,7 +218,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mysql_3306: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 09c12ead..50310554 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521_2483: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -51,7 +51,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521 assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521 assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -183,7 +183,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521 assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -218,7 +218,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_oracle_1521 assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 dcf87a62..53f18511 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_5432: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -51,7 +51,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -183,7 +183,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg_ipv4_and_ipv6(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -254,7 +254,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -289,7 +289,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_postgres_54 assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 ab91b09a..32e8ae91 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client_us_east_1 = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -92,7 +92,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: assert res.resource_details == sg["GroupName"] assert res.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client_us_east_1 = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -161,7 +161,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -229,7 +229,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -267,7 +267,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_redis_6379: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 4410d491..0f348420 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_1433_1434: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -51,7 +51,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_ assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_ assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -183,7 +183,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_ assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -218,7 +218,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_sql_server_ assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 f801e3c9..fc4e6c06 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -51,7 +51,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23: assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -117,7 +117,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -183,7 +183,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -218,7 +218,7 @@ class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_telnet_23: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_ec2_default_sgs_ignoring_vpc_in_use(self): # Create EC2 Mocked Resources ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 cbbabe0c..16dd6281 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_allow_wide_open_public_ipv4: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -45,7 +45,7 @@ class Test_ec2_securitygroup_allow_wide_open_public_ipv4: assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_default_sg_with_RFC1918_address(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -104,7 +104,7 @@ class Test_ec2_securitygroup_allow_wide_open_public_ipv4: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_default_sg_with_non_RFC1918_address(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) 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 863af9d8..00514eca 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -10,7 +10,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_default_restrict_traffic: - @mock_ec2 + @mock_aws def test_ec2_compliant_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -67,7 +67,7 @@ class Test_ec2_securitygroup_default_restrict_traffic: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_id == default_sg_id - @mock_ec2 + @mock_aws def test_ec2_non_compliant_sg_ingress_rule(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -130,7 +130,7 @@ class Test_ec2_securitygroup_default_restrict_traffic: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_id == default_sg_id - @mock_ec2 + @mock_aws def test_ec2_non_compliant_sg_egress_rule(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) 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 32a25ae2..48dc4e13 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -13,7 +13,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_securitygroup_from_launch_wizard: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -47,7 +47,7 @@ class Test_ec2_securitygroup_from_launch_wizard: assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_launch_wizard_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -96,7 +96,7 @@ class Test_ec2_securitygroup_from_launch_wizard: ) assert sg.resource_details == sg_name - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) 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 81b0ea50..24b74299 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_iam, mock_lambda +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -14,8 +14,7 @@ EXAMPLE_AMI_ID = "ami-12c6146b" class Test_ec2_securitygroup_not_used: - @mock_ec2 - @mock_lambda + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -49,8 +48,7 @@ class Test_ec2_securitygroup_not_used: # Default sg per region are excluded assert len(result) == 0 - @mock_ec2 - @mock_lambda + @mock_aws def test_ec2_unused_sg(self): # Create EC2 Mocked Resources ec2 = resource("ec2", AWS_REGION_US_EAST_1) @@ -102,8 +100,7 @@ class Test_ec2_securitygroup_not_used: assert result[0].resource_details == sg_name assert result[0].resource_tags == [] - @mock_ec2 - @mock_lambda + @mock_aws def test_ec2_used_default_sg(self): # Create EC2 Mocked Resources ec2 = resource("ec2", AWS_REGION_US_EAST_1) @@ -161,9 +158,7 @@ class Test_ec2_securitygroup_not_used: assert result[0].resource_details == sg_name assert result[0].resource_tags == [] - @mock_ec2 - @mock_lambda - @mock_iam + @mock_aws def test_ec2_used_default_sg_by_lambda(self): # Create EC2 Mocked Resources ec2 = resource("ec2", AWS_REGION_US_EAST_1) @@ -245,8 +240,7 @@ class Test_ec2_securitygroup_not_used: assert result[0].resource_details == sg_name assert result[0].resource_tags == [] - @mock_ec2 - @mock_lambda + @mock_aws def test_ec2_associated_sg(self): # Create EC2 Mocked Resources ec2 = resource("ec2", AWS_REGION_US_EAST_1) 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 10334ef5..513a9c27 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ec2_securitygroup_with_many_ingress_egress_rules: - @mock_ec2 + @mock_aws def test_ec2_default_sgs(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -46,7 +46,7 @@ class Test_ec2_securitygroup_with_many_ingress_egress_rules: assert result[1].status == "PASS" assert result[2].status == "PASS" - @mock_ec2 + @mock_aws def test_ec2_non_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -109,7 +109,7 @@ class Test_ec2_securitygroup_with_many_ingress_egress_rules: assert sg.resource_details == default_sg_name assert sg.resource_tags == [] - @mock_ec2 + @mock_aws def test_ec2_compliant_default_sg(self): # Create EC2 Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) diff --git a/tests/providers/aws/services/ec2/ec2_service_test.py b/tests/providers/aws/services/ec2/ec2_service_test.py index 66cbbc78..95f3a2d3 100644 --- a/tests/providers/aws/services/ec2/ec2_service_test.py +++ b/tests/providers/aws/services/ec2/ec2_service_test.py @@ -6,7 +6,7 @@ from datetime import datetime from boto3 import client, resource from dateutil.tz import tzutc from freezegun import freeze_time -from moto import mock_ec2 +from moto import mock_aws from prowler.providers.aws.services.ec2.ec2_service import EC2 from tests.providers.aws.audit_info_utils import ( @@ -22,7 +22,7 @@ MOCK_DATETIME = datetime(2023, 1, 4, 7, 27, 30, tzinfo=tzutc()) class Test_EC2_Service: # Test EC2 Service - @mock_ec2 + @mock_aws def test_service(self): # EC2 client for this test class audit_info = set_mocked_aws_audit_info( @@ -32,7 +32,7 @@ class Test_EC2_Service: assert ec2.service == "ec2" # Test EC2 Client - @mock_ec2 + @mock_aws def test_client(self): # EC2 client for this test class audit_info = set_mocked_aws_audit_info( @@ -43,7 +43,7 @@ class Test_EC2_Service: assert regional_client.__class__.__name__ == "EC2" # Test EC2 Session - @mock_ec2 + @mock_aws def test__get_session__(self): # EC2 client for this test class audit_info = set_mocked_aws_audit_info( @@ -53,7 +53,7 @@ class Test_EC2_Service: assert ec2.session.__class__.__name__ == "Session" # Test EC2 Session - @mock_ec2 + @mock_aws def test_audited_account(self): # EC2 client for this test class audit_info = set_mocked_aws_audit_info( @@ -63,7 +63,7 @@ class Test_EC2_Service: assert ec2.audited_account == AWS_ACCOUNT_NUMBER # Test EC2 Describe Instances - @mock_ec2 + @mock_aws @freeze_time(MOCK_DATETIME) def test__describe_instances__(self): # Generate EC2 Client @@ -109,7 +109,7 @@ class Test_EC2_Service: ) # Test EC2 Describe Security Groups - @mock_ec2 + @mock_aws def test__describe_security_groups__(self): # Generate EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -179,7 +179,7 @@ class Test_EC2_Service: ] # Test EC2 Describe Nacls - @mock_ec2 + @mock_aws def test__describe_network_acls__(self): # Generate EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -217,7 +217,7 @@ class Test_EC2_Service: ] # Test EC2 Describe Snapshots - @mock_ec2 + @mock_aws def test__describe_snapshots__(self): # Generate EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -261,7 +261,7 @@ class Test_EC2_Service: assert not snapshot.public # Test EC2 Get Snapshot Public - @mock_ec2 + @mock_aws def test__get_snapshot_public__(self): # Generate EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -302,7 +302,7 @@ class Test_EC2_Service: assert snapshot.public # Test EC2 Instance User Data - @mock_ec2 + @mock_aws def test__get_instance_user_data__(self): user_data = "This is some user_data" ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) @@ -320,7 +320,7 @@ class Test_EC2_Service: assert user_data == b64decode(ec2.instances[0].user_data).decode("utf-8") # Test EC2 Get EBS Encryption by default - @mock_ec2 + @mock_aws def test__get_ebs_encryption_by_default__(self): ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) ec2_client.enable_ebs_encryption_by_default() @@ -337,7 +337,7 @@ class Test_EC2_Service: assert result.status # Test EC2 Describe Addresses - @mock_ec2 + @mock_aws def test__describe_addresses__(self): # Generate EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -368,7 +368,7 @@ class Test_EC2_Service: ] # Test EC2 Describe Network Interfaces - @mock_ec2 + @mock_aws def test__describe_sg_network_interfaces__(self): # Generate EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -412,7 +412,7 @@ class Test_EC2_Service: } ] - @mock_ec2 + @mock_aws def test__describe_public_network_interfaces__(self): # Generate EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -455,7 +455,7 @@ class Test_EC2_Service: ] # Test EC2 Describe Images - @mock_ec2 + @mock_aws def test__describe_images__(self): # Generate EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -507,7 +507,7 @@ class Test_EC2_Service: ] # Test EC2 Describe Volumes - @mock_ec2 + @mock_aws def test__describe_volumes__(self): # Generate EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) diff --git a/tests/providers/aws/services/ecr/ecr_service_test.py b/tests/providers/aws/services/ecr/ecr_service_test.py index bf8af997..7e3605fd 100644 --- a/tests/providers/aws/services/ecr/ecr_service_test.py +++ b/tests/providers/aws/services/ecr/ecr_service_test.py @@ -3,7 +3,7 @@ from unittest.mock import patch import botocore from boto3 import client -from moto import mock_ecr +from moto import mock_aws from prowler.providers.aws.services.ecr.ecr_service import ECR, ScanningRule from tests.providers.aws.audit_info_utils import ( @@ -117,7 +117,7 @@ class Test_ECR_Service: assert ecr.session.__class__.__name__ == "Session" # Test describe ECR repositories - @mock_ecr + @mock_aws def test__describe_registries_and_repositories__(self): ecr_client = client("ecr", region_name=AWS_REGION_EU_WEST_1) ecr_client.create_repository( @@ -143,7 +143,7 @@ class Test_ECR_Service: ] # Test describe ECR repository policies - @mock_ecr + @mock_aws def test__describe_repository_policies__(self): ecr_client = client("ecr", region_name=AWS_REGION_EU_WEST_1) ecr_client.create_repository( @@ -189,7 +189,7 @@ class Test_ECR_Service: ) # Test describe ECR repository lifecycle policies - @mock_ecr + @mock_aws def test__get_lifecycle_policies__(self): ecr_client = client("ecr", region_name=AWS_REGION_EU_WEST_1) ecr_client.create_repository( @@ -206,7 +206,7 @@ class Test_ECR_Service: assert ecr.registries[AWS_REGION_EU_WEST_1].repositories[0].lifecycle_policy # Test get image details - @mock_ecr + @mock_aws def test__get_image_details__(self): ecr_client = client("ecr", region_name=AWS_REGION_EU_WEST_1) ecr_client.create_repository( @@ -319,7 +319,7 @@ class Test_ECR_Service: ) # Test get ECR Registries Scanning Configuration - @mock_ecr + @mock_aws def test__get_registry_scanning_configuration__(self): audit_info = set_mocked_aws_audit_info() ecr = ECR(audit_info) diff --git a/tests/providers/aws/services/ecs/ecs_service_test.py b/tests/providers/aws/services/ecs/ecs_service_test.py index 189958db..807ed4bb 100644 --- a/tests/providers/aws/services/ecs/ecs_service_test.py +++ b/tests/providers/aws/services/ecs/ecs_service_test.py @@ -1,7 +1,7 @@ from unittest.mock import patch from boto3 import client -from moto import mock_ecs +from moto import mock_aws from prowler.providers.aws.services.ecs.ecs_service import ECS from tests.providers.aws.audit_info_utils import ( @@ -43,7 +43,7 @@ class Test_ECS_Service: assert ecs.session.__class__.__name__ == "Session" # Test list ECS task definitions - @mock_ecs + @mock_aws def test__list_task_definitions__(self): ecs_client = client("ecs", region_name=AWS_REGION_EU_WEST_1) @@ -72,7 +72,7 @@ class Test_ECS_Service: ) assert ecs.task_definitions[0].environment_variables == [] - @mock_ecs + @mock_aws # Test describe ECS task definitions def test__describe_task_definitions__(self): ecs_client = client("ecs", region_name=AWS_REGION_EU_WEST_1) diff --git a/tests/providers/aws/services/efs/efs_service_test.py b/tests/providers/aws/services/efs/efs_service_test.py index 3814da3e..4f9a4026 100644 --- a/tests/providers/aws/services/efs/efs_service_test.py +++ b/tests/providers/aws/services/efs/efs_service_test.py @@ -3,7 +3,7 @@ from unittest.mock import patch import botocore from boto3 import client -from moto import mock_efs +from moto import mock_aws from prowler.providers.aws.services.efs.efs_service import EFS from tests.providers.aws.audit_info_utils import ( @@ -66,7 +66,7 @@ class Test_EFS: access_analyzer = EFS(set_mocked_aws_audit_info()) assert access_analyzer.service == "efs" - @mock_efs + @mock_aws # Test EFS describe file systems def test__describe_file_systems__(self): efs_client = client("efs", AWS_REGION_EU_WEST_1) @@ -85,7 +85,7 @@ class Test_EFS: {"Key": "test", "Value": "test"}, ] - @mock_efs + @mock_aws # Test EFS describe file systems def test__describe_file_system_policies__(self): efs_client = client("efs", AWS_REGION_EU_WEST_1) diff --git a/tests/providers/aws/services/eks/eks_service_test.py b/tests/providers/aws/services/eks/eks_service_test.py index 142acdc8..ba0675d6 100644 --- a/tests/providers/aws/services/eks/eks_service_test.py +++ b/tests/providers/aws/services/eks/eks_service_test.py @@ -1,7 +1,7 @@ from unittest.mock import patch from boto3 import client -from moto import mock_ec2, mock_eks +from moto import mock_aws from prowler.providers.aws.services.eks.eks_service import EKS from tests.providers.aws.audit_info_utils import ( @@ -49,8 +49,7 @@ class Test_EKS_Service: assert eks.session.__class__.__name__ == "Session" # Test EKS list clusters - @mock_ec2 - @mock_eks + @mock_aws def test__list_clusters(self): ec2_client = client("ec2", region_name=AWS_REGION_EU_WEST_1) eks_client = client("eks", region_name=AWS_REGION_EU_WEST_1) @@ -82,8 +81,7 @@ class Test_EKS_Service: assert eks.clusters[0].tags == [{"test": "test"}] # Test EKS describe clusters - @mock_ec2 - @mock_eks + @mock_aws def test__describe_clusters(self): ec2_client = client("ec2", region_name=AWS_REGION_EU_WEST_1) eks_client = client("eks", region_name=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 7aa100d4..5f3ae884 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 @@ -1,7 +1,7 @@ from unittest import mock from mock import MagicMock, patch -from moto import mock_ec2 +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 @@ -27,7 +27,7 @@ VPC_ID = "vpc-12345678901234567" # Patch every AWS call using Boto3 @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) class Test_elasticache_cluster_uses_public_subnet: - @mock_ec2 + @mock_aws def test_elasticache_no_clusters(self): # Mock VPC Service vpc_client = MagicMock 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 ec0220b5..af4f5bd9 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_elb +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -15,7 +15,7 @@ elb_arn = f"arn:aws:elasticloadbalancing:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUM class Test_elb_insecure_ssl_ciphers: - @mock_elb + @mock_aws def test_elb_no_balancers(self): from prowler.providers.aws.services.elb.elb_service import ELB @@ -38,8 +38,7 @@ class Test_elb_insecure_ssl_ciphers: assert len(result) == 0 - @mock_ec2 - @mock_elb + @mock_aws def test_elb_listener_with_secure_policy(self): elb = client("elb", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -94,8 +93,7 @@ class Test_elb_insecure_ssl_ciphers: assert result[0].resource_arn == elb_arn assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_ec2 - @mock_elb + @mock_aws def test_elb_with_HTTPS_listener(self): elb = client("elb", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) 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 5452285b..d40cdf82 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_elb +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -18,7 +18,7 @@ elb_arn = ( class Test_elb_request_smugling: - @mock_elb + @mock_aws def test_elb_no_balancers(self): from prowler.providers.aws.services.elb.elb_service import ELB @@ -41,8 +41,7 @@ class Test_elb_request_smugling: assert len(result) == 0 - @mock_ec2 - @mock_elb + @mock_aws def test_elb_private(self): elb = client("elb", region_name=AWS_REGION) ec2 = resource("ec2", region_name=AWS_REGION) @@ -87,8 +86,7 @@ class Test_elb_request_smugling: assert result[0].resource_arn == elb_arn assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_ec2 - @mock_elb + @mock_aws def test_elb_with_deletion_protection(self): elb = client("elb", region_name=AWS_REGION) ec2 = resource("ec2", region_name=AWS_REGION) 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 6f826c2b..5e8b7fc1 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_elb +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -18,7 +18,7 @@ elb_arn = ( class Test_elb_logging_enabled: - @mock_elb + @mock_aws def test_elb_no_balancers(self): from prowler.providers.aws.services.elb.elb_service import ELB @@ -41,8 +41,7 @@ class Test_elb_logging_enabled: assert len(result) == 0 - @mock_ec2 - @mock_elb + @mock_aws def test_elb_without_access_log(self): elb = client("elb", region_name=AWS_REGION) ec2 = resource("ec2", region_name=AWS_REGION) @@ -89,8 +88,7 @@ class Test_elb_logging_enabled: assert result[0].resource_id == "my-lb" assert result[0].resource_arn == elb_arn - @mock_ec2 - @mock_elb + @mock_aws def test_elb_with_deletion_protection(self): elb = client("elb", region_name=AWS_REGION) ec2 = resource("ec2", region_name=AWS_REGION) diff --git a/tests/providers/aws/services/elb/elb_service_test.py b/tests/providers/aws/services/elb/elb_service_test.py index 8f26ee33..ef51a701 100644 --- a/tests/providers/aws/services/elb/elb_service_test.py +++ b/tests/providers/aws/services/elb/elb_service_test.py @@ -1,5 +1,5 @@ from boto3 import client, resource -from moto import mock_ec2, mock_elb +from moto import mock_aws from prowler.providers.aws.services.elb.elb_service import ELB from tests.providers.aws.audit_info_utils import ( @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ELB_Service: # Test ELB Service - @mock_elb + @mock_aws def test_service(self): # ELB client for this test class audit_info = set_mocked_aws_audit_info() @@ -19,7 +19,7 @@ class Test_ELB_Service: assert elb.service == "elb" # Test ELB Client - @mock_elb + @mock_aws def test_client(self): # ELB client for this test class audit_info = set_mocked_aws_audit_info() @@ -28,7 +28,7 @@ class Test_ELB_Service: assert regional_client.__class__.__name__ == "ElasticLoadBalancing" # Test ELB Session - @mock_elb + @mock_aws def test__get_session__(self): # ELB client for this test class audit_info = set_mocked_aws_audit_info() @@ -36,8 +36,7 @@ class Test_ELB_Service: assert elb.session.__class__.__name__ == "Session" # Test ELB Describe Load Balancers - @mock_ec2 - @mock_elb + @mock_aws def test__describe_load_balancers__(self): elb = client("elb", region_name=AWS_REGION_US_EAST_1) ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) @@ -69,8 +68,7 @@ class Test_ELB_Service: ) # Test ELB Describe Load Balancers Attributes - @mock_ec2 - @mock_elb + @mock_aws def test__describe_load_balancer_attributes__(self): elb = client("elb", region_name=AWS_REGION_US_EAST_1) ec2 = resource("ec2", region_name=AWS_REGION_US_EAST_1) 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 25ed89d9..267a70c3 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_elb +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -18,7 +18,7 @@ elb_arn = ( class Test_elb_ssl_listeners: - @mock_elb + @mock_aws def test_elb_no_balancers(self): from prowler.providers.aws.services.elb.elb_service import ELB @@ -41,8 +41,7 @@ class Test_elb_ssl_listeners: assert len(result) == 0 - @mock_ec2 - @mock_elb + @mock_aws def test_elb_with_HTTP_listener(self): elb = client("elb", region_name=AWS_REGION) ec2 = resource("ec2", region_name=AWS_REGION) @@ -86,8 +85,7 @@ class Test_elb_ssl_listeners: assert result[0].resource_id == "my-lb" assert result[0].resource_arn == elb_arn - @mock_ec2 - @mock_elb + @mock_aws def test_elb_with_HTTPS_listener(self): elb = client("elb", region_name=AWS_REGION) ec2 = resource("ec2", region_name=AWS_REGION) 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 773d2fd4..955edac0 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_elbv2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -14,7 +14,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_elbv2_deletion_protection: - @mock_elbv2 + @mock_aws def test_elb_no_balancers(self): from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 @@ -37,8 +37,7 @@ class Test_elbv2_deletion_protection: assert len(result) == 0 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_without_deletion_protection(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -100,8 +99,7 @@ class Test_elbv2_deletion_protection: assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_with_deletion_protection(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) 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 b4d325c0..b8b1a9c4 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_elbv2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -14,7 +14,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_elbv2_desync_mitigation_mode: - @mock_elbv2 + @mock_aws def test_elb_no_balancers(self): from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 @@ -37,8 +37,7 @@ class Test_elbv2_desync_mitigation_mode: assert len(result) == 0 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_without_desync_mitigation_mode_and_not_dropping_headers(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -104,8 +103,7 @@ class Test_elbv2_desync_mitigation_mode: assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_without_desync_mitigation_mode_but_dropping_headers(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -171,8 +169,7 @@ class Test_elbv2_desync_mitigation_mode: assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_with_desync_mitigation_mode(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) 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 c4dd1fa6..3403242b 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_elbv2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -14,7 +14,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_elbv2_insecure_ssl_ciphers: - @mock_elbv2 + @mock_aws def test_elb_no_balancers(self): from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 @@ -37,8 +37,7 @@ class Test_elbv2_insecure_ssl_ciphers: assert len(result) == 0 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_listener_with_secure_policy(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -117,8 +116,7 @@ class Test_elbv2_insecure_ssl_ciphers: assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_with_HTTPS_listener(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) 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 5a3499b5..0bee01c5 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_elbv2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -14,7 +14,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_elbv2_internet_facing: - @mock_elbv2 + @mock_aws def test_elb_no_balancers(self): from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 @@ -37,8 +37,7 @@ class Test_elbv2_internet_facing: assert len(result) == 0 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_private(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -93,8 +92,7 @@ class Test_elbv2_internet_facing: assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_internet_facing(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) 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 9db51689..76ebf496 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_elbv2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -14,7 +14,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_elbv2_listeners_underneath: - @mock_elbv2 + @mock_aws def test_elb_no_balancers(self): from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 @@ -37,8 +37,7 @@ class Test_elbv2_listeners_underneath: assert len(result) == 0 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_without_listeners(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -93,8 +92,7 @@ class Test_elbv2_listeners_underneath: assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_with_listeners(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) 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 f35ce215..f86dc328 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_elbv2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -14,7 +14,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_elbv2_logging_enabled: - @mock_elbv2 + @mock_aws def test_elb_no_balancers(self): from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 @@ -37,8 +37,7 @@ class Test_elbv2_logging_enabled: assert len(result) == 0 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_without_logging_enabled(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -103,8 +102,7 @@ class Test_elbv2_logging_enabled: assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_with_logging_enabled(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) diff --git a/tests/providers/aws/services/elbv2/elbv2_service_test.py b/tests/providers/aws/services/elbv2/elbv2_service_test.py index 55160090..573d084a 100644 --- a/tests/providers/aws/services/elbv2/elbv2_service_test.py +++ b/tests/providers/aws/services/elbv2/elbv2_service_test.py @@ -1,5 +1,5 @@ from boto3 import client, resource -from moto import mock_ec2, mock_elbv2 +from moto import mock_aws from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 from tests.providers.aws.audit_info_utils import ( @@ -13,7 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_ELBv2_Service: # Test ELBv2 Service - @mock_elbv2 + @mock_aws def test_service(self): # ELBv2 client for this test class audit_info = set_mocked_aws_audit_info( @@ -23,7 +23,7 @@ class Test_ELBv2_Service: assert elbv2.service == "elbv2" # Test ELBv2 Client - @mock_elbv2 + @mock_aws def test_client(self): # ELBv2 client for this test class audit_info = set_mocked_aws_audit_info( @@ -34,7 +34,7 @@ class Test_ELBv2_Service: assert regional_client.__class__.__name__ == "ElasticLoadBalancingv2" # Test ELBv2 Session - @mock_elbv2 + @mock_aws def test__get_session__(self): # ELBv2 client for this test class audit_info = set_mocked_aws_audit_info( @@ -44,8 +44,7 @@ class Test_ELBv2_Service: assert elbv2.session.__class__.__name__ == "Session" # Test ELBv2 Describe Load Balancers - @mock_ec2 - @mock_elbv2 + @mock_aws def test__describe_load_balancers__(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -83,8 +82,7 @@ class Test_ELBv2_Service: assert elbv2.loadbalancersv2[0].arn == lb["LoadBalancerArn"] # Test ELBv2 Describe Listeners - @mock_ec2 - @mock_elbv2 + @mock_aws def test__describe_listeners__(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -136,8 +134,7 @@ class Test_ELBv2_Service: assert elbv2.loadbalancersv2[0].listeners[0].port == 443 # Test ELBv2 Describe Load Balancers Attributes - @mock_ec2 - @mock_elbv2 + @mock_aws def test__describe_load_balancer_attributes__(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -188,8 +185,7 @@ class Test_ELBv2_Service: assert elbv2.loadbalancersv2[0].drop_invalid_header_fields == "false" # Test ELBv2 Describe Load Balancers Attributes - @mock_ec2 - @mock_elbv2 + @mock_aws def test__describe_rules__(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) 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 c0d8739d..29f262ad 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client, resource -from moto import mock_ec2, mock_elbv2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -14,7 +14,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_elbv2_ssl_listeners: - @mock_elbv2 + @mock_aws def test_elb_no_balancers(self): from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 @@ -37,8 +37,7 @@ class Test_elbv2_ssl_listeners: assert len(result) == 0 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_with_HTTP_listener(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -115,8 +114,7 @@ class Test_elbv2_ssl_listeners: assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_with_HTTPS_listener(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -192,8 +190,7 @@ class Test_elbv2_ssl_listeners: assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_with_HTTPS_redirection(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) 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 8512d576..467ca3b1 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 @@ -3,7 +3,7 @@ from unittest import mock import botocore from boto3 import client, resource -from moto import mock_ec2, mock_elbv2, mock_wafv2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_EU_WEST_1, @@ -36,8 +36,7 @@ def mock_make_api_call(self, operation_name, kwarg): class Test_elbv2_waf_acl_attached: - @mock_wafv2 - @mock_elbv2 + @mock_aws def test_elb_no_balancers(self): from prowler.providers.aws.services.elbv2.elbv2_service import ELBv2 from prowler.providers.aws.services.waf.waf_service import WAF @@ -72,9 +71,7 @@ class Test_elbv2_waf_acl_attached: assert len(result) == 0 - @mock_wafv2 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_without_WAF(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -152,9 +149,7 @@ class Test_elbv2_waf_acl_attached: assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] - @mock_wafv2 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_elbv2_with_WAF(self): conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) ec2 = resource("ec2", region_name=AWS_REGION_EU_WEST_1) 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 15061292..481f3827 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 @@ -2,7 +2,7 @@ from unittest import mock from uuid import uuid4 from boto3 import resource -from moto import mock_ec2 +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 ( @@ -37,7 +37,7 @@ class Test_emr_cluster_publicly_accesible: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_clusters_master_public_sg(self): # EC2 Client ec2 = resource("ec2", AWS_REGION_EU_WEST_1) @@ -105,7 +105,7 @@ class Test_emr_cluster_publicly_accesible: == f"EMR Cluster {cluster_id} is publicly accessible through the following Security Groups: Master Node {master_expected_public_sgs}" ) - @mock_ec2 + @mock_aws def test_clusters_master_private_sg(self): # EC2 Client ec2 = resource("ec2", AWS_REGION_EU_WEST_1) @@ -171,7 +171,7 @@ class Test_emr_cluster_publicly_accesible: == f"EMR Cluster {cluster_id} is not publicly accessible." ) - @mock_ec2 + @mock_aws def test_clusters_master_private_slave_public_sg(self): # EC2 Client ec2 = resource("ec2", AWS_REGION_EU_WEST_1) @@ -254,7 +254,7 @@ class Test_emr_cluster_publicly_accesible: == f"EMR Cluster {cluster_id} is publicly accessible through the following Security Groups: Slaves Nodes {slave_expected_public_sgs}" ) - @mock_ec2 + @mock_aws def test_clusters_master_public_slave_private_two_sg(self): # EC2 Client ec2 = resource("ec2", AWS_REGION_EU_WEST_1) @@ -340,7 +340,7 @@ class Test_emr_cluster_publicly_accesible: == f"EMR Cluster {cluster_id} is publicly accessible through the following Security Groups: Master Node {master_expected_public_sgs}" ) - @mock_ec2 + @mock_aws def test_clusters_master_private_slave_public_sg_none_additional_sgs(self): # EC2 Client ec2 = resource("ec2", AWS_REGION_EU_WEST_1) diff --git a/tests/providers/aws/services/emr/emr_service_test.py b/tests/providers/aws/services/emr/emr_service_test.py index e8728302..be1dd131 100644 --- a/tests/providers/aws/services/emr/emr_service_test.py +++ b/tests/providers/aws/services/emr/emr_service_test.py @@ -3,7 +3,7 @@ from unittest.mock import patch import botocore from boto3 import client -from moto import mock_emr +from moto import mock_aws from prowler.providers.aws.services.emr.emr_service import EMR, ClusterStatus from tests.providers.aws.audit_info_utils import ( @@ -51,25 +51,25 @@ def mock_generate_regional_clients(service, audit_info): @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call) class Test_EMR_Service: # Test EMR Client - @mock_emr + @mock_aws def test__get_client__(self): emr = EMR(set_mocked_aws_audit_info()) assert emr.regional_clients[AWS_REGION_EU_WEST_1].__class__.__name__ == "EMR" # Test EMR Session - @mock_emr + @mock_aws def test__get_session__(self): emr = EMR(set_mocked_aws_audit_info()) assert emr.session.__class__.__name__ == "Session" # Test EMR Service - @mock_emr + @mock_aws def test__get_service__(self): emr = EMR(set_mocked_aws_audit_info()) assert emr.service == "emr" # Test __list_clusters__ and __describe_cluster__ - @mock_emr + @mock_aws def test__list_clusters__(self): # Create EMR Cluster emr_client = client("emr", region_name=AWS_REGION_EU_WEST_1) @@ -113,7 +113,7 @@ class Test_EMR_Service: {"Key": "test", "Value": "test"}, ] - @mock_emr + @mock_aws def test__get_block_public_access_configuration__(self): emr = EMR(set_mocked_aws_audit_info()) diff --git a/tests/providers/aws/services/glue/glue_service_test.py b/tests/providers/aws/services/glue/glue_service_test.py index 77743d4e..0c119a0b 100644 --- a/tests/providers/aws/services/glue/glue_service_test.py +++ b/tests/providers/aws/services/glue/glue_service_test.py @@ -1,7 +1,7 @@ from unittest.mock import patch import botocore -from moto import mock_glue +from moto import mock_aws from prowler.providers.aws.services.glue.glue_service import Glue from tests.providers.aws.audit_info_utils import ( @@ -120,7 +120,7 @@ def mock_generate_regional_clients(service, audit_info): ) class Test_Glue_Service: # Test Glue Service - @mock_glue + @mock_aws def test_service(self): # Glue client for this test class audit_info = set_mocked_aws_audit_info() @@ -128,7 +128,7 @@ class Test_Glue_Service: assert glue.service == "glue" # Test Glue Client - @mock_glue + @mock_aws def test_client(self): # Glue client for this test class audit_info = set_mocked_aws_audit_info() @@ -137,7 +137,7 @@ class Test_Glue_Service: assert regional_client.__class__.__name__ == "Glue" # Test Glue Session - @mock_glue + @mock_aws def test__get_session__(self): # Glue client for this test class audit_info = set_mocked_aws_audit_info() @@ -145,7 +145,7 @@ class Test_Glue_Service: assert glue.session.__class__.__name__ == "Session" # Test Glue Session - @mock_glue + @mock_aws def test_audited_account(self): # Glue client for this test class audit_info = set_mocked_aws_audit_info() @@ -153,7 +153,7 @@ class Test_Glue_Service: assert glue.audited_account == AWS_ACCOUNT_NUMBER # Test Glue Search Tables - @mock_glue + @mock_aws def test__search_tables__(self): audit_info = set_mocked_aws_audit_info() glue = Glue(audit_info) @@ -164,7 +164,7 @@ class Test_Glue_Service: assert glue.tables[0].region == AWS_REGION_US_EAST_1 # Test Glue Get Connections - @mock_glue + @mock_aws def test__get_connections__(self): audit_info = set_mocked_aws_audit_info() glue = Glue(audit_info) @@ -181,7 +181,7 @@ class Test_Glue_Service: assert glue.connections[0].region == AWS_REGION_US_EAST_1 # Test Glue Get Catalog Encryption - @mock_glue + @mock_aws def test__get_data_catalog_encryption_settings__(self): audit_info = set_mocked_aws_audit_info() glue = Glue(audit_info) @@ -193,7 +193,7 @@ class Test_Glue_Service: assert glue.catalog_encryption_settings[0].region == AWS_REGION_US_EAST_1 # Test Glue Get Dev Endpoints - @mock_glue + @mock_aws def test__get_dev_endpoints__(self): audit_info = set_mocked_aws_audit_info() glue = Glue(audit_info) @@ -203,7 +203,7 @@ class Test_Glue_Service: assert glue.dev_endpoints[0].region == AWS_REGION_US_EAST_1 # Test Glue Get Security Configs - @mock_glue + @mock_aws def test__get_security_configurations__(self): audit_info = set_mocked_aws_audit_info() glue = Glue(audit_info) @@ -215,7 +215,7 @@ class Test_Glue_Service: assert glue.security_configs[0].region == AWS_REGION_US_EAST_1 # Test Glue Get Security Configs - @mock_glue + @mock_aws def test__get_jobs__(self): audit_info = set_mocked_aws_audit_info() glue = Glue(audit_info) diff --git a/tests/providers/aws/services/guardduty/guardduty_service_test.py b/tests/providers/aws/services/guardduty/guardduty_service_test.py index c7ed7d2e..d5e13b15 100644 --- a/tests/providers/aws/services/guardduty/guardduty_service_test.py +++ b/tests/providers/aws/services/guardduty/guardduty_service_test.py @@ -3,7 +3,7 @@ from unittest.mock import patch import botocore from boto3 import client -from moto import mock_guardduty +from moto import mock_aws from prowler.providers.aws.services.guardduty.guardduty_service import GuardDuty from tests.providers.aws.audit_info_utils import ( @@ -83,7 +83,7 @@ class Test_GuardDuty_Service: guardduty = GuardDuty(audit_info) assert guardduty.session.__class__.__name__ == "Session" - @mock_guardduty + @mock_aws # Test GuardDuty session def test__list_detectors__(self): guardduty_client = client("guardduty", region_name=AWS_REGION_EU_WEST_1) @@ -105,7 +105,7 @@ class Test_GuardDuty_Service: assert guardduty.detectors[0].region == AWS_REGION_EU_WEST_1 assert guardduty.detectors[0].tags == [{"test": "test"}] - @mock_guardduty + @mock_aws # Test GuardDuty session def test__get_detector__(self): guardduty_client = client("guardduty", region_name=AWS_REGION_EU_WEST_1) @@ -127,7 +127,7 @@ class Test_GuardDuty_Service: assert guardduty.detectors[0].region == AWS_REGION_EU_WEST_1 assert guardduty.detectors[0].tags == [{"test": "test"}] - @mock_guardduty + @mock_aws # Test GuardDuty session def test__list_findings__(self): guardduty_client = client("guardduty", region_name=AWS_REGION_EU_WEST_1) @@ -149,7 +149,7 @@ class Test_GuardDuty_Service: assert guardduty.detectors[0].region == AWS_REGION_EU_WEST_1 assert guardduty.detectors[0].tags == [{"test": "test"}] - @mock_guardduty + @mock_aws def test__list_members__(self): guardduty_client = client("guardduty", region_name=AWS_REGION_EU_WEST_1) response = guardduty_client.create_detector(Enable=True) @@ -170,7 +170,7 @@ class Test_GuardDuty_Service: assert guardduty.detectors[0].region == AWS_REGION_EU_WEST_1 assert guardduty.detectors[0].tags == [{"test": "test"}] - @mock_guardduty + @mock_aws # Test GuardDuty session def test__get_administrator_account__(self): guardduty_client = client("guardduty", region_name=AWS_REGION_EU_WEST_1) 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 371672b7..076d0856 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 @@ -3,7 +3,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_iam_administrator_access_with_mfa_test: - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_group_with_no_policies(self): iam = client("iam") group_name = "test-group" @@ -45,7 +45,7 @@ class Test_iam_administrator_access_with_mfa_test: f"Group {group_name} has no policies.", result[0].status_extended ) - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_group_non_administrative_policy(self): iam = client("iam") group_name = "test-group" @@ -89,7 +89,7 @@ class Test_iam_administrator_access_with_mfa_test: result[0].status_extended, ) - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_admin_policy_no_users(self): iam = client("iam") group_name = "test-group" @@ -127,7 +127,7 @@ class Test_iam_administrator_access_with_mfa_test: result[0].status_extended, ) - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_admin_policy_with_user_without_mfa(self): iam = client("iam") group_name = "test-group" @@ -167,7 +167,7 @@ class Test_iam_administrator_access_with_mfa_test: result[0].status_extended, ) - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_various_policies_with_users_with_and_without_mfa(self): iam = client("iam") group_name = "test-group" 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 16b24b6f..b27f615b 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 @@ -3,7 +3,7 @@ from csv import DictReader from re import search from unittest import mock -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_iam_avoid_root_usage: - @mock_iam + @mock_aws def test_root_not_used(self): raw_credential_report = r"""user,arn,user_creation_time,password_enabled,password_last_used,password_last_changed,password_next_rotation,mfa_active,access_key_1_active,access_key_1_last_rotated,access_key_1_last_used_date,access_key_1_last_used_region,access_key_1_last_used_service,access_key_2_active,access_key_2_last_rotated,access_key_2_last_used_date,access_key_2_last_used_region,access_key_2_last_used_service,cert_1_active,cert_1_last_rotated,cert_2_active,cert_2_last_rotated ,arn:aws:iam::123456789012:,2022-04-17T14:59:38+00:00,true,no_information,not_supported,not_supported,false,true,N/A,N/A,N/A,N/A,false,N/A,N/A,N/A,N/A,false,N/A,false,N/A""" @@ -49,7 +49,7 @@ class Test_iam_avoid_root_usage: result[0].resource_arn == "arn:aws:iam::123456789012:" ) - @mock_iam + @mock_aws def test_root_password_recently_used(self): password_last_used = (datetime.datetime.now()).strftime( "%Y-%m-%dT%H:%M:%S+00:00" @@ -89,7 +89,7 @@ class Test_iam_avoid_root_usage: result[0].resource_arn == "arn:aws:iam::123456789012:" ) - @mock_iam + @mock_aws def test_root_access_key_1_recently_used(self): access_key_1_last_used = (datetime.datetime.now()).strftime( "%Y-%m-%dT%H:%M:%S+00:00" @@ -129,7 +129,7 @@ class Test_iam_avoid_root_usage: result[0].resource_arn == "arn:aws:iam::123456789012:" ) - @mock_iam + @mock_aws def test_root_access_key_2_recently_used(self): access_key_2_last_used = (datetime.datetime.now()).strftime( "%Y-%m-%dT%H:%M:%S+00:00" @@ -169,7 +169,7 @@ class Test_iam_avoid_root_usage: result[0].resource_arn == "arn:aws:iam::123456789012:" ) - @mock_iam + @mock_aws def test_root_password_used(self): password_last_used = ( datetime.datetime.now() - datetime.timedelta(days=100) @@ -209,7 +209,7 @@ class Test_iam_avoid_root_usage: result[0].resource_arn == "arn:aws:iam::123456789012:" ) - @mock_iam + @mock_aws def test_root_access_key_1_used(self): access_key_1_last_used = ( datetime.datetime.now() - datetime.timedelta(days=100) @@ -249,7 +249,7 @@ class Test_iam_avoid_root_usage: result[0].resource_arn == "arn:aws:iam::123456789012:" ) - @mock_iam + @mock_aws def test_root_access_key_2_used(self): access_key_2_last_used = ( datetime.datetime.now() - datetime.timedelta(days=100) 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 b563ca1d..e1d6a7c6 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_iam_aws_attached_policy_no_administrative_privileges_test: - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_policy_with_administrative_privileges(self): iam_client = client("iam") @@ -49,7 +49,7 @@ class Test_iam_aws_attached_policy_no_administrative_privileges_test: result.status_extended, ) - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_policy_non_administrative(self): iam_client = client("iam") @@ -88,7 +88,7 @@ class Test_iam_aws_attached_policy_no_administrative_privileges_test: result.status_extended, ) - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_policy_administrative_and_non_administrative(self): iam_client = client("iam") 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 4ce086ad..aec804f7 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -10,7 +10,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_iam_check_saml_providers_sts: - @mock_iam + @mock_aws def test_iam_check_saml_providers_sts(self): iam_client = client("iam") xml_template = r"""" ) - @mock_iam + @mock_aws def test_iam_root_access_key_1(self): iam_client = client("iam") user = "test" @@ -97,7 +97,7 @@ class Test_iam_no_root_access_key_test: == "arn:aws:iam::123456789012:user/" ) - @mock_iam + @mock_aws def test_iam_root_access_key_2(self): iam_client = client("iam") user = "test" @@ -140,7 +140,7 @@ class Test_iam_no_root_access_key_test: == "arn:aws:iam::123456789012:user/" ) - @mock_iam + @mock_aws def test_iam_root_both_access_keys(self): iam_client = client("iam") user = "test" 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 46425973..31d72c97 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 @@ -1,7 +1,7 @@ from re import search from unittest import mock -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_iam_password_policy_expires_passwords_within_90_days_or_less: - @mock_iam + @mock_aws def test_password_expiration_lower_90(self): from prowler.providers.aws.services.iam.iam_service import IAM, PasswordPolicy @@ -54,7 +54,7 @@ class Test_iam_password_policy_expires_passwords_within_90_days_or_less: result[0].status_extended, ) - @mock_iam + @mock_aws def test_password_expiration_greater_90(self): from prowler.providers.aws.services.iam.iam_service import IAM, PasswordPolicy @@ -96,7 +96,7 @@ class Test_iam_password_policy_expires_passwords_within_90_days_or_less: result[0].status_extended, ) - @mock_iam + @mock_aws def test_password_expiration_just_90(self): from prowler.providers.aws.services.iam.iam_service import IAM, PasswordPolicy 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 e1b3eb40..13339371 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,7 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_iam_password_policy_lowercase: - @mock_iam + @mock_aws def test_iam_password_policy_no_lowercase_flag(self): iam_client = client("iam") # update password policy @@ -47,7 +47,7 @@ class Test_iam_password_policy_lowercase: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_US_EAST_1 - @mock_iam + @mock_aws def test_iam_password_policy_lowercase_flag(self): iam_client = client("iam") # update password policy 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 f59d18ae..78981529 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -20,7 +20,7 @@ class Test_iam_password_policy_minimum_length_14: set_mocked_aws_audit_info, ) - @mock_iam + @mock_aws def test_iam_password_policy_minimum_length_equal_14(self): iam_client = client("iam") # update password policy @@ -54,7 +54,7 @@ class Test_iam_password_policy_minimum_length_14: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_US_EAST_1 - @mock_iam + @mock_aws def test_iam_password_policy_minimum_length_greater_14(self): iam_client = client("iam") # update password policy @@ -88,7 +88,7 @@ class Test_iam_password_policy_minimum_length_14: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_US_EAST_1 - @mock_iam + @mock_aws def test_iam_password_policy_minimum_length_less_14(self): iam_client = client("iam") # update password policy 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 e3e81219..dc164ce9 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -20,7 +20,7 @@ class Test_iam_password_policy_number: set_mocked_aws_audit_info, ) - @mock_iam + @mock_aws def test_iam_password_policy_no_number_flag(self): iam_client = client("iam") # update password policy @@ -54,7 +54,7 @@ class Test_iam_password_policy_number: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_US_EAST_1 - @mock_iam + @mock_aws def test_iam_password_policy_number_flag(self): iam_client = client("iam") # update password policy 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 b1ac96b2..980141c3 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -19,7 +19,7 @@ class Test_iam_password_policy_reuse_24: set_mocked_aws_audit_info, ) - @mock_iam + @mock_aws def test_iam_password_policy_reuse_prevention_equal_24(self): iam_client = client("iam") # update password policy @@ -52,7 +52,7 @@ class Test_iam_password_policy_reuse_24: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_US_EAST_1 - @mock_iam + @mock_aws def test_iam_password_policy_reuse_prevention_less_24(self): iam_client = client("iam") # update password policy 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 35ece164..9328dac9 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -20,7 +20,7 @@ class Test_iam_password_policy_symbol: set_mocked_aws_audit_info, ) - @mock_iam + @mock_aws def test_iam_password_policy_no_symbol_flag(self): iam_client = client("iam") # update password policy @@ -54,7 +54,7 @@ class Test_iam_password_policy_symbol: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_US_EAST_1 - @mock_iam + @mock_aws def test_iam_password_policy_symbol_flag(self): iam_client = client("iam") # update password policy 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 7403202b..19de44cf 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -19,7 +19,7 @@ class Test_iam_password_policy_uppercase: set_mocked_aws_audit_info, ) - @mock_iam + @mock_aws def test_iam_password_policy_no_uppercase_flag(self): iam_client = client("iam") # update password policy @@ -52,7 +52,7 @@ class Test_iam_password_policy_uppercase: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].region == AWS_REGION_US_EAST_1 - @mock_iam + @mock_aws def test_iam_password_policy_uppercase_flag(self): iam_client = client("iam") # update password policy 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 4f1fe1ef..5d5c9d20 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 @@ -3,7 +3,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -91,7 +91,7 @@ class Test_iam_policy_allows_privilege_escalation: set_mocked_aws_audit_info, ) - # @mock_iam + # @mock_aws # def test_iam_policy_allows_privilege_escalation_sts(self): # iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) # policy_name = "policy1" @@ -128,7 +128,7 @@ class Test_iam_policy_allows_privilege_escalation: # assert result[0].resource_id == policy_name # assert result[0].resource_arn == policy_arn - @mock_iam + @mock_aws def test_iam_policy_not_allows_privilege_escalation(self): iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) policy_name = "policy1" @@ -172,7 +172,7 @@ class Test_iam_policy_allows_privilege_escalation: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] - @mock_iam + @mock_aws def test_iam_policy_not_allows_privilege_escalation_glue_GetDevEndpoints(self): iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) policy_name = "policy1" @@ -220,7 +220,7 @@ class Test_iam_policy_allows_privilege_escalation: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] - @mock_iam + @mock_aws def test_iam_policy_not_allows_privilege_escalation_dynamodb_PutItem(self): iam_client = client("iam", region_name=AWS_REGION_US_EAST_1) policy_name = "policy1" @@ -279,7 +279,7 @@ class Test_iam_policy_allows_privilege_escalation: assert result[0].region == AWS_REGION_US_EAST_1 assert result[0].resource_tags == [] - @mock_iam + @mock_aws def test_iam_policy_allows_privilege_escalation_iam_all_and_ec2_RunInstances( self, ): @@ -337,7 +337,7 @@ class Test_iam_policy_allows_privilege_escalation: assert search("iam:PassRole", result[0].status_extended) assert search("ec2:RunInstances", result[0].status_extended) - @mock_iam + @mock_aws def test_iam_policy_allows_privilege_escalation_iam_PassRole( self, ): @@ -387,7 +387,7 @@ class Test_iam_policy_allows_privilege_escalation: ) assert search("iam:PassRole", result[0].status_extended) - @mock_iam + @mock_aws def test_iam_policy_allows_privilege_escalation_two_combinations( self, ): @@ -459,7 +459,7 @@ class Test_iam_policy_allows_privilege_escalation: assert search("lambda:CreateFunction", result[0].status_extended) assert search("ec2:RunInstances", result[0].status_extended) - @mock_iam + @mock_aws def test_iam_policy_allows_privilege_escalation_iam_PassRole_and_other_actions( self, ): @@ -514,7 +514,7 @@ class Test_iam_policy_allows_privilege_escalation: ) assert search("iam:PassRole", result[0].status_extended) - @mock_iam + @mock_aws def test_iam_policy_allows_privilege_escalation_policies_combination( self, ): @@ -573,7 +573,7 @@ class Test_iam_policy_allows_privilege_escalation: # Delete each IAM policy after the test iam_client.delete_policy(PolicyArn=policy_arn) - @mock_iam + @mock_aws def test_iam_policy_allows_privilege_escalation_two_policies_one_good_one_bad( self, ): @@ -666,7 +666,7 @@ class Test_iam_policy_allows_privilege_escalation: assert search("lambda:InvokeFunction", finding.status_extended) assert search("lambda:CreateFunction", finding.status_extended) - @mock_iam + @mock_aws def test_iam_policy_allows_privilege_escalation_two_bad_policies( self, ): @@ -771,7 +771,7 @@ class Test_iam_policy_allows_privilege_escalation: assert search("lambda:InvokeFunction", finding.status_extended) assert search("lambda:CreateFunction", finding.status_extended) - @mock_iam + @mock_aws def test_iam_policy_allows_privilege_escalation_over_permissive_policy( self, ): @@ -837,7 +837,7 @@ class Test_iam_policy_allows_privilege_escalation: assert search("iam:PassRole", finding.status_extended) assert search("ec2:RunInstances", finding.status_extended) - @mock_iam + @mock_aws def test_iam_policy_allows_privilege_escalation_administrator_policy( self, ): @@ -895,7 +895,7 @@ class Test_iam_policy_allows_privilege_escalation: ]: assert search(permission, finding.status_extended) - @mock_iam + @mock_aws def test_iam_policy_allows_privilege_escalation_iam_put( self, ): @@ -948,7 +948,7 @@ class Test_iam_policy_allows_privilege_escalation: ) assert search("iam:Put*", finding.status_extended) - @mock_iam + @mock_aws def test_iam_policy_allows_privilege_escalation_iam_wildcard( self, ): @@ -1001,7 +1001,7 @@ class Test_iam_policy_allows_privilege_escalation: ) assert search("iam:*", finding.status_extended) - @mock_iam + @mock_aws def test_iam_policy_not_allows_privilege_escalation_custom_policy( self, ): 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 78ddf0ed..6da58e95 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 @@ -2,7 +2,7 @@ from json import dumps from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_iam_policy_attached_only_to_group_or_roles: - @mock_iam + @mock_aws def test_iam_user_attached_policy(self): result = [] iam_client = client("iam") @@ -58,7 +58,7 @@ class Test_iam_policy_attached_only_to_group_or_roles: == f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:user/{user}" ) - @mock_iam + @mock_aws def test_iam_user_attached_and_inline_policy(self): result = [] iam_client = client("iam") @@ -116,7 +116,7 @@ class Test_iam_policy_attached_only_to_group_or_roles: == f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:user/{user}" ) - @mock_iam + @mock_aws def test_iam_user_inline_policy(self): result = [] iam_client = client("iam") @@ -161,7 +161,7 @@ class Test_iam_policy_attached_only_to_group_or_roles: == f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:user/{user}" ) - @mock_iam + @mock_aws def test_iam_user_no_policies(self): result = [] iam_client = client("iam") 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 1cda8583..1781f1f0 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 @@ -2,7 +2,7 @@ from json import dumps from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import IAM from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_iam_policy_no_full_access_to_cloudtrail: - @mock_iam + @mock_aws def test_policy_full_access_to_cloudtrail(self): audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) iam_client = client("iam") @@ -51,7 +51,7 @@ class Test_iam_policy_no_full_access_to_cloudtrail: assert result[0].resource_arn == arn assert result[0].region == "us-east-1" - @mock_iam + @mock_aws def test_policy_no_full_access_to_cloudtrail(self): audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) iam_client = client("iam") @@ -90,7 +90,7 @@ class Test_iam_policy_no_full_access_to_cloudtrail: assert result[0].resource_arn == arn assert result[0].region == "us-east-1" - @mock_iam + @mock_aws def test_policy_mixed(self): audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) iam_client = client("iam") 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 3287117b..42503823 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 @@ -2,7 +2,7 @@ from json import dumps from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import IAM from tests.providers.aws.audit_info_utils import ( @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_iam_policy_no_full_access_to_kms: - @mock_iam + @mock_aws def test_policy_full_access_to_kms(self): audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) iam_client = client("iam") @@ -51,7 +51,7 @@ class Test_iam_policy_no_full_access_to_kms: assert result[0].resource_arn == arn assert result[0].region == "us-east-1" - @mock_iam + @mock_aws def test_policy_no_full_access_to_kms(self): audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) iam_client = client("iam") @@ -90,7 +90,7 @@ class Test_iam_policy_no_full_access_to_kms: assert result[0].resource_arn == arn assert result[0].region == "us-east-1" - @mock_iam + @mock_aws def test_policy_mixed(self): audit_info = set_mocked_aws_audit_info([AWS_REGION_US_EAST_1]) iam_client = client("iam") 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 ac024f14..12936c01 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 @@ -2,7 +2,7 @@ from json import dumps from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import Role from tests.providers.aws.audit_info_utils import ( @@ -15,7 +15,7 @@ AWS_ACCOUNT_ID = "123456789012" class Test_iam_role_administratoraccess_policy: - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_no_roles(self): from prowler.providers.aws.services.iam.iam_service import IAM @@ -36,7 +36,7 @@ class Test_iam_role_administratoraccess_policy: result = check.execute() assert len(result) == 0 - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_role_without_administratoraccess_policy(self): iam = client("iam") role_name = "test" @@ -81,7 +81,7 @@ class Test_iam_role_administratoraccess_policy: assert result[0].resource_arn == response["Role"]["Arn"] assert result[0].resource_tags == [] - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_role_with_securityaudit_policy(self): iam = client("iam") role_name = "test" @@ -130,7 +130,7 @@ class Test_iam_role_administratoraccess_policy: assert result[0].resource_arn == response["Role"]["Arn"] assert result[0].resource_tags == [] - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_role_with_administratoraccess_policy(self): iam = client("iam") role_name = "test" @@ -179,7 +179,7 @@ class Test_iam_role_administratoraccess_policy: assert result[0].resource_arn == response["Role"]["Arn"] assert result[0].resource_tags == [] - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_asterisk_principal_role_with_administratoraccess_policy(self): iam = client("iam") role_name = "test" @@ -228,7 +228,7 @@ class Test_iam_role_administratoraccess_policy: assert result[0].resource_arn == response["Role"]["Arn"] assert result[0].resource_tags == [] - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_only_aws_service_linked_roles(self): iam_client = mock.MagicMock iam_client.roles = [] 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 27fa273d..cc2dd250 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 @@ -2,7 +2,7 @@ from json import dumps from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import Role from tests.providers.aws.audit_info_utils import ( @@ -15,7 +15,7 @@ AWS_ACCOUNT_ID = "123456789012" class Test_iam_role_cross_account_readonlyaccess_policy: - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_no_roles(self): from prowler.providers.aws.services.iam.iam_service import IAM @@ -36,7 +36,7 @@ class Test_iam_role_cross_account_readonlyaccess_policy: result = check.execute() assert len(result) == 0 - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_role_without_readonlyaccess_policy(self): iam = client("iam") role_name = "test" @@ -81,7 +81,7 @@ class Test_iam_role_cross_account_readonlyaccess_policy: assert result[0].resource_arn == response["Role"]["Arn"] assert result[0].resource_tags == [] - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_internal_role_with_readonlyaccess_policy(self): iam = client("iam") role_name = "test" @@ -130,7 +130,7 @@ class Test_iam_role_cross_account_readonlyaccess_policy: assert result[0].resource_arn == response["Role"]["Arn"] assert result[0].resource_tags == [] - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_cross_account_role_with_readonlyaccess_policy(self): iam = client("iam") role_name = "test" @@ -179,7 +179,7 @@ class Test_iam_role_cross_account_readonlyaccess_policy: assert result[0].resource_arn == response["Role"]["Arn"] assert result[0].resource_tags == [] - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_asterisk_cross_account_role_with_readonlyaccess_policy(self): iam = client("iam") role_name = "test" @@ -228,7 +228,7 @@ class Test_iam_role_cross_account_readonlyaccess_policy: assert result[0].resource_arn == response["Role"]["Arn"] assert result[0].resource_tags == [] - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test_only_aws_service_linked_roles(self): iam_client = mock.MagicMock iam_client.roles = [] 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 fa5122b6..2c8e1f3e 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 @@ -2,7 +2,7 @@ from json import dumps from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import Role from tests.providers.aws.audit_info_utils import ( @@ -15,7 +15,7 @@ AWS_ACCOUNT_ID = "123456789012" class Test_iam_role_cross_service_confused_deputy_prevention: - @mock_iam + @mock_aws def test_no_roles(self): from prowler.providers.aws.services.iam.iam_service import IAM @@ -37,7 +37,7 @@ class Test_iam_role_cross_service_confused_deputy_prevention: result = check.execute() assert len(result) == 0 - @mock_iam + @mock_aws def test_only_aws_service_linked_roles(self): iam_client = mock.MagicMock iam_client.roles = [] @@ -78,7 +78,7 @@ class Test_iam_role_cross_service_confused_deputy_prevention: result = check.execute() assert len(result) == 0 - @mock_iam + @mock_aws def test_iam_service_role_without_cross_service_confused_deputy_prevention(self): iam_client = client("iam", region_name=AWS_REGION) policy_document = { @@ -123,7 +123,7 @@ class Test_iam_role_cross_service_confused_deputy_prevention: assert result[0].resource_id == "test" assert result[0].resource_arn == response["Role"]["Arn"] - @mock_iam + @mock_aws def test_iam_service_role_with_cross_service_confused_deputy_prevention(self): iam_client = client("iam", region_name=AWS_REGION) policy_document = { @@ -171,7 +171,7 @@ class Test_iam_role_cross_service_confused_deputy_prevention: assert result[0].resource_id == "test" assert result[0].resource_arn == response["Role"]["Arn"] - @mock_iam + @mock_aws def test_iam_service_role_with_cross_service_confused_deputy_prevention_stringlike( self, ): @@ -221,7 +221,7 @@ class Test_iam_role_cross_service_confused_deputy_prevention: assert result[0].resource_id == "test" assert result[0].resource_arn == response["Role"]["Arn"] - @mock_iam + @mock_aws def test_iam_service_role_with_cross_service_confused_deputy_prevention_PrincipalAccount( self, ): @@ -271,7 +271,7 @@ class Test_iam_role_cross_service_confused_deputy_prevention: assert result[0].resource_id == "test" assert result[0].resource_arn == response["Role"]["Arn"] - @mock_iam + @mock_aws def test_iam_service_role_with_cross_service_confused_deputy_prevention_ResourceAccount( self, ): 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 047a5529..1f2e91c1 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -18,7 +18,7 @@ class Test_iam_root_hardware_mfa_enabled_test: set_mocked_aws_audit_info, ) - @mock_iam + @mock_aws def test_root_hardware_virtual_mfa_enabled(self): iam = client("iam") mfa_device_name = "mfa-test" @@ -51,7 +51,7 @@ class Test_iam_root_hardware_mfa_enabled_test: ) assert result[0].resource_id == "" - @mock_iam + @mock_aws def test_root_hardware_virtual_hardware_mfa_enabled(self): iam = client("iam") mfa_device_name = "mfa-test" 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 d20640d9..984fbf33 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 @@ -2,7 +2,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -20,7 +20,7 @@ class Test_iam_root_mfa_enabled_test: set_mocked_aws_audit_info, ) - @mock_iam + @mock_aws def test_root_mfa_not_enabled(self): iam_client = client("iam") user = "test-user" @@ -55,7 +55,7 @@ class Test_iam_root_mfa_enabled_test: assert result[0].resource_id == "" assert result[0].resource_arn == service_client.credential_report[0]["arn"] - @mock_iam + @mock_aws def test_root_mfa_enabled(self): iam_client = client("iam") user = "test-user" 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 0d14823c..f0e7e120 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 @@ -2,7 +2,7 @@ import datetime from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -11,7 +11,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_iam_rotate_access_key_90_days_test: - @mock_iam + @mock_aws def test_user_no_access_keys(self): iam_client = client("iam") user = "test-user" @@ -46,7 +46,7 @@ class Test_iam_rotate_access_key_90_days_test: assert result[0].resource_arn == arn assert result[0].region == AWS_REGION_US_EAST_1 - @mock_iam + @mock_aws def test_user_access_key_1_not_rotated(self): credentials_last_rotated = ( datetime.datetime.now() - datetime.timedelta(days=100) @@ -87,7 +87,7 @@ class Test_iam_rotate_access_key_90_days_test: assert result[0].resource_arn == arn assert result[0].region == AWS_REGION_US_EAST_1 - @mock_iam + @mock_aws def test_user_access_key_2_not_rotated(self): credentials_last_rotated = ( datetime.datetime.now() - datetime.timedelta(days=100) @@ -128,7 +128,7 @@ class Test_iam_rotate_access_key_90_days_test: assert result[0].resource_arn == arn assert result[0].region == AWS_REGION_US_EAST_1 - @mock_iam + @mock_aws def test_user_both_access_keys_not_rotated(self): credentials_last_rotated = ( datetime.datetime.now() - datetime.timedelta(days=100) @@ -182,7 +182,7 @@ class Test_iam_rotate_access_key_90_days_test: assert result[1].resource_arn == arn assert result[1].region == AWS_REGION_US_EAST_1 - @mock_iam + @mock_aws def test_user_both_access_keys_rotated(self): credentials_last_rotated = ( datetime.datetime.now() - datetime.timedelta(days=10) 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 b6ea65d3..db21e106 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 @@ -3,7 +3,7 @@ from re import search from unittest import mock from boto3 import client -from moto import mock_iam +from moto import mock_aws from prowler.providers.aws.services.iam.iam_service import IAM from tests.providers.aws.audit_info_utils import ( @@ -13,7 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_iam_securityaudit_role_created: - @mock_iam + @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]) iam = client("iam") @@ -60,7 +60,7 @@ class Test_iam_securityaudit_role_created: assert result[0].resource_arn == "arn:aws:iam::aws:policy/SecurityAudit" assert result[0].region == "us-east-1" - @mock_iam + @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]) diff --git a/tests/providers/aws/services/iam/iam_service_test.py b/tests/providers/aws/services/iam/iam_service_test.py index 9fc59733..d7a99804 100644 --- a/tests/providers/aws/services/iam/iam_service_test.py +++ b/tests/providers/aws/services/iam/iam_service_test.py @@ -5,7 +5,7 @@ import botocore from boto3 import client from freezegun import freeze_time from mock import patch -from moto import mock_iam +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 ( @@ -81,7 +81,7 @@ def mock_make_api_call(self, operation_name, kwargs): class Test_IAM_Service: # Test IAM Client - @mock_iam + @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]) @@ -89,7 +89,7 @@ class Test_IAM_Service: assert iam.client.__class__.__name__ == "IAM" # Test IAM Session - @mock_iam + @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]) @@ -98,7 +98,7 @@ class Test_IAM_Service: # Test IAM Get Credential Report @freeze_time(TEST_DATETIME) - @mock_iam + @mock_aws def test__get_credential_report__(self): # Generate IAM Client iam_client = client("iam") @@ -264,7 +264,7 @@ class Test_IAM_Service: ) # Test IAM Get Roles - @mock_iam + @mock_aws def test__get_roles__(self): # Generate IAM Client iam_client = client("iam") @@ -319,7 +319,7 @@ class Test_IAM_Service: assert not is_service_role(role) # Test IAM Get Groups - @mock_iam + @mock_aws def test__get_groups__(self): # Generate IAM Client iam_client = client("iam") @@ -337,7 +337,7 @@ class Test_IAM_Service: assert len(iam.groups) == len(iam_client.list_groups()["Groups"]) # Test IAM Get Users - @mock_iam + @mock_aws def test__get_users__(self): # Generate IAM Client iam_client = client("iam") @@ -367,7 +367,7 @@ class Test_IAM_Service: ] # Test IAM Get Account Summary - @mock_iam + @mock_aws def test__get_account_summary__(self): # Generate IAM Client iam_client = client("iam") @@ -380,7 +380,7 @@ class Test_IAM_Service: assert iam.account_summary["SummaryMap"] == account_summary # Test IAM Get Password Policy - @mock_iam + @mock_aws def test__get_password_policy__(self): # Generate IAM Client iam_client = client("iam") @@ -423,7 +423,7 @@ class Test_IAM_Service: assert iam.password_policy.hard_expiry == hard_expiry # Test IAM List MFA Device - @mock_iam + @mock_aws def test__list_mfa_devices__(self): # Generate IAM Client iam_client = client("iam") @@ -456,7 +456,7 @@ class Test_IAM_Service: assert iam.users[0].mfa_devices[0].type == "mfa" # Test IAM List Virtual MFA Device - @mock_iam + @mock_aws def test__list_virtual_mfa_devices__(self): # Generate IAM Client iam_client = client("iam") @@ -489,7 +489,7 @@ class Test_IAM_Service: assert iam.virtual_mfa_devices[0]["User"]["UserName"] == username # Test IAM Get Group Users - @mock_iam + @mock_aws def test__get_group_users__(self): # Generate IAM Client iam_client = client("iam") @@ -515,7 +515,7 @@ class Test_IAM_Service: assert iam.groups[0].users[0].name == username # Test IAM List Attached Group Policies - @mock_iam + @mock_aws def test__list_attached_group_policies__(self): # Generate IAM Client iam_client = client("iam") @@ -564,7 +564,7 @@ class Test_IAM_Service: ) # Test IAM List Attached Role Policies - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test__list_attached_role_policies__(self): iam = client("iam") role_name = "test" @@ -600,7 +600,7 @@ class Test_IAM_Service: == READ_ONLY_ACCESS_POLICY_ARN ) - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test__get_entities_attached_to_support_roles__no_roles(self): iam_client = client("iam") _ = iam_client.list_entities_for_policy( @@ -612,7 +612,7 @@ class Test_IAM_Service: iam = IAM(audit_info) assert len(iam.entities_role_attached_to_support_policy) == 0 - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test__get_entities_attached_to_support_roles__(self): iam_client = client("iam") role_name = "test_support" @@ -644,7 +644,7 @@ class Test_IAM_Service: assert len(iam.entities_role_attached_to_support_policy) == 1 assert iam.entities_role_attached_to_support_policy[0]["RoleName"] == role_name - @mock_iam + @mock_aws def test__get_entities_attached_to_securityaudit_roles__no_roles(self): iam_client = client("iam") _ = iam_client.list_entities_for_policy( @@ -656,7 +656,7 @@ class Test_IAM_Service: iam = IAM(audit_info) assert len(iam.entities_role_attached_to_securityaudit_policy) == 0 - @mock_iam + @mock_aws(config={"iam": {"load_aws_managed_policies": True}}) def test__get_entities_attached_to_securityaudit_roles__(self): iam_client = client("iam") role_name = "test_securityaudit" @@ -691,7 +691,7 @@ class Test_IAM_Service: == role_name ) - @mock_iam + @mock_aws def test___list_policies__(self): iam_client = client("iam") policy_name = "policy1" @@ -720,7 +720,7 @@ class Test_IAM_Service: ] assert custom_policies == 1 - @mock_iam + @mock_aws def test__list_policies_version__(self): iam_client = client("iam") policy_name = "policy2" @@ -747,7 +747,7 @@ class Test_IAM_Service: assert custom_policies == 1 # Test IAM List SAML Providers - @mock_iam + @mock_aws def test__list_saml_providers__(self): iam_client = client("iam") xml_template = r""" 1000 - @mock_sqs + @mock_aws # Test SQS list queues def test__get_queue_attributes__(self): sqs_client = client("sqs", region_name=AWS_REGION_EU_WEST_1) diff --git a/tests/providers/aws/services/ssm/ssm_service_test.py b/tests/providers/aws/services/ssm/ssm_service_test.py index 86a994b4..b92254a2 100644 --- a/tests/providers/aws/services/ssm/ssm_service_test.py +++ b/tests/providers/aws/services/ssm/ssm_service_test.py @@ -3,7 +3,7 @@ from unittest.mock import patch import botocore import yaml from boto3 import client -from moto import mock_ssm +from moto import mock_aws from prowler.providers.aws.services.ssm.ssm_service import SSM, ResourceStatus from tests.providers.aws.audit_info_utils import ( @@ -134,24 +134,24 @@ mainSteps: ) class Test_SSM_Service: # Test SSM Client - @mock_ssm + @mock_aws def test__get_client__(self): ssm = SSM(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) assert ssm.regional_clients[AWS_REGION_US_EAST_1].__class__.__name__ == "SSM" # Test SSM Session - @mock_ssm + @mock_aws def test__get_session__(self): ssm = SSM(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) assert ssm.session.__class__.__name__ == "Session" # Test SSM Service - @mock_ssm + @mock_aws def test__get_service__(self): ssm = SSM(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) assert ssm.service == "ssm" - @mock_ssm + @mock_aws def test__list_documents__(self): # Create SSM Document ssm_client = client("ssm", region_name=AWS_REGION_US_EAST_1) @@ -188,7 +188,7 @@ class Test_SSM_Service: assert ssm.documents[document_arn].content == yaml.safe_load(ssm_document_yaml) assert ssm.documents[document_arn].account_owners == [AWS_ACCOUNT_NUMBER] - @mock_ssm + @mock_aws def test__list_resource_compliance_summaries__(self): ssm = SSM(set_mocked_aws_audit_info([AWS_REGION_US_EAST_1])) instance_id = "i-1234567890abcdef0" diff --git a/tests/providers/aws/services/trustedadvisor/trustedadvisor_service_test.py b/tests/providers/aws/services/trustedadvisor/trustedadvisor_service_test.py index 6b3abc9b..1e09d63c 100644 --- a/tests/providers/aws/services/trustedadvisor/trustedadvisor_service_test.py +++ b/tests/providers/aws/services/trustedadvisor/trustedadvisor_service_test.py @@ -1,7 +1,7 @@ from unittest.mock import patch import botocore -from moto import mock_support +from moto import mock_aws from prowler.providers.aws.services.trustedadvisor.trustedadvisor_service import ( TrustedAdvisor, @@ -56,7 +56,7 @@ class Test_TrustedAdvisor_Service: trustedadvisor = TrustedAdvisor(audit_info) assert trustedadvisor.session.__class__.__name__ == "Session" - @mock_support + @mock_aws # Test TrustedAdvisor session def test__describe_trusted_advisor_checks__(self): audit_info = set_mocked_aws_audit_info([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 1c17f387..4fd860f6 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_ARN, @@ -13,7 +13,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_vpc_different_regions: - @mock_ec2 + @mock_aws def test_no_vpcs(self): from prowler.providers.aws.services.vpc.vpc_service import VPC @@ -42,7 +42,7 @@ class Test_vpc_different_regions: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_vpc_different_regions(self): # VPC Region 1 ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -83,7 +83,7 @@ class Test_vpc_different_regions: assert result[0].resource_arn == AWS_ACCOUNT_ARN assert result[0].resource_tags == [] - @mock_ec2 + @mock_aws def test_vpc_only_one_region(self): ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) # VPC Region 1 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 41a8bfb8..74c1fa49 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 @@ -2,7 +2,7 @@ import json from unittest import mock from boto3 import client -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -15,7 +15,7 @@ NON_TRUSTED_AWS_ACCOUNT_NUMBER = "000011112222" class Test_vpc_endpoint_connections_trust_boundaries: - @mock_ec2 + @mock_aws def test_vpc_no_endpoints(self): from prowler.providers.aws.services.vpc.vpc_service import VPC @@ -41,7 +41,7 @@ class Test_vpc_endpoint_connections_trust_boundaries: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_vpc_aws_endpoint(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -80,7 +80,7 @@ class Test_vpc_endpoint_connections_trust_boundaries: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_vpc_endpoint_with_full_access(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -141,7 +141,7 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_vpc_endpoint_with_trusted_account_arn(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -203,7 +203,7 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_vpc_endpoint_with_trusted_account_id(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -263,7 +263,7 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_vpc_endpoint_with_untrusted_account(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -325,7 +325,7 @@ class Test_vpc_endpoint_connections_trust_boundaries: == vpc_endpoint["VpcEndpoint"]["VpcEndpointId"] ) - @mock_ec2 + @mock_aws def test_vpc_endpoint_with_config_trusted_account_with_arn(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -390,7 +390,7 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_vpc_endpoint_with_config_trusted_account(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -453,7 +453,7 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_vpc_endpoint_with_two_account_ids_one_trusted_one_not(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -518,7 +518,7 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_vpc_endpoint_with_aws_principal_all(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -578,7 +578,7 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_vpc_endpoint_with_aws_principal_all_but_restricted_condition_with_SourceAccount( self, ): @@ -645,7 +645,7 @@ class Test_vpc_endpoint_connections_trust_boundaries: ) assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_vpc_endpoint_with_aws_principal_all_but_restricted_condition_with_PrincipalAccount( self, ): 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 16e3af6b..88529475 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_ec2, mock_elbv2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -15,7 +15,7 @@ AWS_ACCOUNT_ARN_2 = f"arn:aws:iam::{AWS_ACCOUNT_NUMBER_2}:root" class Test_vpc_endpoint_services_allowed_principals_trust_boundaries: - @mock_ec2 + @mock_aws def test_no_vpc_endpoint_services(self): from prowler.providers.aws.services.vpc.vpc_service import VPC @@ -43,8 +43,7 @@ class Test_vpc_endpoint_services_allowed_principals_trust_boundaries: assert len(result) == 0 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_vpc_endpoint_service_without_allowed_principals(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -107,8 +106,7 @@ class Test_vpc_endpoint_services_allowed_principals_trust_boundaries: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_vpc_endpoint_service_with_allowed_principal_account_arn(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -176,8 +174,7 @@ class Test_vpc_endpoint_services_allowed_principals_trust_boundaries: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_vpc_endpoint_service_with_allowed_principal_account_number(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -245,8 +242,7 @@ class Test_vpc_endpoint_services_allowed_principals_trust_boundaries: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_vpc_endpoint_service_with_principal_not_allowed(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -314,8 +310,7 @@ class Test_vpc_endpoint_services_allowed_principals_trust_boundaries: assert result[0].resource_tags == [] assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 - @mock_elbv2 + @mock_aws def test_vpc_endpoint_service_with_principal_different_than_account_but_allowed_in_config( self, ): 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 bf7f31af..f6cc27bc 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_ACCOUNT_NUMBER, @@ -12,7 +12,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_vpc_flow_logs_enabled: - @mock_ec2 + @mock_aws def test_vpc_only_default_vpcs(self): from prowler.providers.aws.services.vpc.vpc_service import VPC @@ -37,7 +37,7 @@ class Test_vpc_flow_logs_enabled: assert len(result) == 2 # Number of AWS regions, one default VPC per region - @mock_ec2 + @mock_aws def test_vpc_with_flow_logs(self): from prowler.providers.aws.services.vpc.vpc_service import VPC @@ -95,7 +95,7 @@ class Test_vpc_flow_logs_enabled: ) assert result.resource_id == vpc["VpcId"] - @mock_ec2 + @mock_aws def test_vpc_without_flow_logs(self): from prowler.providers.aws.services.vpc.vpc_service import VPC @@ -133,7 +133,7 @@ class Test_vpc_flow_logs_enabled: ) assert result.resource_id == vpc["VpcId"] - @mock_ec2 + @mock_aws def test_vpc_without_flow_logs_ignoring(self): from prowler.providers.aws.services.vpc.vpc_service import VPC @@ -164,7 +164,7 @@ class Test_vpc_flow_logs_enabled: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_vpc_without_flow_logs_ignoring_in_use(self): from prowler.providers.aws.services.vpc.vpc_service import VPC 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 173d48d0..3fca4ab0 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client, resource -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -10,7 +10,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_vpc_peering_routing_tables_with_least_privilege: - @mock_ec2 + @mock_aws def test_vpc_no_peering_connections(self): from prowler.providers.aws.services.vpc.vpc_service import VPC @@ -34,7 +34,7 @@ class Test_vpc_peering_routing_tables_with_least_privilege: assert len(result) == 0 - @mock_ec2 + @mock_aws def test_vpc_comply_peering_connection_(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -101,7 +101,7 @@ class Test_vpc_peering_routing_tables_with_least_privilege: assert result[0].resource_id == vpc_pcx_id assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_vpc_comply_peering_connection_edge_case(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -166,7 +166,7 @@ class Test_vpc_peering_routing_tables_with_least_privilege: assert result[0].resource_id == vpc_pcx_id assert result[0].region == AWS_REGION_US_EAST_1 - @mock_ec2 + @mock_aws def test_vpc_not_comply_peering_connection_(self): # Create VPC Mocked Resources ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) diff --git a/tests/providers/aws/services/vpc/vpc_service_test.py b/tests/providers/aws/services/vpc/vpc_service_test.py index d2534e3f..c4317fc9 100644 --- a/tests/providers/aws/services/vpc/vpc_service_test.py +++ b/tests/providers/aws/services/vpc/vpc_service_test.py @@ -1,7 +1,7 @@ import json from boto3 import client, resource -from moto import mock_ec2, mock_elbv2 +from moto import mock_aws from prowler.providers.aws.services.vpc.vpc_service import VPC, Route from tests.providers.aws.audit_info_utils import ( @@ -15,7 +15,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_VPC_Service: # Test VPC Service - @mock_ec2 + @mock_aws def test_service(self): # VPC client for this test class audit_info = set_mocked_aws_audit_info( @@ -25,7 +25,7 @@ class Test_VPC_Service: assert vpc.service == "ec2" # Test VPC Client - @mock_ec2 + @mock_aws def test_client(self): # VPC client for this test class audit_info = set_mocked_aws_audit_info( @@ -36,7 +36,7 @@ class Test_VPC_Service: assert regional_client.__class__.__name__ == "EC2" # Test VPC Session - @mock_ec2 + @mock_aws def test__get_session__(self): # VPC client for this test class audit_info = set_mocked_aws_audit_info( @@ -46,7 +46,7 @@ class Test_VPC_Service: assert vpc.session.__class__.__name__ == "Session" # Test VPC Session - @mock_ec2 + @mock_aws def test_audited_account(self): # VPC client for this test class audit_info = set_mocked_aws_audit_info( @@ -56,7 +56,7 @@ class Test_VPC_Service: assert vpc.audited_account == AWS_ACCOUNT_NUMBER # Test VPC Describe VPCs - @mock_ec2 + @mock_aws def test__describe_vpcs__(self): # Generate VPC Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -87,7 +87,7 @@ class Test_VPC_Service: ] # Test VPC Describe Flow Logs - @mock_ec2 + @mock_aws def test__describe_flow_logs__(self): # Generate VPC Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -114,7 +114,7 @@ class Test_VPC_Service: assert vpc_iter.flow_log is True # Test VPC Describe VPC Peering connections - @mock_ec2 + @mock_aws def test__describe_vpc_peering_connections__(self): # Generate VPC Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -150,7 +150,7 @@ class Test_VPC_Service: ] # Test VPC Describe VPC Peering connections - @mock_ec2 + @mock_aws def test__describe_route_tables__(self): # Generate VPC Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -194,7 +194,7 @@ class Test_VPC_Service: assert vpc.vpc_peering_connections[0].id == vpc_pcx_id # Test VPC Describe VPC Endpoints - @mock_ec2 + @mock_aws def test__describe_vpc_endpoints__(self): # Generate VPC Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -240,8 +240,7 @@ class Test_VPC_Service: ] # Test VPC Describe VPC Endpoint Services - @mock_ec2 - @mock_elbv2 + @mock_aws def test__describe_vpc_endpoint_services__(self): # Generate VPC Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) @@ -294,7 +293,7 @@ class Test_VPC_Service: assert vpce.tags == [] # Test VPC Describe VPC Subnets - @mock_ec2 + @mock_aws def test__describe_vpc_subnets__(self): # Generate VPC Client ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) 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 1eed4d9e..bf082e99 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -10,7 +10,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_vpc_subnet_different_az: - @mock_ec2 + @mock_aws def test_vpc_subnet_different_az(self): ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) vpc = ec2_client.create_vpc( @@ -75,7 +75,7 @@ class Test_vpc_subnet_different_az: if not found: assert False - @mock_ec2 + @mock_aws def test_vpc_subnet_same_az(self): ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) vpc = ec2_client.create_vpc( @@ -129,7 +129,7 @@ class Test_vpc_subnet_different_az: if not found: assert False - @mock_ec2 + @mock_aws def test_vpc_no_subnets(self): ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) vpc = ec2_client.create_vpc( 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 8c292a47..543db22e 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -10,7 +10,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_vpc_subnet_no_public_ip_by_default: - @mock_ec2 + @mock_aws def test_vpc_with_map_ip_on_launch(self): ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) vpc = ec2_client.create_vpc( @@ -62,7 +62,7 @@ class Test_vpc_subnet_no_public_ip_by_default: == "VPC subnet subnet_name assigns public IP by default." ) - @mock_ec2 + @mock_aws def test_vpc_without_map_ip_on_launch(self): ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) vpc = ec2_client.create_vpc( 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 067acbf5..9cccbf9e 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 @@ -1,7 +1,7 @@ from unittest import mock from boto3 import client -from moto import mock_ec2 +from moto import mock_aws from tests.providers.aws.audit_info_utils import ( AWS_REGION_US_EAST_1, @@ -10,7 +10,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_vpc_subnet_separate_private_public: - @mock_ec2 + @mock_aws def test_vpc_subnet_only_private(self): ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) vpc = ec2_client.create_vpc( @@ -79,7 +79,7 @@ class Test_vpc_subnet_separate_private_public: if not found: assert False - @mock_ec2 + @mock_aws def test_vpc_subnet_only_public(self): ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) vpc = ec2_client.create_vpc( @@ -139,7 +139,7 @@ class Test_vpc_subnet_separate_private_public: if not found: assert False - @mock_ec2 + @mock_aws def test_vpc_subnet_private_and_public(self): ec2_client = client("ec2", region_name=AWS_REGION_US_EAST_1) vpc = ec2_client.create_vpc( diff --git a/tests/providers/aws/services/wafv2/wafv2_service_test.py b/tests/providers/aws/services/wafv2/wafv2_service_test.py index b523d200..f8af8ce4 100644 --- a/tests/providers/aws/services/wafv2/wafv2_service_test.py +++ b/tests/providers/aws/services/wafv2/wafv2_service_test.py @@ -1,5 +1,5 @@ from boto3 import client, resource -from moto import mock_ec2, mock_elbv2, mock_wafv2 +from moto import mock_aws from prowler.providers.aws.services.wafv2.wafv2_service import WAFv2 from tests.providers.aws.audit_info_utils import ( @@ -10,7 +10,7 @@ from tests.providers.aws.audit_info_utils import ( class Test_WAFv2_Service: # Test WAFv2 Service - @mock_wafv2 + @mock_aws def test_service(self): # WAFv2 client for this test class audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) @@ -18,7 +18,7 @@ class Test_WAFv2_Service: assert wafv2.service == "wafv2" # Test WAFv2 Client - @mock_wafv2 + @mock_aws def test_client(self): # WAFv2 client for this test class audit_info = set_mocked_aws_audit_info([AWS_REGION_EU_WEST_1]) @@ -27,7 +27,7 @@ class Test_WAFv2_Service: assert regional_client.__class__.__name__ == "WAFV2" # Test WAFv2 Session - @mock_wafv2 + @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]) @@ -35,7 +35,7 @@ class Test_WAFv2_Service: assert wafv2.session.__class__.__name__ == "Session" # Test WAFv2 Describe Web ACLs - @mock_wafv2 + @mock_aws def test__list_web_acls__(self): wafv2 = client("wafv2", region_name=AWS_REGION_EU_WEST_1) waf = wafv2.create_web_acl( @@ -58,9 +58,7 @@ class Test_WAFv2_Service: assert wafv2.web_acls[0].id == waf["Id"] # Test WAFv2 Describe Web ACLs Resources - @mock_ec2 - @mock_elbv2 - @mock_wafv2 + @mock_aws def test__list_resources_for_web_acl__(self): wafv2 = client("wafv2", region_name=AWS_REGION_EU_WEST_1) conn = client("elbv2", region_name=AWS_REGION_EU_WEST_1) 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 b043bfb1..55522532 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 @@ -2,7 +2,7 @@ from unittest import mock from uuid import uuid4 from boto3 import client -from moto import mock_ec2 +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 @@ -82,7 +82,7 @@ class Test_workspaces_vpc_2private_1public_subnets_nat: assert result[0].resource_arn == WORKSPACE_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_ec2 + @mock_aws def test_workspaces_vpc_one_private_subnet(self): # EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -150,7 +150,7 @@ class Test_workspaces_vpc_2private_1public_subnets_nat: assert result[0].resource_arn == WORKSPACE_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_ec2 + @mock_aws def test_workspaces_vpc_two_private_subnet(self): # EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -235,7 +235,7 @@ class Test_workspaces_vpc_2private_1public_subnets_nat: assert result[0].resource_arn == WORKSPACE_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_ec2 + @mock_aws def test_workspaces_vpc_two_private_subnet_one_public(self): # EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_EU_WEST_1) @@ -339,7 +339,7 @@ class Test_workspaces_vpc_2private_1public_subnets_nat: assert result[0].resource_arn == WORKSPACE_ARN assert result[0].region == AWS_REGION_EU_WEST_1 - @mock_ec2 + @mock_aws def test_workspaces_vpc_two_private_subnet_one_public_and_nat(self): # EC2 Client ec2_client = client("ec2", region_name=AWS_REGION_EU_WEST_1) diff --git a/tests/providers/common/audit_info_test.py b/tests/providers/common/audit_info_test.py index 8502c820..ebc9f17d 100644 --- a/tests/providers/common/audit_info_test.py +++ b/tests/providers/common/audit_info_test.py @@ -3,7 +3,7 @@ import botocore import pytest from boto3 import session from mock import patch -from moto import mock_ec2, mock_resourcegroupstaggingapi +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 @@ -279,8 +279,7 @@ class Test_Set_Audit_Info: audit_info = set_provider_audit_info(provider, arguments) assert isinstance(audit_info, GCP_Audit_Info) - @mock_resourcegroupstaggingapi - @mock_ec2 + @mock_aws def test_get_tagged_resources(self): with patch( "prowler.providers.common.audit_info.current_audit_info", @@ -328,7 +327,7 @@ class Test_Set_Audit_Info: get_tagged_resources(["MY_TAG1=MY_VALUE1"], mock_audit_info) ) - @mock_ec2 + @mock_aws @patch( "prowler.providers.common.audit_info.validate_aws_credentials", new=mock_validate_credentials,