Merge branch 'main' into renovate/rusqlite-0.x

Author: leftwo

Cargo.lock

@@ -78,11 +78,13 @@ rayon = "1.10.0"
 rand = { version = "0.8.5", features = ["min_const_gen", "small_rng"] }
 rand_chacha = "0.3.1"
 reedline = "0.38.0"
+rangemap = "1.5.1"
 reqwest = { version = "0.12", features = ["default", "blocking", "json", "stream"] }
 ringbuffer = "0.15.0"
 rusqlite = { version = "0.34" }
 rustls-pemfile = { version = "1.0.4" }
 schemars = { version = "0.8", features = [ "chrono", "uuid1" ] }
+semver = "1"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
 sha2 = "0.10"
@@ -114,7 +116,7 @@ usdt = "0.5.0"
 uuid = { version = "1", features = [ "serde", "v4" ] }
 
 # git
-dropshot = { version = "0.12.0", features = [ "usdt-probes" ] }
+dropshot = { version = "0.16.0", features = [ "usdt-probes" ] }
 omicron-common = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
 nexus-client = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
 internal-dns = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }

Cargo.toml

@@ -16,6 +16,7 @@ http.workspace = true
 hyper.workspace = true
 omicron-common.workspace = true
 schemars.workspace = true
+semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 slog.workspace = true

agent/Cargo.toml

@@ -3,6 +3,7 @@
 use anyhow::{anyhow, bail, Result};
 use clap::Parser;
 use dropshot::{ConfigLogging, ConfigLoggingIfExists, ConfigLoggingLevel};
+use semver::Version;
 use slog::{debug, error, info, o, Logger};
 use std::collections::HashSet;
 use std::io::Write;
@@ -341,7 +342,8 @@ async fn main() -> Result<()> {
 
 fn write_openapi<W: Write>(f: &mut W) -> Result<()> {
     let api = server::make_api()?;
-    api.openapi("Crucible Agent", "0.0.0").write(f)?;
+    api.openapi("Crucible Agent", Version::new(0, 0, 1))
+        .write(f)?;
     Ok(())
 }
 

agent/src/main.rs

@@ -352,7 +352,7 @@ pub async fn run_server(
     let server = dropshot::HttpServerStarter::new(
         &dropshot::ConfigDropshot {
             bind_address,
-            request_body_max_bytes: 1024 * 10,
+            default_request_body_max_bytes: 1024 * 10,
             default_handler_task_mode: HandlerTaskMode::Detached,
             log_headers: vec![],
         },