diff options
author | Alex Auvolat <alex@adnab.me> | 2023-06-13 16:15:50 +0200 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2023-06-13 16:15:50 +0200 |
commit | bf19a44fd93584d5250a2e98e5b1d3a2de6d59d1 (patch) | |
tree | a61816f3087a1ccc2e80ebfeb39e7e4634c97eb9 | |
parent | 7126f3e1d1fa7238788c23d01ec9f67b132e5f50 (diff) | |
download | garage-bf19a44fd93584d5250a2e98e5b1d3a2de6d59d1.tar.gz garage-bf19a44fd93584d5250a2e98e5b1d3a2de6d59d1.zip |
admin API: add missing camelCase conversions (fix #381)
-rw-r--r-- | src/api/admin/cluster.rs | 3 | ||||
-rw-r--r-- | src/api/admin/key.rs | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/api/admin/cluster.rs b/src/api/admin/cluster.rs index b2508d2e..a2c97ee5 100644 --- a/src/api/admin/cluster.rs +++ b/src/api/admin/cluster.rs @@ -114,6 +114,7 @@ struct GetClusterStatusResponse { } #[derive(Serialize)] +#[serde(rename_all = "camelCase")] struct ConnectClusterNodesResponse { success: bool, error: Option<String>, @@ -128,6 +129,7 @@ struct GetClusterLayoutResponse { } #[derive(Serialize)] +#[serde(rename_all = "camelCase")] struct KnownNodeResp { addr: SocketAddr, is_up: bool, @@ -197,6 +199,7 @@ pub async fn handle_revert_cluster_layout( type UpdateClusterLayoutRequest = HashMap<String, Option<NodeRole>>; #[derive(Deserialize)] +#[serde(rename_all = "camelCase")] struct ApplyRevertLayoutRequest { version: u64, } diff --git a/src/api/admin/key.rs b/src/api/admin/key.rs index d74ca361..25ba76f8 100644 --- a/src/api/admin/key.rs +++ b/src/api/admin/key.rs @@ -34,6 +34,7 @@ pub async fn handle_list_keys(garage: &Arc<Garage>) -> Result<Response<Body>, Er } #[derive(Serialize)] +#[serde(rename_all = "camelCase")] struct ListKeyResultItem { id: String, name: String, @@ -71,6 +72,7 @@ pub async fn handle_create_key( } #[derive(Deserialize)] +#[serde(rename_all = "camelCase")] struct CreateKeyRequest { name: String, } @@ -131,6 +133,7 @@ pub async fn handle_update_key( } #[derive(Deserialize)] +#[serde(rename_all = "camelCase")] struct UpdateKeyRequest { name: Option<String>, allow: Option<KeyPerm>, @@ -246,6 +249,7 @@ struct KeyInfoBucketResult { } #[derive(Serialize, Deserialize, Default)] +#[serde(rename_all = "camelCase")] pub(crate) struct ApiBucketKeyPerm { #[serde(default)] pub(crate) read: bool, |