Skip to content

Commit df1975f

Browse files
committed
fix(core): fix openapi naming conflict
1 parent 17fdf8b commit df1975f

File tree

136 files changed

+2621
-1615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+2621
-1615
lines changed

out/openapi.json

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

packages/core/api-peer/src/internal.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ pub async fn epoxy_replica_reconfigure(
9898
_body: ReplicaReconfigureRequest,
9999
) -> Result<ReplicaReconfigureResponse> {
100100
ctx.signal(epoxy::workflows::coordinator::ReplicaReconfigure {})
101-
.send()
102-
.await?;
101+
.send()
102+
.await?;
103103

104104
Ok(ReplicaReconfigureResponse {})
105105
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@ pub async fn delete(
5959
}
6060

6161
#[tracing::instrument(skip_all)]
62-
async fn delete_inner(
63-
ctx: ApiCtx,
64-
path: DeletePath,
65-
query: DeleteQuery,
66-
) -> Result<Response> {
62+
async fn delete_inner(ctx: ApiCtx, path: DeletePath, query: DeleteQuery) -> Result<Response> {
6763
ctx.auth().await?;
6864

6965
if path.actor_id.label() == ctx.config().dc_label() {

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,7 @@ pub struct ListResponse {
6363
(status = 200, body = ListResponse),
6464
),
6565
)]
66-
pub async fn list(
67-
Extension(ctx): Extension<ApiCtx>,
68-
Query(query): Query<ListQuery>,
69-
) -> Response {
66+
pub async fn list(Extension(ctx): Extension<ApiCtx>, Query(query): Query<ListQuery>) -> Response {
7067
match list_inner(ctx, query).await {
7168
Ok(response) => Json(response).into_response(),
7269
Err(err) => ApiError::from(err).into_response(),

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ pub async fn list_names(
3737
}
3838

3939
#[tracing::instrument(skip_all)]
40-
async fn list_names_inner(
41-
ctx: ApiCtx,
42-
query: ListNamesQuery,
43-
) -> Result<ListNamesResponse> {
40+
async fn list_names_inner(ctx: ApiCtx, query: ListNamesQuery) -> Result<ListNamesResponse> {
4441
ctx.auth().await?;
4542

4643
// Prepare peer query for local handler

packages/core/api-public/src/health.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use anyhow::{bail, Result};
2-
use axum::{extract::Extension, response::IntoResponse, Json};
1+
use anyhow::{Result, bail};
2+
use axum::{Json, extract::Extension, response::IntoResponse};
33
use futures_util::StreamExt;
44
use rivet_api_builder::ApiError;
55
use serde::{Deserialize, Serialize};

packages/core/api-public/src/namespaces.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ pub async fn create(
6969
}
7070

7171
#[tracing::instrument(skip_all)]
72-
async fn create_inner(
73-
ctx: ApiCtx,
74-
body: CreateRequest,
75-
) -> Result<CreateResponse> {
72+
async fn create_inner(ctx: ApiCtx, body: CreateRequest) -> Result<CreateResponse> {
7673
ctx.auth().await?;
7774

7875
if ctx.config().is_leader() {

packages/core/api-public/src/router.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ use rivet_api_builder::{create_router, extract::FailedExtraction};
88
use tower_http::cors::CorsLayer;
99
use utoipa::OpenApi;
1010

11-
use crate::{
12-
actors, ctx, datacenters, health, metadata, namespaces, runner_configs, runners, ui,
13-
};
11+
use crate::{actors, ctx, datacenters, health, metadata, namespaces, runner_configs, runners, ui};
1412

1513
#[derive(OpenApi)]
1614
#[openapi(

packages/core/api-public/src/runner_configs/delete.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ pub async fn delete(
3535
}
3636

3737
#[tracing::instrument(skip_all)]
38-
async fn delete_inner(
39-
ctx: ApiCtx,
40-
path: DeletePath,
41-
query: DeleteQuery,
42-
) -> Result<DeleteResponse> {
38+
async fn delete_inner(ctx: ApiCtx, path: DeletePath, query: DeleteQuery) -> Result<DeleteResponse> {
4339
ctx.auth().await?;
4440

4541
for dc in &ctx.config().topology().datacenters {

packages/core/api-public/src/runner_configs/list.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ pub async fn list(
5252
}
5353

5454
#[tracing::instrument(skip_all)]
55-
async fn list_inner(
56-
ctx: ApiCtx,
57-
path: ListPath,
58-
query: ListQuery,
59-
) -> Result<ListResponse> {
55+
async fn list_inner(ctx: ApiCtx, path: ListPath, query: ListQuery) -> Result<ListResponse> {
6056
ctx.auth().await?;
6157

6258
let runner_configs = fanout_to_datacenters::<

0 commit comments

Comments
 (0)