Deuxfleurs/garage
41
56
Fork 73
Code Issues 98 Pull requests 14 Releases 30 Wiki Activity

admin API: add missing camelCase conversions (fix #381)
Some checks failed
continuous-integration/drone/pr Build is failing
Details
continuous-integration/drone/push Build is failing
Details

Browse source
This commit is contained in:
Alex 2023-06-13 16:15:50 +02:00
parent 7126f3e1d1
commit bf19a44fd9
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/api/admin/cluster.rs
View file

@ -114,6 +114,7 @@ struct GetClusterStatusResponse {
} }
#[derive(Serialize)] #[derive(Serialize)]
#[serde(rename_all = "camelCase")]
struct ConnectClusterNodesResponse { struct ConnectClusterNodesResponse {
success: bool, success: bool,
error: Option<String>, error: Option<String>,
@ -128,6 +129,7 @@ struct GetClusterLayoutResponse {
} }
#[derive(Serialize)] #[derive(Serialize)]
#[serde(rename_all = "camelCase")]
struct KnownNodeResp { struct KnownNodeResp {
addr: SocketAddr, addr: SocketAddr,
is_up: bool, is_up: bool,
@ -197,6 +199,7 @@ pub async fn handle_revert_cluster_layout(
type UpdateClusterLayoutRequest = HashMap<String, Option<NodeRole>>; type UpdateClusterLayoutRequest = HashMap<String, Option<NodeRole>>;
#[derive(Deserialize)] #[derive(Deserialize)]
#[serde(rename_all = "camelCase")]
struct ApplyRevertLayoutRequest { struct ApplyRevertLayoutRequest {
version: u64, version: u64,
} }

4
src/api/admin/key.rs
View file

@ -34,6 +34,7 @@ pub async fn handle_list_keys(garage: &Arc<Garage>) -> Result<Response<Body>, Er
} }
#[derive(Serialize)] #[derive(Serialize)]
#[serde(rename_all = "camelCase")]
struct ListKeyResultItem { struct ListKeyResultItem {
id: String, id: String,
name: String, name: String,
@ -71,6 +72,7 @@ pub async fn handle_create_key(
} }
#[derive(Deserialize)] #[derive(Deserialize)]
#[serde(rename_all = "camelCase")]
struct CreateKeyRequest { struct CreateKeyRequest {
name: String, name: String,
} }
@ -131,6 +133,7 @@ pub async fn handle_update_key(
} }
#[derive(Deserialize)] #[derive(Deserialize)]
#[serde(rename_all = "camelCase")]
struct UpdateKeyRequest { struct UpdateKeyRequest {
name: Option<String>, name: Option<String>,
allow: Option<KeyPerm>, allow: Option<KeyPerm>,
@ -246,6 +249,7 @@ struct KeyInfoBucketResult {
} }
#[derive(Serialize, Deserialize, Default)] #[derive(Serialize, Deserialize, Default)]
#[serde(rename_all = "camelCase")]
pub(crate) struct ApiBucketKeyPerm { pub(crate) struct ApiBucketKeyPerm {
#[serde(default)] #[serde(default)]
pub(crate) read: bool, pub(crate) read: bool,