Fix MA/MR pipeline for EC2 tests (#12672)

anisaoshafi · web-flow · commit a298730bc1aa · 2025-05-28T11:21:57.000+02:00
diff --git a/tests/aws/services/ec2/test_ec2.py b/tests/aws/services/ec2/test_ec2.py
@@ -11,7 +11,7 @@
     random_vpc_id,
 )
 
-from localstack.constants import TAG_KEY_CUSTOM_ID
+from localstack.constants import AWS_REGION_US_EAST_1, TAG_KEY_CUSTOM_ID
 from localstack.services.ec2.patches import SecurityGroupIdentifier, VpcIdentifier
 from localstack.testing.pytest import markers
 from localstack.utils.id_generator import localstack_id_manager
@@ -986,8 +986,11 @@ def test_raise_create_volume_without_size(snapshot, aws_client):
     ]
 )
 @markers.aws.validated
-def test_describe_availability_zones_filter_with_zone_names(snapshot, aws_client):
-    availability_zones = aws_client.ec2.describe_availability_zones(ZoneNames=["us-east-1a"])
+def test_describe_availability_zones_filter_with_zone_names(snapshot, aws_client_factory):
+    snapshot.add_transformer(snapshot.transform.regex(AWS_REGION_US_EAST_1, "<region>"))
+
+    ec2_client = aws_client_factory(region_name=AWS_REGION_US_EAST_1).ec2
+    availability_zones = ec2_client.describe_availability_zones(ZoneNames=["us-east-1a"])
     snapshot.match("availability_zones", availability_zones)
 
 
@@ -1001,8 +1004,11 @@ def test_describe_availability_zones_filter_with_zone_names(snapshot, aws_client
     ]
 )
 @markers.aws.validated
-def test_describe_availability_zones_filter_with_zone_ids(snapshot, aws_client):
-    availability_zones = aws_client.ec2.describe_availability_zones(ZoneIds=["use1-az1"])
+def test_describe_availability_zones_filter_with_zone_ids(snapshot, aws_client_factory):
+    snapshot.add_transformer(snapshot.transform.regex(AWS_REGION_US_EAST_1, "<region>"))
+
+    ec2_client = aws_client_factory(region_name=AWS_REGION_US_EAST_1).ec2
+    availability_zones = ec2_client.describe_availability_zones(ZoneIds=["use1-az1"])
     snapshot.match("availability_zones", availability_zones)
 
 
@@ -1016,8 +1022,11 @@ def test_describe_availability_zones_filter_with_zone_ids(snapshot, aws_client):
     ]
 )
 @markers.aws.validated
-def test_describe_availability_zones_filters(snapshot, aws_client):
-    availability_zones = aws_client.ec2.describe_availability_zones(
+def test_describe_availability_zones_filters(snapshot, aws_client_factory):
+    snapshot.add_transformer(snapshot.transform.regex(AWS_REGION_US_EAST_1, "<region>"))
+
+    ec2_client = aws_client_factory(region_name=AWS_REGION_US_EAST_1).ec2
+    availability_zones = ec2_client.describe_availability_zones(
         Filters=[{"Name": "zone-name", "Values": ["us-east-1a"]}]
     )
     snapshot.match("availability_zones", availability_zones)
diff --git a/tests/aws/services/ec2/test_ec2.snapshot.json b/tests/aws/services/ec2/test_ec2.snapshot.json
@@ -421,7 +421,7 @@
     }
   },
   "tests/aws/services/ec2/test_ec2.py::test_describe_availability_zones_filter_with_zone_names": {
-    "recorded-date": "26-05-2025, 13:36:03",
+    "recorded-date": "28-05-2025, 09:16:53",
     "recorded-content": {
       "availability_zones": {
         "AvailabilityZones": [
@@ -446,7 +446,7 @@
     }
   },
   "tests/aws/services/ec2/test_ec2.py::test_describe_availability_zones_filter_with_zone_ids": {
-    "recorded-date": "26-05-2025, 13:34:49",
+    "recorded-date": "28-05-2025, 09:17:24",
     "recorded-content": {
       "availability_zones": {
         "AvailabilityZones": [
@@ -471,7 +471,7 @@
     }
   },
   "tests/aws/services/ec2/test_ec2.py::test_describe_availability_zones_filters": {
-    "recorded-date": "26-05-2025, 13:48:29",
+    "recorded-date": "28-05-2025, 09:17:47",
     "recorded-content": {
       "availability_zones": {
         "AvailabilityZones": [
diff --git a/tests/aws/services/ec2/test_ec2.validation.json b/tests/aws/services/ec2/test_ec2.validation.json
@@ -18,13 +18,13 @@
     "last_validated_date": "2024-06-07T21:28:25+00:00"
   },
   "tests/aws/services/ec2/test_ec2.py::test_describe_availability_zones_filter_with_zone_ids": {
-    "last_validated_date": "2025-05-26T13:34:49+00:00"
+    "last_validated_date": "2025-05-28T09:17:24+00:00"
   },
   "tests/aws/services/ec2/test_ec2.py::test_describe_availability_zones_filter_with_zone_names": {
-    "last_validated_date": "2025-05-26T13:36:03+00:00"
+    "last_validated_date": "2025-05-28T09:16:53+00:00"
   },
   "tests/aws/services/ec2/test_ec2.py::test_describe_availability_zones_filters": {
-    "last_validated_date": "2025-05-26T13:48:29+00:00"
+    "last_validated_date": "2025-05-28T09:17:56+00:00"
   },
   "tests/aws/services/ec2/test_ec2.py::test_raise_create_volume_without_size": {
     "last_validated_date": "2025-02-04T12:53:29+00:00"

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`random_vpc_id,`
`12`	`12`	`)`
`13`	`13`
`14`		`-from localstack.constants import TAG_KEY_CUSTOM_ID`
	`14`	`+from localstack.constants import AWS_REGION_US_EAST_1, TAG_KEY_CUSTOM_ID`
`15`	`15`	`from localstack.services.ec2.patches import SecurityGroupIdentifier, VpcIdentifier`
`16`	`16`	`from localstack.testing.pytest import markers`
`17`	`17`	`from localstack.utils.id_generator import localstack_id_manager`
`@@ -986,8 +986,11 @@ def test_raise_create_volume_without_size(snapshot, aws_client):`
`986`	`986`	`]`
`987`	`987`	`)`
`988`	`988`	`@markers.aws.validated`
`989`		`-def test_describe_availability_zones_filter_with_zone_names(snapshot, aws_client):`
`990`		`- availability_zones = aws_client.ec2.describe_availability_zones(ZoneNames=["us-east-1a"])`
	`989`	`+def test_describe_availability_zones_filter_with_zone_names(snapshot, aws_client_factory):`
	`990`	`+ snapshot.add_transformer(snapshot.transform.regex(AWS_REGION_US_EAST_1, "<region>"))`
	`991`	`+`
	`992`	`+ ec2_client = aws_client_factory(region_name=AWS_REGION_US_EAST_1).ec2`
	`993`	`+ availability_zones = ec2_client.describe_availability_zones(ZoneNames=["us-east-1a"])`
`991`	`994`	`snapshot.match("availability_zones", availability_zones)`
`992`	`995`
`993`	`996`
`@@ -1001,8 +1004,11 @@ def test_describe_availability_zones_filter_with_zone_names(snapshot, aws_client`
`1001`	`1004`	`]`
`1002`	`1005`	`)`
`1003`	`1006`	`@markers.aws.validated`
`1004`		`-def test_describe_availability_zones_filter_with_zone_ids(snapshot, aws_client):`
`1005`		`- availability_zones = aws_client.ec2.describe_availability_zones(ZoneIds=["use1-az1"])`
	`1007`	`+def test_describe_availability_zones_filter_with_zone_ids(snapshot, aws_client_factory):`
	`1008`	`+ snapshot.add_transformer(snapshot.transform.regex(AWS_REGION_US_EAST_1, "<region>"))`
	`1009`	`+`
	`1010`	`+ ec2_client = aws_client_factory(region_name=AWS_REGION_US_EAST_1).ec2`
	`1011`	`+ availability_zones = ec2_client.describe_availability_zones(ZoneIds=["use1-az1"])`
`1006`	`1012`	`snapshot.match("availability_zones", availability_zones)`
`1007`	`1013`
`1008`	`1014`
`@@ -1016,8 +1022,11 @@ def test_describe_availability_zones_filter_with_zone_ids(snapshot, aws_client):`
`1016`	`1022`	`]`
`1017`	`1023`	`)`
`1018`	`1024`	`@markers.aws.validated`
`1019`		`-def test_describe_availability_zones_filters(snapshot, aws_client):`
`1020`		`- availability_zones = aws_client.ec2.describe_availability_zones(`
	`1025`	`+def test_describe_availability_zones_filters(snapshot, aws_client_factory):`
	`1026`	`+ snapshot.add_transformer(snapshot.transform.regex(AWS_REGION_US_EAST_1, "<region>"))`
	`1027`	`+`
	`1028`	`+ ec2_client = aws_client_factory(region_name=AWS_REGION_US_EAST_1).ec2`
	`1029`	`+ availability_zones = ec2_client.describe_availability_zones(`
`1021`	`1030`	`Filters=[{"Name": "zone-name", "Values": ["us-east-1a"]}]`
`1022`	`1031`	`)`
`1023`	`1032`	`snapshot.match("availability_zones", availability_zones)`