github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-01 05:04:26 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: add POST method to shim-client

Browse Source 
partly refactored shim-client to reuse code, added POST method
support, and made path string constants public for client imports.

Fixes #5341

Signed-off-by: Tingzhou Yuan <tzyuan15@bu.edu>
This commit is contained in:
Tingzhou Yuan 2022-12-06 05:59:18 +00:00
parent cae78a6851
commit 2d4b2cf72c
1 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/libs/shim-interface/src/shim_mgmt/client.rs
View File

@ -35,7 +35,7 @@ impl MgmtClient {
let unix_socket_path = mgmt_socket_addr(sid).context("Failed to get unix socket path")?; let unix_socket_path = mgmt_socket_addr(sid).context("Failed to get unix socket path")?;
let s_addr = unix_socket_path let s_addr = unix_socket_path
.strip_prefix("unix:") .strip_prefix("unix:")
.context("failed to strix prefix")?; .context("failed to strip prefix")?;
let sock_path = Path::new("/").join(s_addr).as_path().to_owned(); let sock_path = Path::new("/").join(s_addr).as_path().to_owned();
let client = Client::unix(); let client = Client::unix();
Ok(Self { Ok(Self {
@ -49,32 +49,52 @@ impl MgmtClient {
/// Parameter uri should be like "/agent-url" etc. /// Parameter uri should be like "/agent-url" etc.
pub async fn get(&self, uri: &str) -> Result<Response<Body>> { pub async fn get(&self, uri: &str) -> Result<Response<Body>> {
let url: hyper::Uri = Uri::new(&self.sock_path, uri).into(); let url: hyper::Uri = Uri::new(&self.sock_path, uri).into();
let work = self.client.get(url); let req = Request::builder()
match self.timeout { .method(Method::GET)
Some(timeout) => match tokio::time::timeout(timeout, work).await { .uri(url)
Ok(result) => result.map_err(|e| anyhow!(e)), .body(Body::empty())?;
Err(_) => Err(anyhow!("TIMEOUT")), return self.send_request(req).await;
},
// if timeout not set, work executes directly
None => work.await.context("failed to GET"),
} }
/// The HTTP Post method for client
pub async fn post(
&self,
uri: &str,
content_type: &str,
content: &str,
) -> Result<Response<Body>> {
let url: hyper::Uri = Uri::new(&self.sock_path, uri).into();
// build body from content
let body = Body::from(content.to_string());
let req = Request::builder()
.method(Method::POST)
.uri(url)
.header("content-type", content_type)
.body(body)?;
return self.send_request(req).await;
} }
/// The http PUT method for client /// The http PUT method for client
pub async fn put(&self, uri: &str, data: Vec<u8>) -> Result<Response<Body>> { pub async fn put(&self, uri: &str, data: Vec<u8>) -> Result<Response<Body>> {
let url: hyper::Uri = Uri::new(&self.sock_path, uri).into(); let url: hyper::Uri = Uri::new(&self.sock_path, uri).into();
let request = Request::builder() let req = Request::builder()
.method(Method::PUT) .method(Method::PUT)
.uri(url) .uri(url)
.body(Body::from(data)) .body(Body::from(data))?;
.unwrap(); return self.send_request(req).await;
let work = self.client.request(request); }
async fn send_request(&self, req: Request<Body>) -> Result<Response<Body>> {
let msg = format!("Request ({:?}) to uri {:?}", req.method(), req.uri());
let resp = self.client.request(req);
match self.timeout { match self.timeout {
Some(timeout) => match tokio::time::timeout(timeout, work).await { Some(timeout) => match tokio::time::timeout(timeout, resp).await {
Ok(result) => result.map_err(|e| anyhow!(e)), Ok(result) => result.map_err(|e| anyhow!(e)),
Err(_) => Err(anyhow!("TIMEOUT")), Err(_) => Err(anyhow!("{:?} timeout after {:?}", msg, self.timeout)),
}, },
None => work.await.context("failed to PUT"), // if client timeout is not set, request waits with no deadline
None => resp.await.context(format!("{:?} failed", msg)),
} }
} }
} }