Skip to content
Closed
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
20 changes: 13 additions & 7 deletions out/openapi.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/common/api-types/src/namespaces/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
pub mod list;
pub mod runner_configs;
43 changes: 43 additions & 0 deletions packages/common/api-types/src/namespaces/runner_configs.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
use std::collections::HashMap;

use gas::prelude::*;
use utoipa::ToSchema;

#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
#[serde(rename_all = "snake_case")]
pub enum RunnerConfig {
Serverless {
url: String,
headers: Option<HashMap<String, String>>,
/// Seconds.
request_lifespan: u32,
slots_per_runner: u32,
min_runners: Option<u32>,
max_runners: u32,
runners_margin: Option<u32>,
},
}

impl Into<rivet_types::runner_configs::RunnerConfig> for RunnerConfig {
fn into(self) -> rivet_types::runner_configs::RunnerConfig {
match self {
RunnerConfig::Serverless {
url,
headers,
request_lifespan,
slots_per_runner,
min_runners,
max_runners,
runners_margin,
} => rivet_types::runner_configs::RunnerConfig::Serverless {
url,
headers: headers.unwrap_or_default(),
request_lifespan,
slots_per_runner,
min_runners: min_runners.unwrap_or_default(),
max_runners,
runners_margin: runners_margin.unwrap_or_default(),
},
}
}
}
4 changes: 2 additions & 2 deletions packages/core/api-peer/src/runner_configs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pub struct UpsertPath {

#[derive(Deserialize, Serialize)]
#[serde(deny_unknown_fields)]
pub struct UpsertRequest(pub rivet_types::runner_configs::RunnerConfig);
pub struct UpsertRequest(pub rivet_api_types::namespaces::runner_configs::RunnerConfig);

#[derive(Deserialize, Serialize, ToSchema)]
#[schema(as = RunnerConfigsUpsertResponse)]
Expand All @@ -109,7 +109,7 @@ pub async fn upsert(
ctx.op(namespace::ops::runner_config::upsert::Input {
namespace_id: namespace.namespace_id,
name: path.runner_name,
config: body.0,
config: body.0.into(),
})
.await?;

Expand Down
4 changes: 2 additions & 2 deletions packages/core/api-public/src/runner_configs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ async fn list_inner(
#[serde(deny_unknown_fields)]
#[schema(as = RunnerConfigsUpsertRequest)]
pub struct UpsertRequest(
#[schema(inline)] HashMap<String, rivet_types::runner_configs::RunnerConfig>,
#[schema(inline)] HashMap<String, rivet_api_types::namespaces::runner_configs::RunnerConfig>,
);

#[utoipa::path(
Expand Down Expand Up @@ -151,7 +151,7 @@ async fn upsert_inner(
ctx.op(namespace::ops::runner_config::upsert_default::Input {
namespace_id: namespace.namespace_id,
name: path.runner_name.clone(),
config: default_config,
config: default_config.into(),
})
.await?;
}
Expand Down
Loading