Skip to content

fix: print error body for pocketic responses #4297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: print error body for pocketic responses #4297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions src/dfx/src/actors/pocketic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ use dfx_core::config::model::replica_config::CachedConfig;
use dfx_core::config::model::replica_config::ReplicaConfig;
#[cfg(unix)]
use dfx_core::json::save_json_file;
use reqwest::Response;
use slog::{debug, error, warn, Logger};
use std::net::SocketAddr;
use std::ops::ControlFlow::{self, *};
Expand Down Expand Up @@ -415,7 +416,8 @@ async fn initialize_pocketic(
})
.send()
.await?
.error_for_status()?
.check_http_err()
.await?
.json::<CreateInstanceResponse>()
.await?;
let instance = match resp {
Expand Down Expand Up @@ -449,7 +451,8 @@ async fn initialize_pocketic(
})
.send()
.await?
.error_for_status()?;
.check_http_err()
.await?;
init_client
.post(format!(
"http://localhost:{port}/instances/{instance}/auto_progress"
Expand All @@ -459,7 +462,8 @@ async fn initialize_pocketic(
})
.send()
.await?
.error_for_status()?;
.check_http_err()
.await?;

let agent_url = format!("http://localhost:{port}/instances/{instance}/");

Expand Down Expand Up @@ -518,7 +522,8 @@ async fn initialize_gateway(
})
.send()
.await?
.error_for_status()?;
.check_http_err()
.await?;
let resp = resp.json::<CreateHttpGatewayResponse>().await?;
let instance = match resp {
CreateHttpGatewayResponse::Created(info) => info.instance_id,
Expand Down Expand Up @@ -556,17 +561,39 @@ async fn shutdown_pocketic(
))
.send()
.await?
.error_for_status()?;
.check_http_err()
.await?;
shutdown_client
.delete(format!(
"http://localhost:{port}/instances/{server_instance}"
))
.send()
.await?
.error_for_status()?;
.check_http_err()
.await?;
Ok(())
}

trait ResponseExt {
async fn check_http_err(self) -> DfxResult<Response>;
}

impl ResponseExt for Response {
async fn check_http_err(self) -> DfxResult<Response> {
let status = self.status();
if status.is_client_error() || status.is_server_error() {
bail!(
"{} {}: {}",
status.as_str(),
status.canonical_reason().unwrap(),
self.text().await?
);
} else {
Ok(self)
}
}
}

#[cfg(not(unix))]
fn shutdown_pocketic(_: u16, _: usize, _: usize, _: Logger) -> DfxResult {
bail!("PocketIC not supported on this platform")
Expand Down