api: add trait into_parsed_request

This is currently implemented only for MachineConfigureBody.

Signed-off-by: Andreea Florescu <fandree@amazon.com>

Author: andreeaflorescu

api_server/src/http_service.rs

@@ -12,7 +12,7 @@ use hyper::{self, Chunk, Headers, Method, StatusCode};
 use serde_json;
 use tokio_core::reactor::Handle;
 
-use request::{self, ApiRequest, AsyncOutcome, AsyncRequestBody, ParsedRequest};
+use request::{self, ApiRequest, AsyncOutcome, AsyncRequestBody, IntoParsedRequest, ParsedRequest};
 use request::instance_info::InstanceInfo;
 use super::{ActionMap, ActionMapValue};
 use sys_util::EventFd;
@@ -188,7 +188,7 @@ fn parse_machine_config_req<'a>(
             request::MachineConfigurationBody,
         >(body)
             .map_err(Error::SerdeJson)?
-            .into_parsed_request()
+            .into_parsed_request(method)
             .map_err(|s| Error::Generic(StatusCode::BadRequest, s))?),
         _ => Err(Error::InvalidPathMethod(path, method)),
     }
@@ -881,7 +881,7 @@ mod tests {
             mem_size_mib: Some(1025),
         };
 
-        match mcb.into_parsed_request() {
+        match mcb.into_parsed_request(Method::Put) {
             Ok(pr) => match parse_machine_config_req(&path_tokens, &path, Method::Put, &body) {
                 Ok(pr_mcb) => assert!(pr.eq(&pr_mcb)),
                 _ => assert!(false),

api_server/src/request/mod.rs

@@ -1,6 +1,9 @@
 pub mod async;
 pub mod sync;
 
+use std::result;
+
+use hyper::Method;
 pub use self::async::{AsyncOutcome, AsyncOutcomeReceiver, AsyncOutcomeSender, AsyncRequest,
                       AsyncRequestBody};
 pub use self::sync::{BootSourceBody, DriveDescription, MachineConfigurationBody,
@@ -26,3 +29,7 @@ pub enum ApiRequest {
     Async(AsyncRequest),
     Sync(SyncRequest),
 }
+
+pub trait IntoParsedRequest {
+    fn into_parsed_request(self, method: Method) -> result::Result<ParsedRequest, String>;
+}

api_server/src/request/sync/machine_configuration.rs

@@ -1,10 +1,10 @@
 use std::result;
 
 use futures::sync::oneshot;
-use hyper::{Response, StatusCode};
+use hyper::{Method, Response, StatusCode};
 
 use http_service::{empty_response, json_fault_message, json_response};
-use request::{ParsedRequest, SyncRequest};
+use request::{IntoParsedRequest, ParsedRequest, SyncRequest};
 use request::sync::GenerateResponse;
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
@@ -55,8 +55,8 @@ impl GenerateResponse for PutMachineConfigurationOutcome {
     }
 }
 
-impl MachineConfigurationBody {
-    pub fn into_parsed_request(self) -> result::Result<ParsedRequest, String> {
+impl IntoParsedRequest for MachineConfigurationBody {
+    fn into_parsed_request(self, _method: Method) -> result::Result<ParsedRequest, String> {
         let (sender, receiver) = oneshot::channel();
         Ok(ParsedRequest::Sync(
             SyncRequest::PutMachineConfiguration(self, sender),
@@ -116,7 +116,7 @@ mod tests {
         let (sender, receiver) = oneshot::channel();
         assert!(
             body.clone()
-                .into_parsed_request()
+                .into_parsed_request(Method::Put)
                 .eq(&Ok(ParsedRequest::Sync(
                     SyncRequest::PutMachineConfiguration(body, sender),
                     receiver