[pbs-devel] [PATCH proxmox] client: remove option from inner RawApiResponse

[pbs-devel] [PATCH proxmox] client: remove option from inner RawApiResponse

[Dominik Csapak]

when using the client for an api call that does not return any data
(it returns '{"data":null}'), we would always get an error 'api returned
no data'. The message is technically correct, but it should not be an
error when we expect no data (e.g. most of our CRUD PUT/POST calls)

instead of having the Option<T> in the RawApiResponse type itself, move
it into to the 'nodata' function intended for api calls where we don't
expect any data.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 proxmox-client/src/lib.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/proxmox-client/src/lib.rs b/proxmox-client/src/lib.rs
index 6039ae5..9aa7144 100644
--- a/proxmox-client/src/lib.rs
+++ b/proxmox-client/src/lib.rs
@@ -106,8 +106,8 @@ impl HttpApiResponse {
 
     /// Expect that the API call did *not* return any data in the `data` field.
     pub fn nodata(self) -> Result<(), Error> {
-        let response = serde_json::from_slice::<RawApiResponse<()>>(&self.body)
-            .map_err(|err| Error::bad_api("failed to parse api response", err))?;
+        let response = serde_json::from_slice::<RawApiResponse<Option<()>>>(&self.body)
+            .map_err(|err| Error::bad_api("unexpected api response", err))?;
 
         if response.data.is_some() {
             Err(Error::UnexpectedData)
@@ -131,7 +131,7 @@ struct RawApiResponse<T> {
     message: Option<String>,
     #[serde(default, deserialize_with = "proxmox_login::parse::deserialize_bool")]
     success: Option<bool>,
-    data: Option<T>,
+    data: T,
 
     #[serde(default)]
     errors: HashMap<String, String>,
@@ -164,9 +164,7 @@ impl<T> RawApiResponse<T> {
         let this = self.check_success()?;
 
         Ok(ApiResponseData {
-            data: this
-                .data
-                .ok_or_else(|| Error::BadApi("api returned no data".to_string(), None))?,
+            data: this.data,
             attribs: this.attribs,
         })
     }
-- 
2.39.2

[pbs-devel] applied: [PATCH proxmox] client: remove option from inner RawApiResponse

[Dietmar Maurer]

applied