Skip to content

Commit c6f6b75

Browse files
committed
chore(core): move datacenter for actor create request to the body
1 parent 46cd3b4 commit c6f6b75

File tree

5 files changed

+20
-22
lines changed

5 files changed

+20
-22
lines changed

out/openapi.json

Lines changed: 12 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/common/api-types/src/actors/create.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ pub struct CreateQuery {
1212
#[serde(deny_unknown_fields)]
1313
#[schema(as = ActorsCreateRequest)]
1414
pub struct CreateRequest {
15+
// Ignored in api-peer
16+
pub datacenter: Option<String>,
1517
pub name: String,
1618
pub key: Option<String>,
1719
pub input: Option<String>,

packages/core/api-public/src/actors/create.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use crate::ctx::ApiCtx;
1919
#[into_params(parameter_in = Query)]
2020
pub struct CreateQuery {
2121
pub namespace: String,
22-
pub datacenter: Option<String>,
2322
}
2423

2524
/// ## Datacenter Round Trips
@@ -80,7 +79,7 @@ async fn create_inner(
8079
namespace.namespace_id,
8180
&query.namespace,
8281
&body.runner_name_selector,
83-
query.datacenter.as_ref().map(String::as_str),
82+
body.datacenter.as_ref().map(String::as_str),
8483
)
8584
.await?;
8685

packages/core/api-public/src/actors/get_or_create.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ use crate::ctx::ApiCtx;
2020
#[into_params(parameter_in = Query)]
2121
pub struct GetOrCreateQuery {
2222
pub namespace: String,
23-
pub datacenter: Option<String>,
2423
}
2524

2625
#[derive(Deserialize, ToSchema)]
2726
#[serde(deny_unknown_fields)]
2827
#[schema(as = ActorsGetOrCreateRequest)]
2928
pub struct GetOrCreateRequest {
29+
pub datacenter: Option<String>,
3030
pub name: String,
3131
pub key: String,
3232
pub input: Option<String>,
@@ -127,7 +127,7 @@ async fn get_or_create_inner(
127127
namespace.namespace_id,
128128
&query.namespace,
129129
&body.runner_name_selector,
130-
query.datacenter.as_ref().map(String::as_str),
130+
body.datacenter.as_ref().map(String::as_str),
131131
)
132132
.await?;
133133

@@ -143,7 +143,7 @@ async fn get_or_create_inner(
143143
input: body.input.clone(),
144144
crash_policy: body.crash_policy,
145145
forward_request: true,
146-
datacenter_name: query.datacenter.clone(),
146+
datacenter_name: body.datacenter.clone(),
147147
})
148148
.await
149149
{

packages/services/pegboard/src/ops/actor/create.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use anyhow::Result;
22
use gas::prelude::*;
3-
use rivet_api_util::{Method, request_remote_datacenter};
3+
use rivet_api_util::{request_remote_datacenter, Method};
44
use rivet_types::actors::{Actor, CrashPolicy};
55

66
#[derive(Debug)]
@@ -144,6 +144,7 @@ async fn forward_to_datacenter(
144144
namespace: namespace.name.clone(),
145145
}),
146146
Some(&rivet_api_types::actors::create::CreateRequest {
147+
datacenter: None,
147148
name,
148149
key,
149150
input,

0 commit comments

Comments
 (0)