Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions engine/packages/api-peer/src/actors/list.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use anyhow::{Result, bail};
use rivet_api_builder::{ApiBadRequest, ApiCtx};
use rivet_api_builder::ApiCtx;
use rivet_api_types::{actors::list::*, pagination::Pagination};

#[utoipa::path(
Expand All @@ -20,17 +20,9 @@ pub async fn list(ctx: ApiCtx, _path: (), query: ListQuery) -> Result<ListRespon
.actor_ids
.map(|x| {
x.split(',')
.map(|s| {
s.trim().parse::<rivet_util::Id>().map_err(|e| {
ApiBadRequest {
reason: format!("invalid id in `actor_ids` query: {e}"),
}
.build()
})
})
.collect::<Result<Vec<_>>>()
.filter_map(|s| s.trim().parse::<rivet_util::Id>().ok())
.collect::<Vec<_>>()
})
.transpose()?
.unwrap_or_default(),
]
.concat();
Expand Down
14 changes: 3 additions & 11 deletions engine/packages/api-public/src/actors/list.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use anyhow::Result;
use axum::response::{IntoResponse, Response};
use rivet_api_builder::{
ApiBadRequest, ApiError,
ApiError,
extract::{Extension, Json, Query},
};
use rivet_api_types::{actors::list::*, pagination::Pagination};
Expand Down Expand Up @@ -63,17 +63,9 @@ async fn list_inner(ctx: ApiCtx, query: ListQuery) -> Result<ListResponse> {
.as_ref()
.map(|x| {
x.split(',')
.map(|s| {
s.trim().parse::<rivet_util::Id>().map_err(|e| {
ApiBadRequest {
reason: format!("invalid id in `actor_ids` query: {e}"),
}
.build()
})
})
.collect::<Result<Vec<_>>>()
.filter_map(|s| s.trim().parse::<rivet_util::Id>().ok())
.collect::<Vec<_>>()
})
.transpose()?
.unwrap_or_default(),
]
.concat();
Expand Down
1 change: 0 additions & 1 deletion engine/packages/engine/tests/envoy/api_actors_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,6 @@ fn list_default_limit_100() {
// Broken legacy Pegboard Runner coverage: full `runner::` sweep times out with
// `test timed out: Elapsed(())`.
#[test]
#[ignore = "API rejects mixed-validity actor_ids instead of filtering"]
fn list_with_invalid_actor_id_format_in_comma_list() {
common::run(common::TestOpts::new(1).with_timeout(30), |ctx| async move {
let (namespace, _, _runner) =
Expand Down
Loading