From a5ce64cf1912b0a49d59601f073dd9629367b960 Mon Sep 17 00:00:00 2001
From: Maximilian Hoheiser <max.hoheiser@gmail.com>
Date: Mon, 22 Apr 2024 15:20:22 +0200
Subject: [PATCH] feat: test limit listing to context of test

---
 tests/aws/services/events/test_events.py      |  47 +++---
 .../services/events/test_events.snapshot.json | 144 +++++++-----------
 .../events/test_events.validation.json        |  44 +++---
 3 files changed, 103 insertions(+), 132 deletions(-)

diff --git a/tests/aws/services/events/test_events.py b/tests/aws/services/events/test_events.py
index 302ec49cfc51d..b3f6263049db7 100644
--- a/tests/aws/services/events/test_events.py
+++ b/tests/aws/services/events/test_events.py
@@ -725,7 +725,7 @@ def test_create_list_describe_delete_custom_event_buses(
             response = events.create_event_bus(Name=bus_name)
             snapshot.match(f"create-custom-event-bus-{region}", response)
 
-            response = events.list_event_buses()
+            response = events.list_event_buses(NamePrefix=bus_name)
             snapshot.match(f"list-event-buses-after-create-{region}", response)
 
             response = events.describe_event_bus(Name=bus_name)
@@ -738,7 +738,7 @@ def test_create_list_describe_delete_custom_event_buses(
             response = events.delete_event_bus(Name=bus_name)
             snapshot.match(f"delete-custom-event-bus-{region}", response)
 
-            response = events.list_event_buses()
+            response = events.list_event_buses(NamePrefix=bus_name)
             snapshot.match(f"list-event-buses-after-delete-{region}", response)
 
     @markers.aws.validated
@@ -772,7 +772,7 @@ def test_delete_default_event_bus(self, aws_client, snapshot):
     @markers.aws.validated
     def test_list_event_buses_with_prefix(self, create_event_bus, aws_client, snapshot):
         events = aws_client.events
-        bus_name = f"test-bus-{short_uid()}"
+        bus_name = f"unique-prefix-1234567890-{short_uid()}"
         snapshot.add_transformer(snapshot.transform.regex(bus_name, "<bus-name>"))
 
         bus_name_not_match = "no-prefix-match"
@@ -803,11 +803,11 @@ def test_list_event_buses_with_limit(self, create_event_bus, aws_client, snapsho
             bus_name = f"{bus_name_prefix}-{i}"
             create_event_bus(Name=bus_name)
 
-        response = events.list_event_buses(Limit=int(count / 2))
+        response = events.list_event_buses(Limit=int(count / 2), NamePrefix=bus_name_prefix)
         snapshot.match("list-event-buses-limit", response)
 
         response = events.list_event_buses(
-            Limit=int(count / 2) + 2, NextToken=response["NextToken"]
+            Limit=int(count / 2) + 2, NextToken=response["NextToken"], NamePrefix=bus_name_prefix
         )
         snapshot.match("list-event-buses-limit-next-token", response)
 
@@ -883,6 +883,7 @@ def test_put_events_into_event_bus(
 
     @markers.aws.validated
     @pytest.mark.skipif(is_v2_provider(), reason="V2 provider does not support this feature yet")
+    # TODO simplify and use sqs as target
     def test_put_events_to_default_eventbus_for_custom_eventbus(
         self,
         events_create_event_bus,
@@ -1035,8 +1036,6 @@ def test_put_events_nonexistent_event_bus(
                 snapshot.transform.regex(nonexistent_event_bus, "<custom-event-bus>"),
             ]
         )
-        # create SQS queue + add rules & targets so that we can check the default event bus received the message
-        # even if one entry was wrong
 
         queue_url = sqs_create_queue()
         queue_arn = sqs_get_queue_arn(queue_url)
@@ -1059,8 +1058,6 @@ def test_put_events_nonexistent_event_bus(
             Targets=[{"Id": default_bus_target_id, "Arn": queue_arn}],
         )
 
-        # create two entries, one with no EventBus specified (so it will target the default one)
-        # and one with a nonexistent EventBusName, which should be ignored
         entries = [
             {
                 "Source": "MySource",
@@ -1068,7 +1065,7 @@ def test_put_events_nonexistent_event_bus(
                 "Detail": json.dumps({"message": "for the default event bus"}),
             },
             {
-                "EventBusName": nonexistent_event_bus,
+                "EventBusName": nonexistent_event_bus,  # nonexistent EventBusName, message should be ignored
                 "Source": "MySource",
                 "DetailType": "CustomType",
                 "Detail": json.dumps({"message": "for the custom event bus"}),
@@ -1077,7 +1074,7 @@ def test_put_events_nonexistent_event_bus(
         response = aws_client.events.put_events(Entries=entries)
         snapshot.match("put-events", response)
 
-        def _get_sqs_messages():
+        def _get_sqs_messages():  # TODO cleanup use exiting fixture
             resp = aws_client.sqs.receive_message(
                 QueueUrl=queue_url, VisibilityTimeout=0, WaitTimeSeconds=1
             )
@@ -1091,7 +1088,6 @@ def _get_sqs_messages():
         messages = retry(_get_sqs_messages, retries=10, sleep=0.1)
         snapshot.match("get-events", messages)
 
-        # try to get the custom EventBus we passed the Event to
         with pytest.raises(ClientError) as e:
             aws_client.events.describe_event_bus(Name=nonexistent_event_bus)
         snapshot.match("non-existent-bus-error", e.value.response)
@@ -1131,12 +1127,19 @@ def test_put_list_with_prefix_describe_delete_rule(
         snapshot.match("list-rules-after-delete", response)
 
     @markers.aws.validated
-    def test_put_multiple_rules_with_same_name(self, put_rule, aws_client, snapshot):
+    def test_put_multiple_rules_with_same_name(
+        self, create_event_bus, put_rule, aws_client, snapshot
+    ):
+        event_bus_name = f"bus-{short_uid()}"
+        create_event_bus(Name=event_bus_name)
+        snapshot.add_transformer(snapshot.transform.regex(event_bus_name, "<bus-name>"))
+
         rule_name = f"test-rule-{short_uid()}"
         snapshot.add_transformer(snapshot.transform.regex(rule_name, "<rule-name>"))
 
         response = put_rule(
             Name=rule_name,
+            EventBusName=event_bus_name,
             EventPattern=json.dumps(TEST_EVENT_PATTERN),
         )
         snapshot.match("put-rule", response)
@@ -1144,31 +1147,39 @@ def test_put_multiple_rules_with_same_name(self, put_rule, aws_client, snapshot)
         # put_rule updates the rule if it already exists
         response = put_rule(
             Name=rule_name,
+            EventBusName=event_bus_name,
             EventPattern=json.dumps(TEST_EVENT_PATTERN),
         )
         snapshot.match("re-put-rule", response)
 
-        response = aws_client.events.list_rules(NamePrefix=rule_name)
+        response = aws_client.events.list_rules(EventBusName=event_bus_name)
         snapshot.match("list-rules", response)
 
     @markers.aws.validated
-    def test_list_rule_with_limit(self, put_rule, aws_client, snapshot):
+    def test_list_rule_with_limit(self, create_event_bus, put_rule, aws_client, snapshot):
         snapshot.add_transformer(snapshot.transform.jsonpath("$..NextToken", "next_token"))
-        rule_name_prefix = "test-rule"
+
+        event_bus_name = f"bus-{short_uid()}"
+        create_event_bus(Name=event_bus_name)
+        snapshot.add_transformer(snapshot.transform.regex(event_bus_name, "<bus-name>"))
+
+        rule_name_prefix = f"test-rule-{short_uid()}"
+        snapshot.add_transformer(snapshot.transform.regex(rule_name_prefix, "<rule-name-prefix>"))
         count = 6
 
         for i in range(count):
             rule_name = f"{rule_name_prefix}-{i}"
             put_rule(
                 Name=rule_name,
+                EventBusName=event_bus_name,
                 EventPattern=json.dumps(TEST_EVENT_PATTERN),
             )
 
-        response = aws_client.events.list_rules(Limit=int(count / 2))
+        response = aws_client.events.list_rules(Limit=int(count / 2), EventBusName=event_bus_name)
         snapshot.match("list-rules-limit", response)
 
         response = aws_client.events.list_rules(
-            Limit=int(count / 2) + 2, NextToken=response["NextToken"]
+            Limit=int(count / 2) + 2, NextToken=response["NextToken"], EventBusName=event_bus_name
         )
         snapshot.match("list-rules-limit-next-token", response)
 
diff --git a/tests/aws/services/events/test_events.snapshot.json b/tests/aws/services/events/test_events.snapshot.json
index 656d9fc442511..34c3a16c44ce0 100644
--- a/tests/aws/services/events/test_events.snapshot.json
+++ b/tests/aws/services/events/test_events.snapshot.json
@@ -105,7 +105,7 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_put_list_with_prefix_describe_delete_rule[custom]": {
-    "recorded-date": "08-04-2024, 16:36:38",
+    "recorded-date": "22-04-2024, 13:07:35",
     "recorded-content": {
       "put-rule": {
         "RuleArn": "arn:aws:events:<region>:111111111111:rule/<bus-name>/<rule-name>",
@@ -181,7 +181,7 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_put_list_with_prefix_describe_delete_rule[default]": {
-    "recorded-date": "08-04-2024, 16:36:39",
+    "recorded-date": "22-04-2024, 13:07:36",
     "recorded-content": {
       "put-rule": {
         "RuleArn": "arn:aws:events:<region>:111111111111:rule/<rule-name>",
@@ -257,17 +257,17 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_put_multiple_rules_with_same_name": {
-    "recorded-date": "08-04-2024, 17:27:57",
+    "recorded-date": "22-04-2024, 13:07:38",
     "recorded-content": {
       "put-rule": {
-        "RuleArn": "arn:aws:events:<region>:111111111111:rule/<rule-name>",
+        "RuleArn": "arn:aws:events:<region>:111111111111:rule/<bus-name>/<rule-name>",
         "ResponseMetadata": {
           "HTTPHeaders": {},
           "HTTPStatusCode": 200
         }
       },
       "re-put-rule": {
-        "RuleArn": "arn:aws:events:<region>:111111111111:rule/<rule-name>",
+        "RuleArn": "arn:aws:events:<region>:111111111111:rule/<bus-name>/<rule-name>",
         "ResponseMetadata": {
           "HTTPHeaders": {},
           "HTTPStatusCode": 200
@@ -276,8 +276,8 @@
       "list-rules": {
         "Rules": [
           {
-            "Arn": "arn:aws:events:<region>:111111111111:rule/<rule-name>",
-            "EventBusName": "default",
+            "Arn": "arn:aws:events:<region>:111111111111:rule/<bus-name>/<rule-name>",
+            "EventBusName": "<bus-name>",
             "EventPattern": {
               "source": [
                 "core.update-account-command"
@@ -303,14 +303,14 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_list_rule_with_limit": {
-    "recorded-date": "08-04-2024, 17:29:40",
+    "recorded-date": "22-04-2024, 13:07:40",
     "recorded-content": {
       "list-rules-limit": {
         "NextToken": "<next_token:1>",
         "Rules": [
           {
-            "Arn": "arn:aws:events:<region>:111111111111:rule/test-rule-0",
-            "EventBusName": "default",
+            "Arn": "arn:aws:events:<region>:111111111111:rule/<bus-name>/<rule-name-prefix>-0",
+            "EventBusName": "<bus-name>",
             "EventPattern": {
               "source": [
                 "core.update-account-command"
@@ -324,12 +324,12 @@
                 ]
               }
             },
-            "Name": "test-rule-0",
+            "Name": "<rule-name-prefix>-0",
             "State": "ENABLED"
           },
           {
-            "Arn": "arn:aws:events:<region>:111111111111:rule/test-rule-1",
-            "EventBusName": "default",
+            "Arn": "arn:aws:events:<region>:111111111111:rule/<bus-name>/<rule-name-prefix>-1",
+            "EventBusName": "<bus-name>",
             "EventPattern": {
               "source": [
                 "core.update-account-command"
@@ -343,12 +343,12 @@
                 ]
               }
             },
-            "Name": "test-rule-1",
+            "Name": "<rule-name-prefix>-1",
             "State": "ENABLED"
           },
           {
-            "Arn": "arn:aws:events:<region>:111111111111:rule/test-rule-2",
-            "EventBusName": "default",
+            "Arn": "arn:aws:events:<region>:111111111111:rule/<bus-name>/<rule-name-prefix>-2",
+            "EventBusName": "<bus-name>",
             "EventPattern": {
               "source": [
                 "core.update-account-command"
@@ -362,7 +362,7 @@
                 ]
               }
             },
-            "Name": "test-rule-2",
+            "Name": "<rule-name-prefix>-2",
             "State": "ENABLED"
           }
         ],
@@ -374,8 +374,8 @@
       "list-rules-limit-next-token": {
         "Rules": [
           {
-            "Arn": "arn:aws:events:<region>:111111111111:rule/test-rule-3",
-            "EventBusName": "default",
+            "Arn": "arn:aws:events:<region>:111111111111:rule/<bus-name>/<rule-name-prefix>-3",
+            "EventBusName": "<bus-name>",
             "EventPattern": {
               "source": [
                 "core.update-account-command"
@@ -389,12 +389,12 @@
                 ]
               }
             },
-            "Name": "test-rule-3",
+            "Name": "<rule-name-prefix>-3",
             "State": "ENABLED"
           },
           {
-            "Arn": "arn:aws:events:<region>:111111111111:rule/test-rule-4",
-            "EventBusName": "default",
+            "Arn": "arn:aws:events:<region>:111111111111:rule/<bus-name>/<rule-name-prefix>-4",
+            "EventBusName": "<bus-name>",
             "EventPattern": {
               "source": [
                 "core.update-account-command"
@@ -408,12 +408,12 @@
                 ]
               }
             },
-            "Name": "test-rule-4",
+            "Name": "<rule-name-prefix>-4",
             "State": "ENABLED"
           },
           {
-            "Arn": "arn:aws:events:<region>:111111111111:rule/test-rule-5",
-            "EventBusName": "default",
+            "Arn": "arn:aws:events:<region>:111111111111:rule/<bus-name>/<rule-name-prefix>-5",
+            "EventBusName": "<bus-name>",
             "EventPattern": {
               "source": [
                 "core.update-account-command"
@@ -427,7 +427,7 @@
                 ]
               }
             },
-            "Name": "test-rule-5",
+            "Name": "<rule-name-prefix>-5",
             "State": "ENABLED"
           }
         ],
@@ -439,13 +439,13 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_describe_nonexistent_rule": {
-    "recorded-date": "16-04-2024, 15:12:50",
+    "recorded-date": "22-04-2024, 13:07:42",
     "recorded-content": {
       "describe-not-existing-rule-error": "<ExceptionInfo ResourceNotFoundException('An error occurred (ResourceNotFoundException) when calling the DescribeRule operation: Rule <rule-name> does not exist on EventBus default.') tblen=3>"
     }
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_disable_re_enable_rule[custom]": {
-    "recorded-date": "08-04-2024, 17:37:18",
+    "recorded-date": "22-04-2024, 13:07:43",
     "recorded-content": {
       "disable-rule": {
         "ResponseMetadata": {
@@ -510,7 +510,7 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_disable_re_enable_rule[default]": {
-    "recorded-date": "08-04-2024, 17:37:19",
+    "recorded-date": "22-04-2024, 13:07:45",
     "recorded-content": {
       "disable-rule": {
         "ResponseMetadata": {
@@ -575,7 +575,7 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventTarget::test_put_list_remove_target[custom]": {
-    "recorded-date": "09-04-2024, 16:21:04",
+    "recorded-date": "22-04-2024, 13:07:17",
     "recorded-content": {
       "put-target": {
         "FailedEntries": [],
@@ -615,7 +615,7 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventTarget::test_put_list_remove_target[default]": {
-    "recorded-date": "09-04-2024, 16:21:05",
+    "recorded-date": "22-04-2024, 13:07:18",
     "recorded-content": {
       "put-target": {
         "FailedEntries": [],
@@ -655,13 +655,13 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventTarget::test_add_exceed_fife_targets_per_rule": {
-    "recorded-date": "16-04-2024, 15:14:29",
+    "recorded-date": "22-04-2024, 13:07:20",
     "recorded-content": {
       "put-targets-client-error": "<ExceptionInfo LimitExceededException('An error occurred (LimitExceededException) when calling the PutTargets operation: The requested resource exceeds the maximum number allowed.') tblen=3>"
     }
   },
   "tests/aws/services/events/test_events.py::TestEventTarget::test_list_target_by_rule_limit": {
-    "recorded-date": "10-04-2024, 11:34:18",
+    "recorded-date": "22-04-2024, 13:07:22",
     "recorded-content": {
       "list-targets-limit": {
         "NextToken": "<next_token:1>",
@@ -703,7 +703,7 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_delete_rule_with_targets": {
-    "recorded-date": "16-04-2024, 15:13:31",
+    "recorded-date": "22-04-2024, 13:07:46",
     "recorded-content": {
       "delete-rule-with-targets-error": "<ExceptionInfo ClientError(\"An error occurred (ValidationException) when calling the DeleteRule operation: Rule can't be deleted since it has targets.\") tblen=3>"
     }
@@ -715,7 +715,7 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_update_rule_with_targets": {
-    "recorded-date": "17-04-2024, 10:42:59",
+    "recorded-date": "22-04-2024, 13:07:48",
     "recorded-content": {
       "list-targets": {
         "Targets": [
@@ -751,7 +751,7 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_create_list_describe_delete_custom_event_buses[regions0]": {
-    "recorded-date": "17-04-2024, 17:42:11",
+    "recorded-date": "22-04-2024, 13:11:07",
     "recorded-content": {
       "create-custom-event-bus-us-east-1": {
         "EventBusArn": "arn:aws:events:<region>:111111111111:event-bus/<bus-name>",
@@ -762,10 +762,6 @@
       },
       "list-event-buses-after-create-us-east-1": {
         "EventBuses": [
-          {
-            "Arn": "arn:aws:events:<region>:111111111111:event-bus/default",
-            "Name": "default"
-          },
           {
             "Arn": "arn:aws:events:<region>:111111111111:event-bus/<bus-name>",
             "Name": "<bus-name>"
@@ -791,12 +787,7 @@
         }
       },
       "list-event-buses-after-delete-us-east-1": {
-        "EventBuses": [
-          {
-            "Arn": "arn:aws:events:<region>:111111111111:event-bus/default",
-            "Name": "default"
-          }
-        ],
+        "EventBuses": [],
         "ResponseMetadata": {
           "HTTPHeaders": {},
           "HTTPStatusCode": 200
@@ -805,7 +796,7 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_create_list_describe_delete_custom_event_buses[regions1]": {
-    "recorded-date": "17-04-2024, 17:42:13",
+    "recorded-date": "22-04-2024, 13:11:10",
     "recorded-content": {
       "create-custom-event-bus-us-east-1": {
         "EventBusArn": "arn:aws:events:<region>:111111111111:event-bus/<bus-name>",
@@ -816,10 +807,6 @@
       },
       "list-event-buses-after-create-us-east-1": {
         "EventBuses": [
-          {
-            "Arn": "arn:aws:events:<region>:111111111111:event-bus/default",
-            "Name": "default"
-          },
           {
             "Arn": "arn:aws:events:<region>:111111111111:event-bus/<bus-name>",
             "Name": "<bus-name>"
@@ -847,10 +834,6 @@
       },
       "list-event-buses-after-create-us-west-1": {
         "EventBuses": [
-          {
-            "Arn": "arn:aws:events:us-west-1:111111111111:event-bus/default",
-            "Name": "default"
-          },
           {
             "Arn": "arn:aws:events:us-west-1:111111111111:event-bus/<bus-name>",
             "Name": "<bus-name>"
@@ -878,10 +861,6 @@
       },
       "list-event-buses-after-create-eu-central-1": {
         "EventBuses": [
-          {
-            "Arn": "arn:aws:events:eu-central-1:111111111111:event-bus/default",
-            "Name": "default"
-          },
           {
             "Arn": "arn:aws:events:eu-central-1:111111111111:event-bus/<bus-name>",
             "Name": "<bus-name>"
@@ -907,12 +886,7 @@
         }
       },
       "list-event-buses-after-delete-us-east-1": {
-        "EventBuses": [
-          {
-            "Arn": "arn:aws:events:<region>:111111111111:event-bus/default",
-            "Name": "default"
-          }
-        ],
+        "EventBuses": [],
         "ResponseMetadata": {
           "HTTPHeaders": {},
           "HTTPStatusCode": 200
@@ -925,12 +899,7 @@
         }
       },
       "list-event-buses-after-delete-us-west-1": {
-        "EventBuses": [
-          {
-            "Arn": "arn:aws:events:us-west-1:111111111111:event-bus/default",
-            "Name": "default"
-          }
-        ],
+        "EventBuses": [],
         "ResponseMetadata": {
           "HTTPHeaders": {},
           "HTTPStatusCode": 200
@@ -943,12 +912,7 @@
         }
       },
       "list-event-buses-after-delete-eu-central-1": {
-        "EventBuses": [
-          {
-            "Arn": "arn:aws:events:eu-central-1:111111111111:event-bus/default",
-            "Name": "default"
-          }
-        ],
+        "EventBuses": [],
         "ResponseMetadata": {
           "HTTPHeaders": {},
           "HTTPStatusCode": 200
@@ -957,26 +921,26 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_create_multiple_event_buses_same_name": {
-    "recorded-date": "17-04-2024, 17:42:13",
+    "recorded-date": "22-04-2024, 13:11:10",
     "recorded-content": {
       "create-multiple-event-buses-same-name": "<ExceptionInfo ResourceAlreadyExistsException('An error occurred (ResourceAlreadyExistsException) when calling the CreateEventBus operation: Event bus <bus-name> already exists.') tblen=4>"
     }
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_describe_delete_not_existing_event_bus": {
-    "recorded-date": "17-04-2024, 17:42:15",
+    "recorded-date": "22-04-2024, 13:11:12",
     "recorded-content": {
       "describe-not-existing-event-bus-error": "<ExceptionInfo ResourceNotFoundException('An error occurred (ResourceNotFoundException) when calling the DescribeEventBus operation: Event bus <bus-name> does not exist.') tblen=3>",
       "delete-not-existing-event-bus": "<ExceptionInfo ResourceNotFoundException('An error occurred (ResourceNotFoundException) when calling the DescribeEventBus operation: Event bus <bus-name> does not exist.') tblen=3>"
     }
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_delete_default_event_bus": {
-    "recorded-date": "17-04-2024, 17:42:15",
+    "recorded-date": "22-04-2024, 13:11:12",
     "recorded-content": {
       "delete-default-event-bus-error": "<ExceptionInfo ClientError('An error occurred (ValidationException) when calling the DeleteEventBus operation: Cannot delete event bus default.') tblen=3>"
     }
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_list_event_buses_with_prefix": {
-    "recorded-date": "17-04-2024, 17:42:16",
+    "recorded-date": "22-04-2024, 13:19:19",
     "recorded-content": {
       "list-event-buses-prefix-complete-name": {
         "EventBuses": [
@@ -1005,14 +969,10 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_list_event_buses_with_limit": {
-    "recorded-date": "17-04-2024, 17:42:18",
+    "recorded-date": "22-04-2024, 13:11:15",
     "recorded-content": {
       "list-event-buses-limit": {
         "EventBuses": [
-          {
-            "Arn": "arn:aws:events:<region>:111111111111:event-bus/default",
-            "Name": "default"
-          },
           {
             "Arn": "arn:aws:events:<region>:111111111111:event-bus/<bus-name-prefix>-0",
             "Name": "<bus-name-prefix>-0"
@@ -1020,6 +980,10 @@
           {
             "Arn": "arn:aws:events:<region>:111111111111:event-bus/<bus-name-prefix>-1",
             "Name": "<bus-name-prefix>-1"
+          },
+          {
+            "Arn": "arn:aws:events:<region>:111111111111:event-bus/<bus-name-prefix>-2",
+            "Name": "<bus-name-prefix>-2"
           }
         ],
         "NextToken": "<next_token:1>",
@@ -1030,10 +994,6 @@
       },
       "list-event-buses-limit-next-token": {
         "EventBuses": [
-          {
-            "Arn": "arn:aws:events:<region>:111111111111:event-bus/<bus-name-prefix>-2",
-            "Name": "<bus-name-prefix>-2"
-          },
           {
             "Arn": "arn:aws:events:<region>:111111111111:event-bus/<bus-name-prefix>-3",
             "Name": "<bus-name-prefix>-3"
@@ -1055,7 +1015,7 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_put_events_to_default_eventbus_for_custom_eventbus": {
-    "recorded-date": "17-04-2024, 17:42:46",
+    "recorded-date": "22-04-2024, 13:11:43",
     "recorded-content": {
       "create-custom-event-bus": {
         "EventBusArn": "arn:aws:events:<region>:111111111111:event-bus/<resource:1>",
@@ -1134,7 +1094,7 @@
     }
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_put_events_nonexistent_event_bus": {
-    "recorded-date": "17-04-2024, 17:50:27",
+    "recorded-date": "22-04-2024, 13:12:23",
     "recorded-content": {
       "put-events": {
         "Entries": [
diff --git a/tests/aws/services/events/test_events.validation.json b/tests/aws/services/events/test_events.validation.json
index 14ae28f57e04a..d80e212942113 100644
--- a/tests/aws/services/events/test_events.validation.json
+++ b/tests/aws/services/events/test_events.validation.json
@@ -1,54 +1,54 @@
 {
   "tests/aws/services/events/test_events.py::TestEventBus::test_create_list_describe_delete_custom_event_buses[regions0]": {
-    "last_validated_date": "2024-04-17T17:42:11+00:00"
+    "last_validated_date": "2024-04-22T13:11:07+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_create_list_describe_delete_custom_event_buses[regions1]": {
-    "last_validated_date": "2024-04-17T17:42:13+00:00"
+    "last_validated_date": "2024-04-22T13:11:10+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_create_multiple_event_buses_same_name": {
-    "last_validated_date": "2024-04-17T17:42:13+00:00"
+    "last_validated_date": "2024-04-22T13:11:10+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_delete_default_event_bus": {
-    "last_validated_date": "2024-04-17T17:42:15+00:00"
+    "last_validated_date": "2024-04-22T13:11:12+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_describe_delete_not_existing_event_bus": {
-    "last_validated_date": "2024-04-17T17:42:15+00:00"
+    "last_validated_date": "2024-04-22T13:11:12+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_list_event_buses_with_limit": {
-    "last_validated_date": "2024-04-17T17:42:18+00:00"
+    "last_validated_date": "2024-04-22T13:11:15+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_list_event_buses_with_prefix": {
-    "last_validated_date": "2024-04-17T17:42:16+00:00"
+    "last_validated_date": "2024-04-22T13:19:19+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_put_events_nonexistent_event_bus": {
-    "last_validated_date": "2024-04-17T17:50:27+00:00"
+    "last_validated_date": "2024-04-22T13:12:23+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventBus::test_put_events_to_default_eventbus_for_custom_eventbus": {
-    "last_validated_date": "2024-04-17T17:42:46+00:00"
+    "last_validated_date": "2024-04-22T13:11:43+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_delete_rule_with_targets": {
-    "last_validated_date": "2024-04-16T15:13:31+00:00"
+    "last_validated_date": "2024-04-22T13:07:46+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_describe_nonexistent_rule": {
-    "last_validated_date": "2024-04-16T15:12:50+00:00"
+    "last_validated_date": "2024-04-22T13:07:42+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_disable_re_enable_rule[custom]": {
-    "last_validated_date": "2024-04-08T17:37:18+00:00"
+    "last_validated_date": "2024-04-22T13:07:43+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_disable_re_enable_rule[default]": {
-    "last_validated_date": "2024-04-08T17:37:19+00:00"
+    "last_validated_date": "2024-04-22T13:07:45+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_list_rule_with_limit": {
-    "last_validated_date": "2024-04-08T17:29:40+00:00"
+    "last_validated_date": "2024-04-22T13:07:40+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_put_list_with_prefix_describe_delete_rule[custom]": {
-    "last_validated_date": "2024-04-08T16:36:38+00:00"
+    "last_validated_date": "2024-04-22T13:07:35+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_put_list_with_prefix_describe_delete_rule[default]": {
-    "last_validated_date": "2024-04-08T16:36:39+00:00"
+    "last_validated_date": "2024-04-22T13:07:36+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_put_multiple_rules_with_same_name": {
-    "last_validated_date": "2024-04-08T17:27:57+00:00"
+    "last_validated_date": "2024-04-22T13:07:38+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_put_rule[custom]": {
     "last_validated_date": "2024-04-04T10:47:20+00:00"
@@ -57,19 +57,19 @@
     "last_validated_date": "2024-04-04T10:47:21+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventRule::test_update_rule_with_targets": {
-    "last_validated_date": "2024-04-17T10:42:59+00:00"
+    "last_validated_date": "2024-04-22T13:07:48+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventTarget::test_add_exceed_fife_targets_per_rule": {
-    "last_validated_date": "2024-04-16T15:14:29+00:00"
+    "last_validated_date": "2024-04-22T13:07:20+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventTarget::test_list_target_by_rule_limit": {
-    "last_validated_date": "2024-04-10T11:34:18+00:00"
+    "last_validated_date": "2024-04-22T13:07:22+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventTarget::test_put_list_remove_target[custom]": {
-    "last_validated_date": "2024-04-09T16:21:04+00:00"
+    "last_validated_date": "2024-04-22T13:07:17+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEventTarget::test_put_list_remove_target[default]": {
-    "last_validated_date": "2024-04-09T16:21:05+00:00"
+    "last_validated_date": "2024-04-22T13:07:18+00:00"
   },
   "tests/aws/services/events/test_events.py::TestEvents::test_create_connection_validations": {
     "last_validated_date": "2024-03-26T14:07:16+00:00"