Update Omicron and Dropshot dependency (#1388)

Picks up new `log_headers` field in Dropshot configuration type

Author: bnaecker

Cargo.lock

@@ -1,4 +1,4 @@
-// Copyright 2021 Oxide Computer Company
+// Copyright 2024 Oxide Computer Company
 use super::datafile::DataFile;
 use super::model;
 use anyhow::{anyhow, Result};
@@ -14,16 +14,6 @@ use std::net::SocketAddr;
 use std::result::Result as SResult;
 use std::sync::Arc;
 
-trait AnyhowFromString<T> {
-    fn or_bail(self, msg: &str) -> Result<T>;
-}
-
-impl<T> AnyhowFromString<T> for SResult<T, String> {
-    fn or_bail(self, msg: &str) -> Result<T> {
-        self.map_err(|e| anyhow!("{}: {:?}", msg, e))
-    }
-}
-
 #[endpoint {
     method = GET,
     path = "/crucible/0/regions",
@@ -337,24 +327,17 @@ async fn region_delete_running_snapshot(
 pub fn make_api() -> Result<dropshot::ApiDescription<Arc<DataFile>>> {
     let mut api = dropshot::ApiDescription::new();
 
-    api.register(region_list).or_bail("registration failure")?;
-    api.register(region_create)
-        .or_bail("registration failure")?;
-    api.register(region_get).or_bail("registration failure")?;
-    api.register(region_delete)
-        .or_bail("registration failure")?;
-
-    api.register(region_get_snapshots)
-        .or_bail("registration failure")?;
-    api.register(region_get_snapshot)
-        .or_bail("registration failure")?;
-    api.register(region_delete_snapshot)
-        .or_bail("registration failure")?;
-
-    api.register(region_run_snapshot)
-        .or_bail("registration failure")?;
-    api.register(region_delete_running_snapshot)
-        .or_bail("registration failure")?;
+    api.register(region_list)?;
+    api.register(region_create)?;
+    api.register(region_get)?;
+    api.register(region_delete)?;
+
+    api.register(region_get_snapshots)?;
+    api.register(region_get_snapshot)?;
+    api.register(region_delete_snapshot)?;
+
+    api.register(region_run_snapshot)?;
+    api.register(region_delete_running_snapshot)?;
 
     Ok(api)
 }
@@ -371,6 +354,7 @@ pub async fn run_server(
             bind_address,
             request_body_max_bytes: 1024 * 10,
             default_handler_task_mode: HandlerTaskMode::Detached,
+            log_headers: vec![],
         },
         api,
         df,

agent/src/server.rs

@@ -95,10 +95,8 @@ pub async fn run_downstairs_for_region(
 
 fn register_endpoints(
     api_description: &mut ApiDescription<Arc<ServerContext>>,
-) -> Result<(), String> {
-    api_description.register(run_downstairs_for_region)?;
-
-    Ok(())
+) -> Result<(), dropshot::ApiDescriptionRegisterError> {
+    api_description.register(run_downstairs_for_region)
 }
 
 pub async fn run_dropshot(

downstairs/src/admin.rs

@@ -59,6 +59,7 @@ pub fn repair_main(
         bind_address: addr,
         request_body_max_bytes: 1024,
         default_handler_task_mode: HandlerTaskMode::Detached,
+        log_headers: vec![],
     };
 
     /*

downstairs/src/repair.rs

@@ -49,6 +49,7 @@ pub async fn begin(dsci: Arc<DscInfo>, addr: SocketAddr) -> Result<(), String> {
         bind_address: addr,
         request_body_max_bytes: 1024,
         default_handler_task_mode: HandlerTaskMode::Detached,
+        log_headers: vec![],
     };
     println!("start access at:{:?}", addr);
 

dsc/src/control.rs

@@ -432,7 +432,10 @@ async fn detach(
     Ok(HttpResponseDeleted())
 }
 
-pub fn make_api() -> Result<dropshot::ApiDescription<Arc<Pantry>>, String> {
+pub fn make_api() -> Result<
+    dropshot::ApiDescription<Arc<Pantry>>,
+    dropshot::ApiDescriptionRegisterError,
+> {
     let mut api = dropshot::ApiDescription::new();
 
     api.register(pantry_status)?;
@@ -468,6 +471,7 @@ pub fn run_server(
             request_body_max_bytes: 1024
                 + crate::pantry::PantryEntry::MAX_CHUNK_SIZE * 2,
             default_handler_task_mode: HandlerTaskMode::Detached,
+            log_headers: vec![],
         },
         api,
         df.clone(),

pantry/src/server.rs

@@ -37,6 +37,7 @@ pub async fn start(
         bind_address: addr,
         request_body_max_bytes: 1024,
         default_handler_task_mode: HandlerTaskMode::Detached,
+        log_headers: vec![],
     };
 
     /*

upstairs/src/control.rs

@@ -43,7 +43,6 @@ openapiv3 = { version = "2", default-features = false, features = ["skip_seriali
 phf_shared = { version = "0.11" }
 rand = { version = "0.8", features = ["min_const_gen", "small_rng"] }
 rand_chacha = { version = "0.3" }
-rand_core = { version = "0.6", default-features = false, features = ["std"] }
 reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls", "stream"] }
 schemars = { version = "0.8", features = ["bytes", "chrono", "uuid1"] }
 scopeguard = { version = "1" }
@@ -68,27 +67,44 @@ bitflags = { version = "2", default-features = false, features = ["serde", "std"
 bytes = { version = "1", features = ["serde"] }
 cc = { version = "1", default-features = false, features = ["parallel"] }
 chrono = { version = "0.4", features = ["serde"] }
+crossbeam-utils = { version = "0.8" }
+crypto-common = { version = "0.1", default-features = false, features = ["getrandom", "std"] }
+digest = { version = "0.10", features = ["mac", "std"] }
+futures-channel = { version = "0.3", features = ["sink"] }
+futures-core = { version = "0.3" }
+futures-executor = { version = "0.3" }
+futures-sink = { version = "0.3" }
+futures-util = { version = "0.3", features = ["channel", "io", "sink"] }
 getrandom = { version = "0.2", default-features = false, features = ["std"] }
 hashbrown = { version = "0.14", features = ["raw"] }
+hex = { version = "0.4", features = ["serde"] }
 indexmap = { version = "2", features = ["serde"] }
 libc = { version = "0.2", features = ["extra_traits"] }
 log = { version = "0.4", default-features = false, features = ["std"] }
 memchr = { version = "2" }
+num-integer = { version = "0.1", default-features = false, features = ["i128", "std"] }
+num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] }
 num-traits = { version = "0.2", features = ["i128", "libm"] }
 openapiv3 = { version = "2", default-features = false, features = ["skip_serializing_defaults"] }
 phf_shared = { version = "0.11" }
 rand = { version = "0.8", features = ["min_const_gen", "small_rng"] }
 rand_chacha = { version = "0.3" }
-rand_core = { version = "0.6", default-features = false, features = ["std"] }
+reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls", "stream"] }
 schemars = { version = "0.8", features = ["bytes", "chrono", "uuid1"] }
+scopeguard = { version = "1" }
 semver = { version = "1", features = ["serde"] }
 serde = { version = "1", features = ["alloc", "derive", "rc"] }
+slog = { version = "2", features = ["dynamic-keys", "max_level_trace", "release_max_level_debug"] }
 syn = { version = "2", features = ["extra-traits", "full", "visit", "visit-mut"] }
 time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] }
 time-macros = { version = "0.2", default-features = false, features = ["formatting", "parsing"] }
+tokio = { version = "1", features = ["full", "test-util"] }
 toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
+tracing = { version = "0.1" }
+tracing-core = { version = "0.1" }
 unicode-bidi = { version = "0.3" }
 unicode-normalization = { version = "0.1" }
+usdt = { version = "0.5" }
 usdt-impl = { version = "0.5", default-features = false, features = ["asm", "des"] }
 uuid = { version = "1", features = ["serde", "v4"] }
 zerocopy = { version = "0.7", features = ["derive", "simd"] }
@@ -104,7 +120,11 @@ spin = { version = "0.9", default-features = false, features = ["once", "spin_mu
 
 [target.x86_64-unknown-linux-gnu.build-dependencies]
 dof = { version = "0.3", default-features = false, features = ["des"] }
+hyper = { version = "0.14", features = ["full"] }
+mio = { version = "0.8", features = ["net", "os-ext"] }
 once_cell = { version = "1", features = ["unstable"] }
+rustls = { version = "0.21", features = ["dangerous_configuration"] }
+spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] }
 
 [target.aarch64-apple-darwin.dependencies]
 hyper = { version = "0.14", features = ["full"] }
@@ -114,7 +134,11 @@ rustix = { version = "0.38", features = ["fs", "termios"] }
 rustls = { version = "0.21", features = ["dangerous_configuration"] }
 
 [target.aarch64-apple-darwin.build-dependencies]
+hyper = { version = "0.14", features = ["full"] }
+mio = { version = "0.8", features = ["net", "os-ext"] }
 once_cell = { version = "1", features = ["unstable"] }
+rustix = { version = "0.38", features = ["fs", "termios"] }
+rustls = { version = "0.21", features = ["dangerous_configuration"] }
 
 [target.x86_64-unknown-illumos.dependencies]
 dof = { version = "0.3", default-features = false, features = ["des"] }
@@ -127,6 +151,10 @@ spin = { version = "0.9", default-features = false, features = ["once", "spin_mu
 
 [target.x86_64-unknown-illumos.build-dependencies]
 dof = { version = "0.3", default-features = false, features = ["des"] }
+hyper = { version = "0.14", features = ["full"] }
+mio = { version = "0.8", features = ["net", "os-ext"] }
 once_cell = { version = "1", features = ["unstable"] }
+rustls = { version = "0.21", features = ["dangerous_configuration"] }
+spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] }
 
 ### END HAKARI SECTION