diff --git a/Cargo.lock b/Cargo.lock index 6559bd543..a2648f3d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6670,13 +6670,13 @@ dependencies = [ [[package]] name = "progenitor" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bd395aa613c6491be9233fae4a870a35cd611655c0ef1cbaae7aa9e1c4c0e6" +checksum = "5f7d37bf1319f2c7abbb95eb340a4be8545b78be1a5d1acde2dcc90b4a04f21d" dependencies = [ - "progenitor-client 0.15.1", - "progenitor-impl 0.15.1", - "progenitor-macro 0.15.1", + "progenitor-client 0.16.0", + "progenitor-impl 0.16.0", + "progenitor-macro 0.16.0", ] [[package]] @@ -6741,9 +6741,9 @@ dependencies = [ [[package]] name = "progenitor-client" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa13eb6d9499a851512ec8fa3280f586be059682da4f05d953924be45d736f0" +checksum = "4f4df47ce7fa035b40e92b2f23e3df1c6c7147c2412e6fccb5be886b26c47118" dependencies = [ "bytes", "futures-core", @@ -6856,9 +6856,9 @@ dependencies = [ [[package]] name = "progenitor-impl" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d9fbe5a1aa114c6c7c507a30ebeb0b12de383edab951ea27300210a3841917c" +checksum = "8bb884f6f3c6e929084116b4745cedf49736240bf783a2f35e058df1f63032c8" dependencies = [ "heck 0.5.0", "http", @@ -6950,13 +6950,13 @@ dependencies = [ [[package]] name = "progenitor-macro" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dccde5096e96f6a57e16af4a4ac575755d5973f0c1bd4e6b7b86808932a33408" +checksum = "3d3ac585095745668515f7600f3bc656a0f612f8875adf75830eaebdf1e61661" dependencies = [ "openapiv3", "proc-macro2", - "progenitor-impl 0.15.1", + "progenitor-impl 0.16.0", "quote", "schemars 0.8.22", "serde", @@ -7085,8 +7085,8 @@ dependencies = [ "base64 0.21.7", "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=bd62980710dd3d6d3524aa7f6617127942b75002)", "futures", - "progenitor 0.15.1", - "progenitor-client 0.15.1", + "progenitor 0.16.0", + "progenitor-client 0.16.0", "propolis-api-types-versions 0.0.0", "rand 0.9.2", "reqwest 0.13.5", @@ -7162,7 +7162,7 @@ dependencies = [ "dropshot 0.18.0", "futures", "hyper", - "progenitor 0.15.1", + "progenitor 0.16.0", "propolis-api-types-versions 0.0.0", "propolis_api_types 0.0.0", "propolis_types 0.0.0", diff --git a/Cargo.toml b/Cargo.toml index c6c308172..bb0fd5033 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -155,8 +155,8 @@ paste = "1.0.15" pin-project-lite = "0.2.13" proc-macro2 = "1.0" proc-macro-error = "1" -progenitor = "0.15.1" -progenitor-client = "0.15.1" +progenitor = "0.16.0" +progenitor-client = "0.16.0" proptest = "1.5.0" quote = "1.0" rand = "0.9.1" diff --git a/bin/propolis-cli/src/main.rs b/bin/propolis-cli/src/main.rs index 72ba175b4..5720b234c 100644 --- a/bin/propolis-cli/src/main.rs +++ b/bin/propolis-cli/src/main.rs @@ -920,7 +920,7 @@ async fn main() -> anyhow::Result<()> { let log = create_logger(&opt); let addr = SocketAddr::new(opt.server, opt.port); - let client = Client::new(&format!("http://{addr}")); + let client = Client::new(&format!("http://{addr}"))?; match opt.cmd { Command::New { @@ -964,7 +964,7 @@ async fn main() -> anyhow::Result<()> { } Command::Migrate { dst_server, dst_port, dst_uuid, crucible_disks } => { let dst_addr = SocketAddr::new(dst_server, dst_port); - let dst_client = Client::new(&format!("http://{dst_addr}")); + let dst_client = Client::new(&format!("http://{dst_addr}"))?; let dst_uuid = dst_uuid.unwrap_or_else(Uuid::new_v4); let disks = if let Some(crucible_disks) = crucible_disks { parse_json_file(&crucible_disks)? diff --git a/lib/propolis-client/src/support.rs b/lib/propolis-client/src/support.rs index af6c1b26b..19552a2d2 100644 --- a/lib/propolis-client/src/support.rs +++ b/lib/propolis-client/src/support.rs @@ -96,7 +96,8 @@ impl SerialConsoleStreamBuilder for PropolisSerialBuilder { address: SocketAddr, offset: WSClientOffset, ) -> Result, WSError> { - let client = PropolisClient::new(&format!("http://{address}")); + let client = PropolisClient::new(&format!("http://{address}")) + .map_err(|e| WSError::Io(std::io::Error::other(e)))?; let mut req = client.instance_serial(); match offset { diff --git a/phd-tests/framework/src/test_vm/mod.rs b/phd-tests/framework/src/test_vm/mod.rs index 6514d46c7..8299905b6 100644 --- a/phd-tests/framework/src/test_vm/mod.rs +++ b/phd-tests/framework/src/test_vm/mod.rs @@ -361,7 +361,7 @@ impl TestVm { &vm_spec.bootrom_path, )?; - let client = Client::new(&format!("http://{server_addr}")); + let client = Client::new(&format!("http://{server_addr}"))?; let guest_os = guest_os::get_guest_os_adapter(vm_spec.guest_os_kind); Ok(Self { id: vm_id,