diff --git a/packages/common/api-util/src/lib.rs b/packages/common/api-util/src/lib.rs index dc598723dc..2c620cc4d5 100644 --- a/packages/common/api-util/src/lib.rs +++ b/packages/common/api-util/src/lib.rs @@ -10,13 +10,12 @@ mod errors; pub use axum::http::{HeaderMap, Method}; /// Generic function to make raw requests to remote datacenters by label (returns axum Response) -#[tracing::instrument(skip(ctx, headers, query, body))] +#[tracing::instrument(skip(ctx, query, body))] pub async fn request_remote_datacenter_raw( ctx: &ApiCtx, dc_label: u16, endpoint: &str, method: Method, - headers: HeaderMap, query: Option<&impl Serialize>, body: Option<&impl Serialize>, ) -> Result { @@ -35,7 +34,7 @@ pub async fn request_remote_datacenter_raw( tracing::debug!(%method, %url, "sending raw request to remote datacenter"); - let mut request = client.request(method, url).headers(headers); + let mut request = client.request(method, url); if let Some(b) = body { request = request.json(b); @@ -51,13 +50,12 @@ pub async fn request_remote_datacenter_raw( } /// Generic function to make requests to a specific datacenter -#[tracing::instrument(skip(config, headers, query, body))] +#[tracing::instrument(skip(config, query, body))] pub async fn request_remote_datacenter( config: &rivet_config::Config, dc_label: u16, endpoint: &str, method: Method, - headers: HeaderMap, query: Option<&impl Serialize>, body: Option<&impl Serialize>, ) -> Result @@ -78,7 +76,7 @@ where tracing::debug!(%method, %url, "sending request to remote datacenter"); - let mut request = client.request(method, url).headers(headers); + let mut request = client.request(method, url); if let Some(b) = body { request = request.json(b); @@ -95,10 +93,9 @@ where /// Generic function to fanout requests to all datacenters and aggregate results /// Returns aggregated results and errors only if all requests fail -#[tracing::instrument(skip(ctx, headers, query, local_handler, aggregator))] +#[tracing::instrument(skip(ctx, query, local_handler, aggregator))] pub async fn fanout_to_datacenters( ctx: ApiCtx, - headers: HeaderMap, endpoint: &str, query: Q, local_handler: F, @@ -116,7 +113,6 @@ where let results = futures_util::stream::iter(dcs.clone().into_iter().map(|dc| { let ctx = ctx.clone(); - let headers = headers.clone(); let query = query.clone(); let endpoint = endpoint.to_string(); let local_handler = local_handler.clone(); @@ -134,7 +130,6 @@ where dc.datacenter_label, &endpoint, Method::GET, - headers, Some(&query), Option::<&()>::None, ) diff --git a/packages/core/api-public/src/actors/create.rs b/packages/core/api-public/src/actors/create.rs index c459e0a61d..e7d9a9eec2 100644 --- a/packages/core/api-public/src/actors/create.rs +++ b/packages/core/api-public/src/actors/create.rs @@ -1,8 +1,5 @@ use anyhow::Result; -use axum::{ - http::HeaderMap, - response::{IntoResponse, Response}, -}; +use axum::response::{IntoResponse, Response}; use rivet_api_builder::{ ApiError, extract::{Extension, Json, Query}, @@ -49,11 +46,10 @@ pub struct CreateQuery { )] pub async fn create( Extension(ctx): Extension, - headers: HeaderMap, Query(query): Query, Json(body): Json, ) -> Response { - match create_inner(ctx, headers, query, body).await { + match create_inner(ctx, query, body).await { Ok(response) => Json(response).into_response(), Err(err) => ApiError::from(err).into_response(), } @@ -62,7 +58,6 @@ pub async fn create( #[tracing::instrument(skip_all)] async fn create_inner( ctx: ApiCtx, - headers: HeaderMap, query: CreateQuery, body: CreateRequest, ) -> Result { @@ -96,7 +91,6 @@ async fn create_inner( target_dc_label, "/actors", axum::http::Method::POST, - headers, Some(&query), Some(&body), ) diff --git a/packages/core/api-public/src/actors/delete.rs b/packages/core/api-public/src/actors/delete.rs index e289265dcb..8636dd7330 100644 --- a/packages/core/api-public/src/actors/delete.rs +++ b/packages/core/api-public/src/actors/delete.rs @@ -1,8 +1,5 @@ use anyhow::Result; -use axum::{ - http::HeaderMap, - response::{IntoResponse, Response}, -}; +use axum::response::{IntoResponse, Response}; use rivet_api_builder::{ ApiError, extract::{Extension, Json, Path, Query}, @@ -52,11 +49,10 @@ pub struct DeleteResponse {} #[tracing::instrument(skip_all)] pub async fn delete( Extension(ctx): Extension, - headers: HeaderMap, Path(path): Path, Query(query): Query, ) -> Response { - match delete_inner(ctx, headers, path, query).await { + match delete_inner(ctx, path, query).await { Ok(response) => response, Err(err) => ApiError::from(err).into_response(), } @@ -65,7 +61,6 @@ pub async fn delete( #[tracing::instrument(skip_all)] async fn delete_inner( ctx: ApiCtx, - headers: HeaderMap, path: DeletePath, query: DeleteQuery, ) -> Result { @@ -87,7 +82,6 @@ async fn delete_inner( path.actor_id.label(), &format!("/actors/{}", path.actor_id), axum::http::Method::DELETE, - headers, Some(&query), Option::<&()>::None, ) diff --git a/packages/core/api-public/src/actors/get_or_create.rs b/packages/core/api-public/src/actors/get_or_create.rs index b88630065f..7b113f564d 100644 --- a/packages/core/api-public/src/actors/get_or_create.rs +++ b/packages/core/api-public/src/actors/get_or_create.rs @@ -4,8 +4,8 @@ use axum::{ response::{IntoResponse, Response}, }; use rivet_api_builder::{ - ApiError, extract::{Extension, Json, Query}, + ApiError, }; use rivet_types::actors::CrashPolicy; use rivet_util::Id; @@ -159,13 +159,9 @@ async fn get_or_create_inner( ?existing_actor_id, "received duplicate key error, returning existing actor id" ); - let actor = utils::fetch_actor_by_id( - &ctx, - headers.clone(), - existing_actor_id, - query.namespace.clone(), - ) - .await?; + let actor = + utils::fetch_actor_by_id(&ctx, existing_actor_id, query.namespace.clone()) + .await?; return Ok(GetOrCreateResponse { actor, created: false, diff --git a/packages/core/api-public/src/actors/list.rs b/packages/core/api-public/src/actors/list.rs index 84cdc3a385..17c9c974c3 100644 --- a/packages/core/api-public/src/actors/list.rs +++ b/packages/core/api-public/src/actors/list.rs @@ -1,8 +1,5 @@ use anyhow::{Context, Result}; -use axum::{ - http::HeaderMap, - response::{IntoResponse, Response}, -}; +use axum::response::{IntoResponse, Response}; use rivet_api_builder::{ ApiError, extract::{Extension, Json, Query}, @@ -68,16 +65,15 @@ pub struct ListResponse { )] pub async fn list( Extension(ctx): Extension, - headers: HeaderMap, Query(query): Query, ) -> Response { - match list_inner(ctx, headers, query).await { + match list_inner(ctx, query).await { Ok(response) => Json(response).into_response(), Err(err) => ApiError::from(err).into_response(), } } -async fn list_inner(ctx: ApiCtx, headers: HeaderMap, query: ListQuery) -> Result { +async fn list_inner(ctx: ApiCtx, query: ListQuery) -> Result { ctx.auth().await?; // Parse query @@ -132,7 +128,6 @@ async fn list_inner(ctx: ApiCtx, headers: HeaderMap, query: ListQuery) -> Result // Fetch actors let actors = fetch_actors_by_ids( &ctx, - headers, actor_ids, query.namespace.clone(), query.include_destroyed, @@ -181,7 +176,6 @@ async fn list_inner(ctx: ApiCtx, headers: HeaderMap, query: ListQuery) -> Result // Fetch actors let actors = fetch_actors_by_ids( &ctx, - headers, vec![actor_id], query.namespace.clone(), query.include_destroyed, @@ -226,7 +220,6 @@ async fn list_inner(ctx: ApiCtx, headers: HeaderMap, query: ListQuery) -> Result Vec, >( ctx.into(), - headers, "/actors", peer_query, |ctx, query| async move { rivet_api_peer::actors::list::list(ctx, (), query).await }, diff --git a/packages/core/api-public/src/actors/list_names.rs b/packages/core/api-public/src/actors/list_names.rs index 37e8c0e73b..8e383b8d26 100644 --- a/packages/core/api-public/src/actors/list_names.rs +++ b/packages/core/api-public/src/actors/list_names.rs @@ -1,8 +1,5 @@ use anyhow::Result; -use axum::{ - http::HeaderMap, - response::{IntoResponse, Response}, -}; +use axum::response::{IntoResponse, Response}; use rivet_api_builder::{ ApiError, extract::{Extension, Json, Query}, @@ -31,10 +28,9 @@ use crate::ctx::ApiCtx; #[tracing::instrument(skip_all)] pub async fn list_names( Extension(ctx): Extension, - headers: HeaderMap, Query(query): Query, ) -> Response { - match list_names_inner(ctx, headers, query).await { + match list_names_inner(ctx, query).await { Ok(response) => Json(response).into_response(), Err(err) => ApiError::from(err).into_response(), } @@ -43,7 +39,6 @@ pub async fn list_names( #[tracing::instrument(skip_all)] async fn list_names_inner( ctx: ApiCtx, - headers: HeaderMap, query: ListNamesQuery, ) -> Result { ctx.auth().await?; @@ -59,7 +54,6 @@ async fn list_names_inner( let mut all_names = fanout_to_datacenters::>( ctx.into(), - headers, "/actors/names", peer_query, |ctx, query| async move { diff --git a/packages/core/api-public/src/actors/utils.rs b/packages/core/api-public/src/actors/utils.rs index 6d582aca37..b6186fe5c7 100644 --- a/packages/core/api-public/src/actors/utils.rs +++ b/packages/core/api-public/src/actors/utils.rs @@ -1,5 +1,5 @@ use anyhow::Result; -use axum::http::{HeaderMap, Method}; +use axum::http::Method; use rivet_api_builder::ApiCtx; use rivet_api_util::request_remote_datacenter; use rivet_error::RivetError; @@ -12,7 +12,6 @@ use std::collections::HashMap; #[tracing::instrument(skip_all)] pub async fn fetch_actor_by_id( ctx: &ApiCtx, - headers: HeaderMap, actor_id: Id, namespace: String, ) -> Result { @@ -39,7 +38,6 @@ pub async fn fetch_actor_by_id( actor_id.label(), "/actors", Method::GET, - headers, Some(&list_query), Option::<&()>::None, ) @@ -59,7 +57,6 @@ pub async fn fetch_actor_by_id( #[tracing::instrument(skip_all)] pub async fn fetch_actors_by_ids( ctx: &ApiCtx, - headers: HeaderMap, actor_ids: Vec, namespace: String, include_destroyed: Option, @@ -81,7 +78,6 @@ pub async fn fetch_actors_by_ids( // Fetch actors in batch from each datacenter let fetch_futures = actors_by_dc.into_iter().map(|(dc_label, dc_actor_ids)| { let ctx = ctx.clone(); - let headers = headers.clone(); let namespace = namespace.clone(); let include_destroyed = include_destroyed; let limit = limit; @@ -116,7 +112,6 @@ pub async fn fetch_actors_by_ids( dc_label, "/actors", Method::GET, - headers, Some(&peer_query), Option::<&()>::None, ) diff --git a/packages/core/api-public/src/namespaces.rs b/packages/core/api-public/src/namespaces.rs index 895e7f481c..1afa48b336 100644 --- a/packages/core/api-public/src/namespaces.rs +++ b/packages/core/api-public/src/namespaces.rs @@ -1,8 +1,5 @@ use anyhow::Result; -use axum::{ - http::HeaderMap, - response::{IntoResponse, Response}, -}; +use axum::response::{IntoResponse, Response}; use rivet_api_builder::{ ApiError, extract::{Extension, Json, Query}, @@ -26,16 +23,15 @@ use crate::ctx::ApiCtx; #[tracing::instrument(skip_all)] pub async fn list( Extension(ctx): Extension, - headers: HeaderMap, Query(query): Query, ) -> Response { - match list_inner(ctx, headers, query).await { + match list_inner(ctx, query).await { Ok(response) => Json(response).into_response(), Err(err) => ApiError::from(err).into_response(), } } -async fn list_inner(ctx: ApiCtx, headers: HeaderMap, query: ListQuery) -> Result { +async fn list_inner(ctx: ApiCtx, query: ListQuery) -> Result { ctx.auth().await?; if ctx.config().is_leader() { @@ -47,7 +43,6 @@ async fn list_inner(ctx: ApiCtx, headers: HeaderMap, query: ListQuery) -> Result leader_dc.datacenter_label, "/namespaces", axum::http::Method::GET, - headers, Some(&query), Option::<&()>::None, ) @@ -68,10 +63,9 @@ async fn list_inner(ctx: ApiCtx, headers: HeaderMap, query: ListQuery) -> Result #[tracing::instrument(skip_all)] pub async fn create( Extension(ctx): Extension, - headers: HeaderMap, Json(body): Json, ) -> Response { - match create_inner(ctx, headers, body).await { + match create_inner(ctx, body).await { Ok(response) => Json(response).into_response(), Err(err) => ApiError::from(err).into_response(), } @@ -80,7 +74,6 @@ pub async fn create( #[tracing::instrument(skip_all)] async fn create_inner( ctx: ApiCtx, - headers: HeaderMap, body: CreateRequest, ) -> Result { ctx.auth().await?; @@ -94,7 +87,6 @@ async fn create_inner( leader_dc.datacenter_label, "/namespaces", axum::http::Method::POST, - headers, Option::<&()>::None, Some(&body), ) diff --git a/packages/core/api-public/src/runner_configs/delete.rs b/packages/core/api-public/src/runner_configs/delete.rs index b4d604e63c..245903d6a1 100644 --- a/packages/core/api-public/src/runner_configs/delete.rs +++ b/packages/core/api-public/src/runner_configs/delete.rs @@ -1,8 +1,5 @@ use anyhow::Result; -use axum::{ - http::HeaderMap, - response::{IntoResponse, Response}, -}; +use axum::response::{IntoResponse, Response}; use rivet_api_builder::{ ApiError, extract::{Extension, Json, Path, Query}, @@ -28,11 +25,10 @@ use crate::ctx::ApiCtx; #[tracing::instrument(skip_all)] pub async fn delete( Extension(ctx): Extension, - headers: HeaderMap, Path(path): Path, Query(query): Query, ) -> Response { - match delete_inner(ctx, headers, path, query).await { + match delete_inner(ctx, path, query).await { Ok(response) => Json(response).into_response(), Err(err) => ApiError::from(err).into_response(), } @@ -41,7 +37,6 @@ pub async fn delete( #[tracing::instrument(skip_all)] async fn delete_inner( ctx: ApiCtx, - headers: HeaderMap, path: DeletePath, query: DeleteQuery, ) -> Result { @@ -65,7 +60,6 @@ async fn delete_inner( dc.datacenter_label, &format!("/runner-configs/{}", path.runner_name), axum::http::Method::DELETE, - headers.clone(), Some(&query), Option::<&()>::None, ) diff --git a/packages/core/api-public/src/runner_configs/list.rs b/packages/core/api-public/src/runner_configs/list.rs index 90f284fca8..f63e9f1019 100644 --- a/packages/core/api-public/src/runner_configs/list.rs +++ b/packages/core/api-public/src/runner_configs/list.rs @@ -1,10 +1,7 @@ use std::collections::HashMap; use anyhow::Result; -use axum::{ - http::HeaderMap, - response::{IntoResponse, Response}, -}; +use axum::response::{IntoResponse, Response}; use rivet_api_builder::{ ApiError, extract::{Extension, Json, Path, Query}, @@ -45,11 +42,10 @@ pub struct RunnerConfigDatacenters { #[tracing::instrument(skip_all)] pub async fn list( Extension(ctx): Extension, - headers: HeaderMap, Path(path): Path, Query(query): Query, ) -> Response { - match list_inner(ctx, headers, path, query).await { + match list_inner(ctx, path, query).await { Ok(response) => Json(response).into_response(), Err(err) => ApiError::from(err).into_response(), } @@ -58,7 +54,6 @@ pub async fn list( #[tracing::instrument(skip_all)] async fn list_inner( ctx: ApiCtx, - headers: HeaderMap, path: ListPath, query: ListQuery, ) -> Result { @@ -73,7 +68,6 @@ async fn list_inner( HashMap, >( ctx.clone().into(), - headers, "/runner-configs", query.clone(), move |ctx, query| { diff --git a/packages/core/api-public/src/runner_configs/upsert.rs b/packages/core/api-public/src/runner_configs/upsert.rs index 7cff66a6ca..27782bd8a7 100644 --- a/packages/core/api-public/src/runner_configs/upsert.rs +++ b/packages/core/api-public/src/runner_configs/upsert.rs @@ -1,10 +1,7 @@ use std::collections::HashMap; use anyhow::Result; -use axum::{ - http::HeaderMap, - response::{IntoResponse, Response}, -}; +use axum::response::{IntoResponse, Response}; use rivet_api_builder::{ ApiError, extract::{Extension, Json, Path, Query}, @@ -41,12 +38,11 @@ pub struct UpsertRequest { #[tracing::instrument(skip_all)] pub async fn upsert( Extension(ctx): Extension, - headers: HeaderMap, Path(path): Path, Query(query): Query, Json(body): Json, ) -> Response { - match upsert_inner(ctx, headers, path, query, body).await { + match upsert_inner(ctx, path, query, body).await { Ok(response) => Json(response).into_response(), Err(err) => ApiError::from(err).into_response(), } @@ -55,7 +51,6 @@ pub async fn upsert( #[tracing::instrument(skip_all)] async fn upsert_inner( ctx: ApiCtx, - headers: HeaderMap, path: UpsertPath, query: UpsertQuery, mut body: UpsertRequest, @@ -99,7 +94,6 @@ async fn upsert_inner( dc.datacenter_label, &format!("/runner-configs/{}", path.runner_name), axum::http::Method::PUT, - headers.clone(), Some(&query), Some(&runner_config), ) @@ -123,7 +117,6 @@ async fn upsert_inner( dc.datacenter_label, &format!("/runner-configs/{}", path.runner_name), axum::http::Method::DELETE, - headers.clone(), Some(&query), Option::<&()>::None, ) diff --git a/packages/core/api-public/src/runners.rs b/packages/core/api-public/src/runners.rs index c03dbd6cc1..2b19109893 100644 --- a/packages/core/api-public/src/runners.rs +++ b/packages/core/api-public/src/runners.rs @@ -1,8 +1,5 @@ use anyhow::Result; -use axum::{ - http::HeaderMap, - response::{IntoResponse, Response}, -}; +use axum::response::{IntoResponse, Response}; use rivet_api_builder::{ ApiError, extract::{Extension, Json, Query}, @@ -27,23 +24,21 @@ use crate::ctx::ApiCtx; #[tracing::instrument(skip_all)] pub async fn list( Extension(ctx): Extension, - headers: HeaderMap, Query(query): Query, ) -> Response { - match list_inner(ctx, headers, query).await { + match list_inner(ctx, query).await { Ok(response) => Json(response).into_response(), Err(err) => ApiError::from(err).into_response(), } } -async fn list_inner(ctx: ApiCtx, headers: HeaderMap, query: ListQuery) -> Result { +async fn list_inner(ctx: ApiCtx, query: ListQuery) -> Result { ctx.auth().await?; // Fanout to all datacenters let mut runners = fanout_to_datacenters::>( ctx.into(), - headers, "/runners", query.clone(), |ctx, query| async move { rivet_api_peer::runners::list(ctx, (), query).await }, @@ -101,10 +96,9 @@ pub struct ListNamesResponse { #[tracing::instrument(skip_all)] pub async fn list_names( Extension(ctx): Extension, - headers: HeaderMap, Query(query): Query, ) -> Response { - match list_names_inner(ctx, headers, query).await { + match list_names_inner(ctx, query).await { Ok(response) => Json(response).into_response(), Err(err) => ApiError::from(err).into_response(), } @@ -113,7 +107,6 @@ pub async fn list_names( #[tracing::instrument(skip_all)] async fn list_names_inner( ctx: ApiCtx, - headers: HeaderMap, query: ListNamesQuery, ) -> Result { ctx.auth().await?; @@ -135,7 +128,6 @@ async fn list_names_inner( Vec, >( ctx.into(), - headers, "/runners/names", peer_query, |ctx, query| async move { rivet_api_peer::runners::list_names(ctx, (), query).await }, diff --git a/packages/services/internal/src/ops/bump_serverless_autoscaler_global.rs b/packages/services/internal/src/ops/bump_serverless_autoscaler_global.rs index 95176a6d1a..402f7829ed 100644 --- a/packages/services/internal/src/ops/bump_serverless_autoscaler_global.rs +++ b/packages/services/internal/src/ops/bump_serverless_autoscaler_global.rs @@ -2,7 +2,7 @@ use std::fmt::Debug; use futures_util::StreamExt; use gas::prelude::*; -use rivet_api_util::{HeaderMap, Method, request_remote_datacenter}; +use rivet_api_util::{Method, request_remote_datacenter}; #[derive(Clone, Debug, Default)] pub struct Input {} @@ -27,7 +27,6 @@ pub async fn bump_serverless_autoscaler_global(ctx: &OperationCtx, input: &Input dc.datacenter_label, "/bump-serverless-autoscaler", Method::POST, - HeaderMap::new(), Option::<&()>::None, Option::<&()>::None, ) diff --git a/packages/services/internal/src/ops/cache/purge_global.rs b/packages/services/internal/src/ops/cache/purge_global.rs index 9c8e24ac52..982457d89e 100644 --- a/packages/services/internal/src/ops/cache/purge_global.rs +++ b/packages/services/internal/src/ops/cache/purge_global.rs @@ -2,7 +2,7 @@ use std::fmt::Debug; use futures_util::StreamExt; use gas::prelude::*; -use rivet_api_util::{HeaderMap, Method, request_remote_datacenter}; +use rivet_api_util::{Method, request_remote_datacenter}; use rivet_cache::RawCacheKey; use serde::Serialize; @@ -35,7 +35,6 @@ pub async fn cache_purge_global(ctx: &OperationCtx, input: &Input) -> Result<()> dc.datacenter_label, "/cache/purge", Method::POST, - HeaderMap::new(), Option::<&()>::None, Some(&CachePurgeRequest { base_key: input.base_key, diff --git a/packages/services/pegboard/src/ops/actor/create.rs b/packages/services/pegboard/src/ops/actor/create.rs index 41883b1bd4..1b6e5e02d0 100644 --- a/packages/services/pegboard/src/ops/actor/create.rs +++ b/packages/services/pegboard/src/ops/actor/create.rs @@ -139,7 +139,6 @@ async fn forward_to_datacenter( datacenter_label, "/actors", Method::POST, - Default::default(), // Empty headers Some(&rivet_api_types::actors::create::CreateQuery { namespace: namespace.name.clone(), }), diff --git a/packages/services/pegboard/src/ops/actor/get_for_key.rs b/packages/services/pegboard/src/ops/actor/get_for_key.rs index 7d8b3f8499..271d1a28d3 100644 --- a/packages/services/pegboard/src/ops/actor/get_for_key.rs +++ b/packages/services/pegboard/src/ops/actor/get_for_key.rs @@ -73,7 +73,6 @@ pub async fn pegboard_actor_get_for_key(ctx: &OperationCtx, input: &Input) -> Re reservation_id.label(), "/actors", Method::GET, - Default::default(), // Empty headers Some(&rivet_api_types::actors::list::ListQuery { namespace: namespace.name.clone(), name: Some(input.name.clone()), diff --git a/packages/services/pegboard/src/ops/runner/find_dc_with_runner.rs b/packages/services/pegboard/src/ops/runner/find_dc_with_runner.rs index 9bc8f97b22..63223531e3 100644 --- a/packages/services/pegboard/src/ops/runner/find_dc_with_runner.rs +++ b/packages/services/pegboard/src/ops/runner/find_dc_with_runner.rs @@ -4,7 +4,7 @@ use anyhow::Result; use futures_util::{FutureExt, StreamExt, TryFutureExt, stream::FuturesUnordered}; use gas::prelude::*; use rivet_api_types::{runner_configs::list as runner_configs_list, runners::list as runners_list}; -use rivet_api_util::{HeaderMap, Method, request_remote_datacenter}; +use rivet_api_util::{Method, request_remote_datacenter}; use rivet_types::runner_configs::{RunnerConfig, RunnerConfigKind}; use serde::de::DeserializeOwned; @@ -103,7 +103,6 @@ async fn find_dc_with_runner_inner(ctx: &OperationCtx, input: &Input) -> Result< let runners_fut = race_request_to_datacenters::( ctx, - Default::default(), "/runners", runners_list::ListQuery { namespace: namespace.name.clone(), @@ -130,7 +129,6 @@ async fn find_dc_with_runner_inner(ctx: &OperationCtx, input: &Input) -> Result< _, >( ctx, - Default::default(), "/runner-configs", runner_configs_list::ListQuery { namespace: namespace.name.clone(), @@ -166,7 +164,6 @@ const REQUEST_TIMEOUT: Duration = Duration::from_secs(5); /// datacenter that matches `filter`. pub async fn race_request_to_datacenters( ctx: &OperationCtx, - headers: HeaderMap, endpoint: &str, query: Q, filter: F, @@ -182,7 +179,6 @@ where .iter() .filter(|dc| dc.datacenter_label != ctx.config().dc_label()) .map(|dc| { - let headers = headers.clone(); let query = query.clone(); async move { tokio::time::timeout( @@ -193,7 +189,6 @@ where dc.datacenter_label, &endpoint, Method::GET, - headers, Some(&query), Option::<&()>::None, )