From 0930b1f16091ec59afe9e9294213b3c2a6c00988 Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 03:11:45 +0000
Subject: [PATCH] Update Rust crate hyper to v0.14.30

---
 Cargo.lock                | 49 ++++++++++++++++++++-------------------
 Cargo.toml                |  6 ++---
 workspace-hack/Cargo.toml |  6 +++--
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index df8eaf2e811..490e1d8daed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2042,7 +2042,7 @@ dependencies = [
  "futures",
  "hostname 0.4.0",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "indexmap 2.2.6",
  "multer",
  "openapiv3",
@@ -2220,7 +2220,7 @@ dependencies = [
  "dhcproto",
  "http 0.2.12",
  "humantime",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "internet-checksum",
  "ispf",
  "macaddr",
@@ -3203,7 +3203,7 @@ dependencies = [
  "form_urlencoded",
  "futures",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "log",
  "once_cell",
  "regex",
@@ -3281,9 +3281,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "0.14.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -3296,7 +3296,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.7",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -3330,7 +3330,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "rustls 0.21.12",
  "tokio",
  "tokio-rustls 0.24.1",
@@ -3365,7 +3365,7 @@ dependencies = [
  "http 0.2.12",
  "http-range",
  "httpdate",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "mime_guess",
  "percent-encoding",
  "rand 0.8.5",
@@ -3381,7 +3381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "native-tls",
  "tokio",
  "tokio-native-tls",
@@ -3657,7 +3657,7 @@ dependencies = [
  "clap",
  "dropshot",
  "expectorate",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "installinator-common",
  "omicron-common",
  "omicron-test-utils",
@@ -3713,7 +3713,7 @@ dependencies = [
  "dropshot",
  "expectorate",
  "futures",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "omicron-common",
  "omicron-test-utils",
  "omicron-uuid-kinds",
@@ -4026,7 +4026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -4504,7 +4504,7 @@ dependencies = [
  "futures",
  "headers",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "newtype_derive",
  "nexus-db-fixed-data",
  "nexus-db-model",
@@ -4920,7 +4920,7 @@ dependencies = [
  "gateway-test-utils",
  "headers",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "illumos-utils",
  "internal-dns",
  "nexus-config",
@@ -5444,7 +5444,7 @@ dependencies = [
  "gateway-test-utils",
  "hex",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "illumos-utils",
  "ipcc",
  "omicron-common",
@@ -5508,7 +5508,7 @@ dependencies = [
  "http 0.2.12",
  "httptest",
  "hubtools",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "hyper-rustls 0.26.0",
  "illumos-utils",
  "internal-dns",
@@ -5783,7 +5783,7 @@ dependencies = [
  "guppy",
  "hex",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "hyper-staticfile",
  "illumos-utils",
  "installinator-common",
@@ -5944,7 +5944,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "hex",
  "hmac",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "indexmap 2.2.6",
  "inout",
  "ipnetwork",
@@ -5986,6 +5986,7 @@ dependencies = [
  "similar",
  "slog",
  "smallvec 1.13.2",
+ "socket2 0.5.7",
  "spin 0.9.8",
  "string_cache",
  "subtle",
@@ -6220,7 +6221,7 @@ dependencies = [
  "chrono",
  "futures",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "omicron-workspace-hack",
  "progenitor",
  "rand 0.8.5",
@@ -6292,7 +6293,7 @@ dependencies = [
  "dropshot",
  "expectorate",
  "futures",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "internal-dns",
  "nexus-client",
  "nexus-types",
@@ -6409,7 +6410,7 @@ dependencies = [
  "dropshot",
  "futures",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "kstat-rs",
  "libc",
  "omicron-workspace-hack",
@@ -7328,7 +7329,7 @@ dependencies = [
  "clap",
  "dropshot",
  "futures",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "progenitor",
  "propolis_types 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=5ebf9626e0ad274eb515d206d102cb09d2d51f15)",
  "rand 0.8.5",
@@ -7809,7 +7810,7 @@ dependencies = [
  "h2",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "hyper-rustls 0.24.2",
  "hyper-tls",
  "ipnet",
@@ -11130,7 +11131,7 @@ dependencies = [
  "hex",
  "http 0.2.12",
  "hubtools",
- "hyper 0.14.28",
+ "hyper 0.14.30",
  "illumos-utils",
  "installinator",
  "installinator-artifact-client",
diff --git a/Cargo.toml b/Cargo.toml
index c122e74345e..f217bcd1699 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -231,7 +231,7 @@ approx = "0.5.1"
 assert_matches = "1.5.0"
 assert_cmd = "2.0.14"
 async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "ed7ab5ef0513ba303d33efd41d3e9e381169d59b" }
-async-trait = "0.1.81"
+async-trait = "0.1.80"
 atomicwrites = "0.4.3"
 authz-macros = { path = "nexus/authz-macros" }
 backoff = { version = "0.4.0", features = [ "tokio" ] }
@@ -384,7 +384,7 @@ oso = "0.27"
 owo-colors = "4.0.0"
 oximeter = { path = "oximeter/oximeter" }
 oximeter-client = { path = "clients/oximeter-client" }
-oximeter-db = { path = "oximeter/db/", default-features = false }
+oximeter-db = { path = "oximeter/db/" }
 oximeter-collector = { path = "oximeter/collector" }
 oximeter-impl = { path = "oximeter/impl" }
 oximeter-instruments = { path = "oximeter/instruments" }
@@ -433,7 +433,7 @@ rustls = "0.22.2"
 rustls-pemfile = "2.1.2"
 rustyline = "14.0.0"
 samael = { version = "0.0.15", features = ["xmlsec"] }
-schemars = "0.8.21"
+schemars = "0.8.16"
 secrecy = "0.8.0"
 semver = { version = "1.0.23", features = ["std", "serde"] }
 serde = { version = "1.0", default-features = false, features = [ "derive", "rc" ] }
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 977936d6533..940f3117fb2 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -60,7 +60,7 @@ group = { version = "0.13.0", default-features = false, features = ["alloc"] }
 hashbrown = { version = "0.14.5", features = ["raw"] }
 hex = { version = "0.4.3", features = ["serde"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
-hyper = { version = "0.14.28", features = ["full"] }
+hyper = { version = "0.14.30", features = ["full"] }
 indexmap = { version = "2.2.6", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 ipnetwork = { version = "0.20.0", features = ["schemars"] }
@@ -98,6 +98,7 @@ sha2 = { version = "0.10.8", features = ["oid"] }
 similar = { version = "2.5.0", features = ["inline", "unicode"] }
 slog = { version = "2.7.0", features = ["dynamic-keys", "max_level_trace", "release_max_level_debug", "release_max_level_trace"] }
 smallvec = { version = "1.13.2", default-features = false, features = ["const_new"] }
+socket2 = { version = "0.5.7", default-features = false, features = ["all"] }
 spin = { version = "0.9.8" }
 string_cache = { version = "0.8.7" }
 subtle = { version = "2.5.0" }
@@ -164,7 +165,7 @@ group = { version = "0.13.0", default-features = false, features = ["alloc"] }
 hashbrown = { version = "0.14.5", features = ["raw"] }
 hex = { version = "0.4.3", features = ["serde"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
-hyper = { version = "0.14.28", features = ["full"] }
+hyper = { version = "0.14.30", features = ["full"] }
 indexmap = { version = "2.2.6", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 ipnetwork = { version = "0.20.0", features = ["schemars"] }
@@ -202,6 +203,7 @@ sha2 = { version = "0.10.8", features = ["oid"] }
 similar = { version = "2.5.0", features = ["inline", "unicode"] }
 slog = { version = "2.7.0", features = ["dynamic-keys", "max_level_trace", "release_max_level_debug", "release_max_level_trace"] }
 smallvec = { version = "1.13.2", default-features = false, features = ["const_new"] }
+socket2 = { version = "0.5.7", default-features = false, features = ["all"] }
 spin = { version = "0.9.8" }
 string_cache = { version = "0.8.7" }
 subtle = { version = "2.5.0" }