From 6f33e1cc07e83d9128f06f6265fe6f65f1a5abb9 Mon Sep 17 00:00:00 2001 From: Pepe Fagoaga Date: Tue, 5 Mar 2024 15:40:35 +0100 Subject: [PATCH] tests: fix ebs --- .../ec2_ebs_default_encryption_test.py | 56 ++++++++++++------- 1 file changed, 36 insertions(+), 20 deletions(-) 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 ad516ff576..fb258c2922 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 @@ -50,6 +50,17 @@ def test_ec2_ebs_encryption_enabled(self): result.status_extended == "EBS Default Encryption is activated." ) assert result.resource_id == AWS_ACCOUNT_NUMBER + assert ( + result.resource_arn + == f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:volume" + ) + if result.region == AWS_REGION_EU_WEST_1: + assert result.status == "FAIL" + assert ( + result.status_extended + == "EBS Default Encryption is not activated." + ) + assert result.resource_id == AWS_ACCOUNT_NUMBER assert ( result.resource_arn == f"arn:aws:ec2:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:volume" @@ -76,28 +87,33 @@ def test_ec2_ebs_encryption_disabled(self): ) check = ec2_ebs_default_encryption() - result = check.execute() + results = check.execute() # One result per region - assert len(result) == 2 - assert result[0].status == "FAIL" - assert ( - result[0].status_extended == "EBS Default Encryption is not activated." - ) - assert result[0].resource_id == AWS_ACCOUNT_NUMBER - assert ( - result[0].resource_arn - == f"arn:aws:ec2:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:volume" - ) - assert result[1].status == "FAIL" - assert ( - result[1].status_extended == "EBS Default Encryption is not activated." - ) - assert result[1].resource_id == AWS_ACCOUNT_NUMBER - assert ( - result[1].resource_arn - == f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:volume" - ) + assert len(results) == 2 + for result in results: + if result.region == AWS_REGION_US_EAST_1: + assert result.status == "FAIL" + assert ( + result.status_extended + == "EBS Default Encryption is not activated." + ) + assert result.resource_id == AWS_ACCOUNT_NUMBER + assert ( + result.resource_arn + == f"arn:aws:ec2:{AWS_REGION_US_EAST_1}:{AWS_ACCOUNT_NUMBER}:volume" + ) + if result.region == AWS_REGION_EU_WEST_1: + assert result.status == "FAIL" + assert ( + result.status_extended + == "EBS Default Encryption is not activated." + ) + assert result.resource_id == AWS_ACCOUNT_NUMBER + assert ( + result.resource_arn + == f"arn:aws:ec2:{AWS_REGION_EU_WEST_1}:{AWS_ACCOUNT_NUMBER}:volume" + ) @mock_aws def test_ec2_ebs_encryption_disabled_ignored(self):