diff --git a/tests/providers/aws/services/glue/glue_database_connections_ssl_enabled/glue_database_connections_ssl_enabled_test.py b/tests/providers/aws/services/glue/glue_database_connections_ssl_enabled/glue_database_connections_ssl_enabled_test.py index 1794d9cf7c..9cf73ff830 100644 --- a/tests/providers/aws/services/glue/glue_database_connections_ssl_enabled/glue_database_connections_ssl_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_database_connections_ssl_enabled/glue_database_connections_ssl_enabled_test.py @@ -1,4 +1,3 @@ -from re import search from unittest.mock import MagicMock, patch from prowler.providers.aws.services.glue.glue_service import Connection @@ -62,9 +61,9 @@ class Test_glue_database_connections_ssl_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "has SSL connection disabled", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue connection test has SSL connection disabled." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -106,9 +105,9 @@ class Test_glue_database_connections_ssl_enabled: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has SSL connection enabled", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue connection test has SSL connection enabled." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" diff --git a/tests/providers/aws/services/glue/glue_development_endpoints_cloudwatch_logs_encryption_enabled/glue_development_endpoints_cloudwatch_logs_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_development_endpoints_cloudwatch_logs_encryption_enabled/glue_development_endpoints_cloudwatch_logs_encryption_enabled_test.py index 01151d53f9..37eb7531cf 100644 --- a/tests/providers/aws/services/glue/glue_development_endpoints_cloudwatch_logs_encryption_enabled/glue_development_endpoints_cloudwatch_logs_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_development_endpoints_cloudwatch_logs_encryption_enabled/glue_development_endpoints_cloudwatch_logs_encryption_enabled_test.py @@ -1,4 +1,3 @@ -from re import search from unittest.mock import MagicMock, patch from prowler.providers.aws.services.glue.glue_service import DevEndpoint, SecurityConfig @@ -66,9 +65,9 @@ class Test_glue_development_endpoints_cloudwatch_logs_encryption_enabled: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has CloudWatch logs encryption enabled with key", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue development endpoint test has CloudWatch logs encryption enabled with key key_arn." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -112,9 +111,9 @@ class Test_glue_development_endpoints_cloudwatch_logs_encryption_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have CloudWatch logs encryption enabled", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue development endpoint test does not have CloudWatch logs encryption enabled." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -150,9 +149,9 @@ class Test_glue_development_endpoints_cloudwatch_logs_encryption_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have security configuration", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue development endpoint test does not have security configuration." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" diff --git a/tests/providers/aws/services/glue/glue_development_endpoints_job_bookmark_encryption_enabled/glue_development_endpoints_job_bookmark_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_development_endpoints_job_bookmark_encryption_enabled/glue_development_endpoints_job_bookmark_encryption_enabled_test.py index d92003b817..c7b73394e1 100644 --- a/tests/providers/aws/services/glue/glue_development_endpoints_job_bookmark_encryption_enabled/glue_development_endpoints_job_bookmark_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_development_endpoints_job_bookmark_encryption_enabled/glue_development_endpoints_job_bookmark_encryption_enabled_test.py @@ -1,4 +1,3 @@ -from re import search from unittest.mock import MagicMock, patch from prowler.providers.aws.services.glue.glue_service import DevEndpoint, SecurityConfig @@ -66,9 +65,9 @@ class Test_glue_development_endpoints_job_bookmark_encryption_enabled: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has Job Bookmark encryption enabled with key", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue development endpoint test has Job Bookmark encryption enabled with key key_arn." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -112,9 +111,9 @@ class Test_glue_development_endpoints_job_bookmark_encryption_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have Job Bookmark encryption enabled", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue development endpoint test does not have Job Bookmark encryption enabled." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -150,9 +149,9 @@ class Test_glue_development_endpoints_job_bookmark_encryption_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have security configuration", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue development endpoint test does not have security configuration." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" diff --git a/tests/providers/aws/services/glue/glue_development_endpoints_s3_encryption_enabled/glue_development_endpoints_s3_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_development_endpoints_s3_encryption_enabled/glue_development_endpoints_s3_encryption_enabled_test.py index 8859e5faba..f43bab581d 100644 --- a/tests/providers/aws/services/glue/glue_development_endpoints_s3_encryption_enabled/glue_development_endpoints_s3_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_development_endpoints_s3_encryption_enabled/glue_development_endpoints_s3_encryption_enabled_test.py @@ -1,4 +1,3 @@ -from re import search from unittest.mock import MagicMock, patch from prowler.providers.aws.services.glue.glue_service import DevEndpoint, SecurityConfig @@ -66,9 +65,9 @@ class Test_glue_development_endpoints_s3_encryption_enabled: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has S3 encryption enabled with key", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue development endpoint test has S3 encryption enabled with key key_arn." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -112,9 +111,9 @@ class Test_glue_development_endpoints_s3_encryption_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have S3 encryption enabled", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue development endpoint test does not have S3 encryption enabled." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -150,9 +149,9 @@ class Test_glue_development_endpoints_s3_encryption_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have security configuration", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue development endpoint test does not have security configuration." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" diff --git a/tests/providers/aws/services/glue/glue_etl_jobs_amazon_s3_encryption_enabled/glue_etl_jobs_amazon_s3_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_etl_jobs_amazon_s3_encryption_enabled/glue_etl_jobs_amazon_s3_encryption_enabled_test.py index 81fa6a669b..f2865f6aac 100644 --- a/tests/providers/aws/services/glue/glue_etl_jobs_amazon_s3_encryption_enabled/glue_etl_jobs_amazon_s3_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_etl_jobs_amazon_s3_encryption_enabled/glue_etl_jobs_amazon_s3_encryption_enabled_test.py @@ -1,4 +1,3 @@ -from re import search from unittest.mock import MagicMock, patch from prowler.providers.aws.services.glue.glue_service import Job, SecurityConfig @@ -67,9 +66,9 @@ class Test_glue_etl_jobs_amazon_s3_encryption_enabled: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has S3 encryption enabled with key", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue job test has S3 encryption enabled with key key_arn." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -114,9 +113,9 @@ class Test_glue_etl_jobs_amazon_s3_encryption_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have S3 encryption enabled", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue job test does not have S3 encryption enabled." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -152,9 +151,9 @@ class Test_glue_etl_jobs_amazon_s3_encryption_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have security configuration", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue job test does not have security configuration." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -194,9 +193,8 @@ class Test_glue_etl_jobs_amazon_s3_encryption_enabled: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has S3 encryption enabled", - result[0].status_extended, + assert ( + result[0].status_extended == "Glue job test has S3 encryption enabled." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" diff --git a/tests/providers/aws/services/glue/glue_etl_jobs_cloudwatch_logs_encryption_enabled/glue_etl_jobs_cloudwatch_logs_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_etl_jobs_cloudwatch_logs_encryption_enabled/glue_etl_jobs_cloudwatch_logs_encryption_enabled_test.py index 2147542e4a..1683ea5a18 100644 --- a/tests/providers/aws/services/glue/glue_etl_jobs_cloudwatch_logs_encryption_enabled/glue_etl_jobs_cloudwatch_logs_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_etl_jobs_cloudwatch_logs_encryption_enabled/glue_etl_jobs_cloudwatch_logs_encryption_enabled_test.py @@ -1,4 +1,3 @@ -from re import search from unittest.mock import MagicMock, patch from prowler.providers.aws.services.glue.glue_service import Job, SecurityConfig @@ -67,9 +66,9 @@ class Test_glue_etl_jobs_cloudwatch_logs_encryption_enabled: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has CloudWatch Logs encryption enabled with key", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue job test has CloudWatch Logs encryption enabled with key key_arn." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -114,9 +113,9 @@ class Test_glue_etl_jobs_cloudwatch_logs_encryption_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have CloudWatch Logs encryption enabled", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue job test does not have CloudWatch Logs encryption enabled." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -152,9 +151,9 @@ class Test_glue_etl_jobs_cloudwatch_logs_encryption_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have security configuration", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue job test does not have security configuration." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" diff --git a/tests/providers/aws/services/glue/glue_etl_jobs_job_bookmark_encryption_enabled/glue_etl_jobs_job_bookmark_encryption_enabled_test.py b/tests/providers/aws/services/glue/glue_etl_jobs_job_bookmark_encryption_enabled/glue_etl_jobs_job_bookmark_encryption_enabled_test.py index 4bd10d30e9..4999e27e48 100644 --- a/tests/providers/aws/services/glue/glue_etl_jobs_job_bookmark_encryption_enabled/glue_etl_jobs_job_bookmark_encryption_enabled_test.py +++ b/tests/providers/aws/services/glue/glue_etl_jobs_job_bookmark_encryption_enabled/glue_etl_jobs_job_bookmark_encryption_enabled_test.py @@ -1,4 +1,3 @@ -from re import search from unittest.mock import MagicMock, patch from prowler.providers.aws.services.glue.glue_service import Job, SecurityConfig @@ -67,9 +66,9 @@ class Test_glue_etl_jobs_job_bookmark_encryption_enabled: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has Job bookmark encryption enabled with key", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue job test has Job bookmark encryption enabled with key key_arn." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -114,9 +113,9 @@ class Test_glue_etl_jobs_job_bookmark_encryption_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have Job bookmark encryption enabled", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue job test does not have Job bookmark encryption enabled." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test" @@ -152,9 +151,9 @@ class Test_glue_etl_jobs_job_bookmark_encryption_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have security configuration", - result[0].status_extended, + assert ( + result[0].status_extended + == "Glue job test does not have security configuration." ) assert result[0].resource_id == "test" assert result[0].resource_arn == "arn_test"