chore: format with updated rustfmt and taplo rules
Signed-off-by: NotAShelf <raf@notashelf.dev> Change-Id: Ie9ef5fc421fa20071946cf1073f7920c6a6a6964
This commit is contained in:
parent
605b1a5181
commit
c306383d27
72 changed files with 11217 additions and 10487 deletions
|
|
@ -1,114 +1,114 @@
|
|||
use axum::{
|
||||
Json, Router,
|
||||
extract::{Path, State},
|
||||
routing::get,
|
||||
Json,
|
||||
Router,
|
||||
extract::{Path, State},
|
||||
routing::get,
|
||||
};
|
||||
use fc_common::{Jobset, JobsetInput, UpdateJobset, Validate};
|
||||
use serde::Deserialize;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::auth_middleware::RequireAdmin;
|
||||
use crate::error::ApiError;
|
||||
use crate::state::AppState;
|
||||
use crate::{auth_middleware::RequireAdmin, error::ApiError, state::AppState};
|
||||
|
||||
async fn get_jobset(
|
||||
State(state): State<AppState>,
|
||||
Path((_project_id, id)): Path<(Uuid, Uuid)>,
|
||||
State(state): State<AppState>,
|
||||
Path((_project_id, id)): Path<(Uuid, Uuid)>,
|
||||
) -> Result<Json<Jobset>, ApiError> {
|
||||
let jobset = fc_common::repo::jobsets::get(&state.pool, id)
|
||||
.await
|
||||
.map_err(ApiError)?;
|
||||
Ok(Json(jobset))
|
||||
let jobset = fc_common::repo::jobsets::get(&state.pool, id)
|
||||
.await
|
||||
.map_err(ApiError)?;
|
||||
Ok(Json(jobset))
|
||||
}
|
||||
|
||||
async fn update_jobset(
|
||||
_auth: RequireAdmin,
|
||||
State(state): State<AppState>,
|
||||
Path((_project_id, id)): Path<(Uuid, Uuid)>,
|
||||
Json(input): Json<UpdateJobset>,
|
||||
_auth: RequireAdmin,
|
||||
State(state): State<AppState>,
|
||||
Path((_project_id, id)): Path<(Uuid, Uuid)>,
|
||||
Json(input): Json<UpdateJobset>,
|
||||
) -> Result<Json<Jobset>, ApiError> {
|
||||
input
|
||||
.validate()
|
||||
.map_err(|msg| ApiError(fc_common::CiError::Validation(msg)))?;
|
||||
let jobset = fc_common::repo::jobsets::update(&state.pool, id, input)
|
||||
.await
|
||||
.map_err(ApiError)?;
|
||||
Ok(Json(jobset))
|
||||
input
|
||||
.validate()
|
||||
.map_err(|msg| ApiError(fc_common::CiError::Validation(msg)))?;
|
||||
let jobset = fc_common::repo::jobsets::update(&state.pool, id, input)
|
||||
.await
|
||||
.map_err(ApiError)?;
|
||||
Ok(Json(jobset))
|
||||
}
|
||||
|
||||
async fn delete_jobset(
|
||||
_auth: RequireAdmin,
|
||||
State(state): State<AppState>,
|
||||
Path((_project_id, id)): Path<(Uuid, Uuid)>,
|
||||
_auth: RequireAdmin,
|
||||
State(state): State<AppState>,
|
||||
Path((_project_id, id)): Path<(Uuid, Uuid)>,
|
||||
) -> Result<Json<serde_json::Value>, ApiError> {
|
||||
fc_common::repo::jobsets::delete(&state.pool, id)
|
||||
.await
|
||||
.map_err(ApiError)?;
|
||||
Ok(Json(serde_json::json!({ "deleted": true })))
|
||||
fc_common::repo::jobsets::delete(&state.pool, id)
|
||||
.await
|
||||
.map_err(ApiError)?;
|
||||
Ok(Json(serde_json::json!({ "deleted": true })))
|
||||
}
|
||||
|
||||
// --- Jobset input routes ---
|
||||
|
||||
async fn list_jobset_inputs(
|
||||
State(state): State<AppState>,
|
||||
Path((_project_id, jobset_id)): Path<(Uuid, Uuid)>,
|
||||
State(state): State<AppState>,
|
||||
Path((_project_id, jobset_id)): Path<(Uuid, Uuid)>,
|
||||
) -> Result<Json<Vec<JobsetInput>>, ApiError> {
|
||||
let inputs = fc_common::repo::jobset_inputs::list_for_jobset(&state.pool, jobset_id)
|
||||
.await
|
||||
.map_err(ApiError)?;
|
||||
Ok(Json(inputs))
|
||||
let inputs =
|
||||
fc_common::repo::jobset_inputs::list_for_jobset(&state.pool, jobset_id)
|
||||
.await
|
||||
.map_err(ApiError)?;
|
||||
Ok(Json(inputs))
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct CreateJobsetInputRequest {
|
||||
name: String,
|
||||
input_type: String,
|
||||
value: String,
|
||||
revision: Option<String>,
|
||||
name: String,
|
||||
input_type: String,
|
||||
value: String,
|
||||
revision: Option<String>,
|
||||
}
|
||||
|
||||
async fn create_jobset_input(
|
||||
_auth: RequireAdmin,
|
||||
State(state): State<AppState>,
|
||||
Path((_project_id, jobset_id)): Path<(Uuid, Uuid)>,
|
||||
Json(body): Json<CreateJobsetInputRequest>,
|
||||
_auth: RequireAdmin,
|
||||
State(state): State<AppState>,
|
||||
Path((_project_id, jobset_id)): Path<(Uuid, Uuid)>,
|
||||
Json(body): Json<CreateJobsetInputRequest>,
|
||||
) -> Result<Json<JobsetInput>, ApiError> {
|
||||
let input = fc_common::repo::jobset_inputs::create(
|
||||
&state.pool,
|
||||
jobset_id,
|
||||
&body.name,
|
||||
&body.input_type,
|
||||
&body.value,
|
||||
body.revision.as_deref(),
|
||||
)
|
||||
.await
|
||||
.map_err(ApiError)?;
|
||||
Ok(Json(input))
|
||||
let input = fc_common::repo::jobset_inputs::create(
|
||||
&state.pool,
|
||||
jobset_id,
|
||||
&body.name,
|
||||
&body.input_type,
|
||||
&body.value,
|
||||
body.revision.as_deref(),
|
||||
)
|
||||
.await
|
||||
.map_err(ApiError)?;
|
||||
Ok(Json(input))
|
||||
}
|
||||
|
||||
async fn delete_jobset_input(
|
||||
_auth: RequireAdmin,
|
||||
State(state): State<AppState>,
|
||||
Path((_project_id, _jobset_id, input_id)): Path<(Uuid, Uuid, Uuid)>,
|
||||
_auth: RequireAdmin,
|
||||
State(state): State<AppState>,
|
||||
Path((_project_id, _jobset_id, input_id)): Path<(Uuid, Uuid, Uuid)>,
|
||||
) -> Result<Json<serde_json::Value>, ApiError> {
|
||||
fc_common::repo::jobset_inputs::delete(&state.pool, input_id)
|
||||
.await
|
||||
.map_err(ApiError)?;
|
||||
Ok(Json(serde_json::json!({ "deleted": true })))
|
||||
fc_common::repo::jobset_inputs::delete(&state.pool, input_id)
|
||||
.await
|
||||
.map_err(ApiError)?;
|
||||
Ok(Json(serde_json::json!({ "deleted": true })))
|
||||
}
|
||||
|
||||
pub fn router() -> Router<AppState> {
|
||||
Router::new()
|
||||
.route(
|
||||
"/projects/{project_id}/jobsets/{id}",
|
||||
get(get_jobset).put(update_jobset).delete(delete_jobset),
|
||||
)
|
||||
.route(
|
||||
"/projects/{project_id}/jobsets/{jobset_id}/inputs",
|
||||
get(list_jobset_inputs).post(create_jobset_input),
|
||||
)
|
||||
.route(
|
||||
"/projects/{project_id}/jobsets/{jobset_id}/inputs/{input_id}",
|
||||
axum::routing::delete(delete_jobset_input),
|
||||
)
|
||||
Router::new()
|
||||
.route(
|
||||
"/projects/{project_id}/jobsets/{id}",
|
||||
get(get_jobset).put(update_jobset).delete(delete_jobset),
|
||||
)
|
||||
.route(
|
||||
"/projects/{project_id}/jobsets/{jobset_id}/inputs",
|
||||
get(list_jobset_inputs).post(create_jobset_input),
|
||||
)
|
||||
.route(
|
||||
"/projects/{project_id}/jobsets/{jobset_id}/inputs/{input_id}",
|
||||
axum::routing::delete(delete_jobset_input),
|
||||
)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue