update deps

Author: jclulow

Cargo.lock

@@ -45,45 +45,48 @@ glob = "0.3"
 hiercmd = { git = "https://github.com/jclulow/hiercmd" }
 hmac-sha256 = "1"
 html-escape = "0.2"
-http = "0.2"
+http = "1"
+http-body-util = "0.1"
 http-range = "0.1"
-hyper = "0.14"
+hyper = "1"
 ipnet = "2.8"
 jmclib = { git = "https://github.com/jclulow/rust-jmclib", features = ["sqlite"] }
 libc = "0.2.113"
 new_mime_guess = "4"
 octorust = { git = "https://github.com/oxidecomputer/third-party-api-clients", branch = "jclulow" }
-pem = "2"
+pem = "3"
 percent-encoding = "2.1"
-progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+progenitor = { version = "0.9.1" }
+progenitor-client = { version = "0.9.1" }
 rand = "0.8"
 regex = "1"
-reqwest = { version = "0.11", features = [ "json", "stream" ] }
+reqwest = { version = "0.12", features = [ "json", "stream" ] }
 rust-toolchain-file = "0.1"
-rusty_ulid = "1"
+rusty_ulid = "2"
 schemars = { version = "0.8", features = [ "chrono" ] }
-sea-query = { version = "0.30", default-features = false, features = [ "derive", "attr", "backend-sqlite" ] }
-sea-query-rusqlite = "0.5"
+sea-query = { version = "0.32", default-features = false, features = [ "derive", "attr", "backend-sqlite" ] }
+sea-query-rusqlite = "0.7"
+semver = "1"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
 serde_repr = "0.1"
 serde_urlencoded = "0.7"
-serde_with = "1.10"
+serde_with = "3"
 serde_yaml = "0.9"
 sigpipe = "0.1"
 slog = { version = "2.7", features = [ "release_max_level_debug" ] }
 slog-bunyan = "2.4"
 slog-term = "2.7"
 smf = { git = "https://github.com/illumos/smf-rs.git" }
 strip-ansi-escapes = "0.2"
-strum = { version = "0.25", features = [ "derive" ] }
+strum = { version = "0.26", features = [ "derive" ] }
 tempfile = "3.3"
-thiserror = "1"
+thiserror = "2"
 tlvc = { git = "https://github.com/oxidecomputer/tlvc", version = "0.3.1" }
 tlvc-text = { git = "https://github.com/oxidecomputer/tlvc", version = "0.3.0" }
 tokio = { version = "1", features = [ "full" ] }
 tokio-stream = "0.1"
-tokio-util = { version = "0.6.9", features = [ "io" ] }
+tokio-util = { version = "0.7", features = [ "io" ] }
 toml = "0.8"
 usdt = "0.5"
 zone = { version = "0.3", features = [ "async" ], default-features = false }

Cargo.toml

@@ -14,6 +14,7 @@ anyhow = { workspace = true }
 chrono = { workspace = true }
 futures = { workspace = true }
 progenitor = { workspace = true }
+progenitor-client = { workspace = true }
 reqwest = { workspace = true }
 rusty_ulid = { workspace = true }
 serde = { workspace = true }

client/Cargo.toml

@@ -325,12 +325,14 @@ macro_rules! sqlite_ulid_new_type {
             }
 
             pub fn datetime(&self) -> chrono::DateTime<chrono::Utc> {
-                self.0.datetime()
+                chrono::DateTime::from_timestamp_millis(
+                    self.0.timestamp().try_into().unwrap()
+                ).unwrap()
             }
 
             pub fn age(&self) -> std::time::Duration {
                 chrono::Utc::now()
-                    .signed_duration_since(self.0.datetime())
+                    .signed_duration_since(self.datetime())
                     .to_std()
                     .unwrap_or_else(|_| std::time::Duration::from_secs(0))
             }

database/src/lib.rs

@@ -13,6 +13,7 @@ aws-sdk-s3 = { workspace = true }
 bytes = { workspace = true }
 dropshot = { workspace = true }
 futures = { workspace = true }
+http-body-util = { workspace = true }
 http-range = { workspace = true }
 hyper = { workspace = true }
 reqwest = { workspace = true }

download/Cargo.toml

@@ -9,7 +9,8 @@ use std::os::unix::fs::FileExt;
 
 use anyhow::Result;
 use bytes::BytesMut;
-use hyper::{Body, Response};
+use dropshot::Body;
+use hyper::{body::Frame, Response};
 use slog::{o, Logger};
 use tokio::sync::mpsc;
 
@@ -128,7 +129,7 @@ pub async fn stream_from_file(
                      */
                     let buf = buf.freeze();
                     sw.add_bytes(buf.len());
-                    if tx.send(Ok(buf)).await.is_err() {
+                    if tx.send(Ok(Frame::data(buf))).await.is_err() {
                         sw.fail(&log, "interrupted on client side").ok();
                         return;
                     }

download/src/kinds/file.rs

@@ -5,7 +5,8 @@
 use super::sublude::*;
 
 use anyhow::{anyhow, bail, Result};
-use hyper::{Body, Response};
+use dropshot::Body;
+use hyper::{body::Frame, Response};
 use slog::{o, Logger};
 use tokio::sync::mpsc;
 
@@ -156,7 +157,7 @@ pub async fn stream_from_s3(
                      * Pass the read bytes onto the client.
                      */
                     sw.add_bytes(data.len());
-                    if tx.send(Ok(data)).await.is_err() {
+                    if tx.send(Ok(Frame::data(data))).await.is_err() {
                         sw.fail(&log, "interrupted on client side").ok();
                         return;
                     }

download/src/kinds/s3.rs

@@ -6,10 +6,12 @@ use super::sublude::*;
 
 use anyhow::{anyhow, bail, Result};
 
+use dropshot::Body;
 use futures::TryStreamExt;
 use hyper::{
+    body::Frame,
     header::{CONTENT_LENGTH, CONTENT_RANGE, RANGE},
-    Body, Response, StatusCode,
+    Response, StatusCode,
 };
 use slog::{o, Logger};
 use tokio::sync::mpsc;
@@ -200,7 +202,7 @@ pub async fn stream_from_url(
                      * Pass the read bytes onto the client.
                      */
                     sw.add_bytes(data.len());
-                    if tx.send(Ok(data)).await.is_err() {
+                    if tx.send(Ok(Frame::data(data))).await.is_err() {
                         sw.fail(&log, "interrupted on client side").ok();
                         return;
                     }

download/src/kinds/url.rs

@@ -5,9 +5,12 @@
 use anyhow::Result;
 use bytes::Bytes;
 
+use dropshot::Body;
+use http_body_util::StreamBody;
 use hyper::{
+    body::Frame,
     header::{ACCEPT_RANGES, CONTENT_LENGTH, CONTENT_RANGE, CONTENT_TYPE},
-    Body, Response, StatusCode,
+    Response, StatusCode,
 };
 
 use tokio::sync::mpsc;
@@ -24,7 +27,7 @@ fn bad_range_response(file_size: u64) -> Response<Body> {
         .status(StatusCode::RANGE_NOT_SATISFIABLE)
         .header(ACCEPT_RANGES, "bytes")
         .header(CONTENT_RANGE, format!("bytes */{file_size}"))
-        .body(hyper::Body::empty())
+        .body(Body::wrap(http_body_util::Empty::new()))
         .unwrap()
 }
 
@@ -37,7 +40,7 @@ fn make_get_response<E>(
     crange: Option<SingleRange>,
     file_length: u64,
     content_type: Option<&str>,
-    rx: mpsc::Receiver<std::result::Result<Bytes, E>>,
+    rx: mpsc::Receiver<std::result::Result<Frame<Bytes>, E>>,
 ) -> Result<Response<Body>>
 where
     E: Into<Box<(dyn std::error::Error + Send + Sync + 'static)>>
@@ -46,7 +49,9 @@ where
         + 'static,
 {
     Ok(make_response_common(crange, file_length, content_type)?.body(
-        Body::wrap_stream(tokio_stream::wrappers::ReceiverStream::new(rx)),
+        Body::wrap(StreamBody::new(
+            tokio_stream::wrappers::ReceiverStream::new(rx),
+        )),
     )?)
 }
 
@@ -61,7 +66,7 @@ fn make_head_response(
     content_type: Option<&str>,
 ) -> Result<Response<Body>> {
     Ok(make_response_common(crange, file_length, content_type)?
-        .body(Body::empty())?)
+        .body(Body::wrap(http_body_util::Empty::new()))?)
 }
 
 fn make_response_common(

download/src/lib.rs

@@ -6,6 +6,7 @@ use std::time::{Duration, Instant};
 
 use anyhow::{anyhow, Result};
 use bytes::Bytes;
+use hyper::body::Frame;
 use slog::{error, info, Logger};
 
 pub struct Stopwatch {
@@ -51,7 +52,7 @@ impl Stopwatch {
         );
     }
 
-    pub fn fail(self, log: &Logger, how: &str) -> Result<Bytes> {
+    pub fn fail(self, log: &Logger, how: &str) -> Result<Frame<Bytes>> {
         let (dur, rate_mb) = self.complete_common();
         let msg = format!("download failed: {}: {}", self.info, how);