From 14f06d64970e408e8b35a2743d65362e894ed23e Mon Sep 17 00:00:00 2001 From: sansns-aws <107269923+sansns@users.noreply.github.com> Date: Mon, 28 Oct 2024 16:45:01 -0400 Subject: [PATCH] chore(elbv2): cleanup tests (#5553) --- .../elbv2_deletion_protection_test.py | 13 ++++++------- .../elbv2_desync_mitigation_mode_test.py | 19 +++++++++---------- .../elbv2_insecure_ssl_ciphers_test.py | 13 ++++++------- .../elbv2_listeners_underneath_test.py | 8 +++----- .../elbv2_logging_enabled_test.py | 13 ++++++------- .../elbv2_ssl_listeners_test.py | 18 ++++++++---------- .../elbv2_waf_acl_attached_test.py | 13 ++++++------- 7 files changed, 44 insertions(+), 53 deletions(-) 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 27e133e761..f7b34547a8 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 @@ -1,4 +1,3 @@ -from re import search from unittest import mock from boto3 import client, resource @@ -96,9 +95,9 @@ class Test_elbv2_deletion_protection: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have deletion protection", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 my-lb does not have deletion protection enabled." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] @@ -159,9 +158,9 @@ class Test_elbv2_deletion_protection: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has deletion protection enabled", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 my-lb has deletion protection enabled." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] 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 ab81399b8f..c2188c495b 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 @@ -1,4 +1,3 @@ -from re import search from unittest import mock from boto3 import client, resource @@ -100,9 +99,9 @@ class Test_elbv2_desync_mitigation_mode: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have desync mitigation mode set as strictest/defensive and is not dropping invalid header fields", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 ALB my-lb does not have desync mitigation mode set as strictest/defensive and is not dropping invalid header fields." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] @@ -168,9 +167,9 @@ class Test_elbv2_desync_mitigation_mode: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "does not have desync mitigation mode set as strictest/defensive but is dropping invalid header fields", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 ALB my-lb does not have desync mitigation mode set as strictest/defensive but is dropping invalid header fields." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] @@ -231,9 +230,9 @@ class Test_elbv2_desync_mitigation_mode: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "is configured with correct desync mitigation mode", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 ALB my-lb is configured with correct desync mitigation mode." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] 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 c8fbc8258e..11087f0b3e 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 @@ -1,4 +1,3 @@ -from re import search from unittest import mock from boto3 import client, resource @@ -113,9 +112,9 @@ class Test_elbv2_insecure_ssl_ciphers: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "does not have insecure SSL protocols or ciphers", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 my-lb does not have insecure SSL protocols or ciphers." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] @@ -192,9 +191,9 @@ class Test_elbv2_insecure_ssl_ciphers: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "has listeners with insecure SSL protocols or ciphers", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 my-lb has listeners with insecure SSL protocols or ciphers (ELBSecurityPolicy-TLS-1-1-2017-01)." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] 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 9b28a92c5b..ebec903cc3 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 @@ -1,4 +1,3 @@ -from re import search from unittest import mock from boto3 import client, resource @@ -89,9 +88,8 @@ class Test_elbv2_listeners_underneath: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "has no listeners underneath", - result[0].status_extended, + assert ( + result[0].status_extended == "ELBv2 my-lb has no listeners underneath." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] @@ -167,6 +165,6 @@ class Test_elbv2_listeners_underneath: assert len(result) == 1 assert result[0].status == "PASS" - assert search("has listeners underneath", result[0].status_extended) + assert result[0].status_extended == "ELBv2 my-lb has listeners underneath." assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] 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 17023d3d36..48a7c69a8f 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 @@ -1,4 +1,3 @@ -from re import search from unittest import mock from boto3 import client, resource @@ -99,9 +98,9 @@ class Test_elbv2_logging_enabled: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "does not have access logs configured", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 ALB my-lb does not have access logs configured." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] @@ -165,9 +164,9 @@ class Test_elbv2_logging_enabled: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has access logs to S3 configured", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 ALB my-lb has access logs to S3 configured." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] 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 2d42c2d2eb..7315542743 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 @@ -1,4 +1,3 @@ -from re import search from unittest import mock from boto3 import client, resource @@ -111,9 +110,9 @@ class Test_elbv2_ssl_listeners: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "has non-encrypted listeners", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 ALB my-lb has non-encrypted listeners." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] @@ -189,9 +188,8 @@ class Test_elbv2_ssl_listeners: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has HTTPS listeners only", - result[0].status_extended, + assert ( + result[0].status_extended == "ELBv2 ALB my-lb has HTTPS listeners only." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] @@ -260,9 +258,9 @@ class Test_elbv2_ssl_listeners: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "has HTTP listener but it redirects to HTTPS", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 ALB my-lb has HTTP listener but it redirects to HTTPS." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] 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 ae804911d2..260e6899b2 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 @@ -1,4 +1,3 @@ -from re import search from unittest import mock import botocore @@ -146,9 +145,9 @@ class Test_elbv2_waf_acl_attached: assert len(result) == 1 assert result[0].status == "FAIL" - assert search( - "is not protected by WAF Web ACL", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 ALB my-lb is not protected by WAF Web ACL." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"] @@ -233,9 +232,9 @@ class Test_elbv2_waf_acl_attached: assert len(result) == 1 assert result[0].status == "PASS" - assert search( - "is protected by WAFv2 Web ACL", - result[0].status_extended, + assert ( + result[0].status_extended + == "ELBv2 ALB my-lb is protected by WAFv2 Web ACL my-web-acl." ) assert result[0].resource_id == "my-lb" assert result[0].resource_arn == lb["LoadBalancerArn"]