Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
532 changes: 307 additions & 225 deletions Cargo.lock

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -494,9 +494,9 @@ dns-server = { path = "dns-server" }
dns-server-api = { path = "dns-server-api" }
dns-service-client = { path = "clients/dns-service-client" }
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "44a949c9bedf4fcd4d280337fa1965b4293c88d1" }
dropshot = { version = "0.16.6", features = [ "usdt-probes" ] }
dropshot-api-manager = "0.6.0"
dropshot-api-manager-types = "0.6.0"
dropshot = { version = "0.17.0", features = [ "usdt-probes" ] }
dropshot-api-manager = "0.7.1"
dropshot-api-manager-types = "0.7.1"
dyn-clone = "1.0.20"
either = "1.15.0"
ereport-types = { path = "ereport/types" }
Expand Down Expand Up @@ -709,9 +709,9 @@ pretty_assertions = "1.4.1"
pretty-hex = "0.4.1"
prettyplease = { version = "0.2.36", features = ["verbatim"] }
proc-macro2 = "1.0"
progenitor = "0.13.0"
progenitor-client = "0.13.0"
progenitor-extras = "0.1.1"
progenitor = "0.14.0"
progenitor-client = "0.14.0"
progenitor-extras = "0.2.0"
progenitor-client010 = { package = "progenitor-client", version = "0.10.0" }
# NOTE: if you change the pinned revision of the `bhyve_api` and propolis
# dependencies, you must also update the references in package-manifest.toml to
Expand Down Expand Up @@ -882,8 +882,8 @@ newtype-uuid = { version = "1.3.2", default-features = false }
newtype-uuid-macros = "0.1.0"
omicron-uuid-kinds = { path = "uuid-kinds", features = ["serde", "schemars08", "uuid-v4"] }

scim2-rs = { git = "https://github.com/oxidecomputer/scim2-rs", rev = "c78005db837a71f94c3b8efac9a64cfbdb2d527f" }
scim2-test-client = { git = "https://github.com/oxidecomputer/scim2-rs", rev = "c78005db837a71f94c3b8efac9a64cfbdb2d527f" }
scim2-rs = { git = "https://github.com/oxidecomputer/scim2-rs", rev = "018ae6f7bd752cd9b2124887e00c93c6b4244103" }
scim2-test-client = { git = "https://github.com/oxidecomputer/scim2-rs", rev = "018ae6f7bd752cd9b2124887e00c93c6b4244103" }

# NOTE: The test profile inherits from the dev profile, so settings under
# profile.dev get inherited. AVOID setting anything under profile.test: that
Expand Down
10 changes: 8 additions & 2 deletions dev-tools/dropshot-apis/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,9 @@ fn all_apis() -> anyhow::Result<ManagedApis> {
}),
ManagedApi::from(ManagedApiConfig {
title: "Oxide Management Gateway Service API",
versions: Versions::new_versioned(gateway_api::supported_versions()),
versions: Versions::new_versioned(
gateway_api::supported_versions(),
),
metadata: ManagedApiMetadata {
description: Some(
"API for interacting with the Oxide \
Expand All @@ -186,7 +188,11 @@ fn all_apis() -> anyhow::Result<ManagedApis> {
},
api_description: gateway_api_mod::stub_api_description,
ident: "gateway",
}),
})
// The MGS API ought to be client-side-versioned (see #9708) but
// currently isn't. Allow trivial changes through so cosmetic dropshot
// spec changes don't force a version bump until #9708 is resolved.
.allow_trivial_changes_for_latest(),
ManagedApi::from(ManagedApiConfig {
title: "Installinator API",
versions: Versions::new_versioned(
Expand Down
1 change: 1 addition & 0 deletions dns-server/tests/basic_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,7 @@ fn test_config(
default_request_body_max_bytes: 1024,
default_handler_task_mode: HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
};

Ok((tmp_dir, config_storage, config_dropshot, logctx))
Expand Down
1 change: 1 addition & 0 deletions dns-server/tests/cross_version_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ fn test_config(
default_request_body_max_bytes: 1024,
default_handler_task_mode: HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
};

Ok((tmp_dir, config_storage, config_dropshot, logctx))
Expand Down
1 change: 1 addition & 0 deletions dns-server/transient/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ impl TransientDnsServer {
default_request_body_max_bytes: 4 * 1024 * 1024,
default_handler_task_mode: dropshot::HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
},
)
.await?;
Expand Down
1 change: 1 addition & 0 deletions gateway/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ fn start_dropshot_server(
default_request_body_max_bytes,
default_handler_task_mode: HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
};

let http_server = dropshot::ServerBuilder::new(
Expand Down
1 change: 1 addition & 0 deletions installinator-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,6 @@ pub fn default_config(bind_address: std::net::SocketAddr) -> ConfigDropshot {
default_request_body_max_bytes: 1024,
default_handler_task_mode: HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
}
}
1 change: 1 addition & 0 deletions internal-dns/resolver/src/resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,7 @@ mod test {
default_request_body_max_bytes: 8 * 1024,
default_handler_task_mode: HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
},
)
.await
Expand Down
1 change: 1 addition & 0 deletions nexus/external-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ api_versions!([
// | date-based version should be at the top of the list.
// v
// (next_yyyy_mm_dd_nn, IDENT),
(2026_04_24_00, DROPSHOT_WEBSOCKET_SPEC_CHANGE),
(2026_04_19_00, INLINE_ROUTER_PEER_IP_ADDR),
(2026_04_16_00, STRONGER_BGP_UNNUMBERED_TYPES),
(2026_03_25_00, SUBNET_POOL_UTILIZATION_REMAINING),
Expand Down
1 change: 1 addition & 0 deletions nexus/src/app/background/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1567,6 +1567,7 @@ pub mod test {
default_request_body_max_bytes: 8 * 1024,
default_handler_task_mode: HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
},
)
.await
Expand Down
1 change: 1 addition & 0 deletions openapi/nexus/nexus-2026041900.0.0-85f64f.json.gitstub
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5579a6d72e5f6be577d2b17ba940ccc0de10decd:openapi/nexus/nexus-2026041900.0.0-85f64f.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://oxide.computer",
"email": "api@oxide.computer"
},
"version": "2026041900.0.0"
"version": "2026042400.0.0"
},
"paths": {
"/device/auth": {
Expand Down Expand Up @@ -5039,13 +5039,14 @@
}
],
"responses": {
"default": {
"description": "",
"content": {
"*/*": {
"schema": {}
}
}
"101": {
"description": "Negotiating protocol upgrade from HTTP/1.1 to WebSocket"
},
"4XX": {
"$ref": "#/components/responses/Error"
},
"5XX": {
"$ref": "#/components/responses/Error"
}
},
"x-dropshot-websocket": {}
Expand Down
2 changes: 1 addition & 1 deletion openapi/nexus/nexus-latest.json
1 change: 1 addition & 0 deletions openapi/sled-agent/sled-agent-35.0.0-93533c.json.gitstub
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5579a6d72e5f6be577d2b17ba940ccc0de10decd:openapi/sled-agent/sled-agent-35.0.0-93533c.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://oxide.computer",
"email": "api@oxide.computer"
},
"version": "35.0.0"
"version": "36.0.0"
},
"paths": {
"/artifacts": {
Expand Down Expand Up @@ -2769,7 +2769,7 @@
],
"responses": {
"200": {
"description": "",
"description": "successful operation",
"content": {
"*/*": {
"schema": {}
Expand Down
2 changes: 1 addition & 1 deletion openapi/sled-agent/sled-agent-latest.json
1 change: 1 addition & 0 deletions oximeter/producer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ impl Server {
default_request_body_max_bytes,
default_handler_task_mode: dropshot::HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
};
let server = Self::build_dropshot_server(&log, &registry, &dropshot)?;

Expand Down
1 change: 1 addition & 0 deletions sled-agent/api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ api_versions!([
// | example for the next person.
// v
// (next_int, IDENT),
(36, DROPSHOT_FREEFORM_BODY_DESC),
(35, INLINE_ROUTER_PEER_IP_ADDR),
(34, MODIFY_SVCS_TYPES),
(33, BOOTSTORE_SERVICE_NAT),
Expand Down
3 changes: 3 additions & 0 deletions sled-agent/src/services.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2409,13 +2409,15 @@ impl ServiceManager {
default_handler_task_mode:
HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
},
},
dropshot_internal: dropshot::ConfigDropshot {
bind_address: (*internal_address).into(),
default_request_body_max_bytes: 1048576,
default_handler_task_mode: HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
},
dropshot_lockstep: dropshot::ConfigDropshot {
bind_address: SocketAddr::new(
Expand All @@ -2425,6 +2427,7 @@ impl ServiceManager {
default_request_body_max_bytes: 1048576,
default_handler_task_mode: HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
},
internal_dns: nexus_config::InternalDns::FromSubnet {
subnet: Ipv6Subnet::<RACK_PREFIX>::new(
Expand Down
1 change: 1 addition & 0 deletions sled-agent/src/sim/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2317,6 +2317,7 @@ impl PantryServer {
default_request_body_max_bytes: 8192 * 1024,
default_handler_task_mode: HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
})
.start()
.expect("Could not initialize pantry server");
Expand Down
1 change: 1 addition & 0 deletions wicketd/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ impl Server {
default_request_body_max_bytes: 8 * 1024 * 1024,
default_handler_task_mode: HandlerTaskMode::Detached,
log_headers: vec![],
compression: dropshot::CompressionConfig::None,
};

let mgs_manager = MgsManager::new(&log, args.mgs_address);
Expand Down
16 changes: 4 additions & 12 deletions workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
hyper = { version = "1.8.1", features = ["full"] }
iddqd = { version = "0.3.17", features = ["daft", "proptest", "schemars08"] }
idna = { version = "1.1.0" }
indexmap = { version = "2.13.0", features = ["serde"] }
indexmap = { version = "2.14.0", features = ["serde"] }
inout = { version = "0.1.4", default-features = false, features = ["std"] }
ipnet = { version = "2.11.0", features = ["serde"] }
ipnetwork = { version = "0.21.1", features = ["schemars", "serde"] }
Expand Down Expand Up @@ -119,7 +119,7 @@ rustls = { version = "0.23.37", features = ["ring"] }
rustls-webpki = { version = "0.103.9", default-features = false, features = ["aws-lc-rs", "ring", "std"] }
schemars = { version = "0.8.22", features = ["bytes", "chrono", "semver", "url", "uuid1"] }
scopeguard = { version = "1.2.0" }
semver = { version = "1.0.27", features = ["serde"] }
semver = { version = "1.0.28", features = ["serde"] }
serde = { version = "1.0.228", features = ["alloc", "derive", "rc"] }
serde_core = { version = "1.0.228", features = ["alloc", "rc"] }
serde_json = { version = "1.0.149", features = ["alloc", "raw_value", "unbounded_depth"] }
Expand Down Expand Up @@ -220,7 +220,7 @@ hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
hyper = { version = "1.8.1", features = ["full"] }
iddqd = { version = "0.3.17", features = ["daft", "proptest", "schemars08"] }
idna = { version = "1.1.0" }
indexmap = { version = "2.13.0", features = ["serde"] }
indexmap = { version = "2.14.0", features = ["serde"] }
inout = { version = "0.1.4", default-features = false, features = ["std"] }
ipnet = { version = "2.11.0", features = ["serde"] }
ipnetwork = { version = "0.21.1", features = ["schemars", "serde"] }
Expand Down Expand Up @@ -266,7 +266,7 @@ rustls = { version = "0.23.37", features = ["ring"] }
rustls-webpki = { version = "0.103.9", default-features = false, features = ["aws-lc-rs", "ring", "std"] }
schemars = { version = "0.8.22", features = ["bytes", "chrono", "semver", "url", "uuid1"] }
scopeguard = { version = "1.2.0" }
semver = { version = "1.0.27", features = ["serde"] }
semver = { version = "1.0.28", features = ["serde"] }
serde = { version = "1.0.228", features = ["alloc", "derive", "rc"] }
serde_core = { version = "1.0.228", features = ["alloc", "rc"] }
serde_json = { version = "1.0.149", features = ["alloc", "raw_value", "unbounded_depth"] }
Expand Down Expand Up @@ -321,7 +321,6 @@ dof-9fbad63c4bcf4a8f = { package = "dof", version = "0.4.0", default-features =
hyper-rustls = { version = "0.27.7", features = ["http2", "ring", "webpki-tokio"] }
hyper-util = { version = "0.1.20", features = ["full"] }
linux-raw-sys = { version = "0.4.15", default-features = false, features = ["elf", "errno", "general", "ioctl", "no_std", "system"] }
miniz_oxide = { version = "0.8.9", default-features = false, features = ["simd", "with-alloc"] }
mio = { version = "1.2.0", features = ["net", "os-ext"] }
object = { version = "0.37.3", default-features = false, features = ["read", "std"] }
rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38.44", features = ["fs", "stdio", "system", "termios"] }
Expand All @@ -335,7 +334,6 @@ dof-9fbad63c4bcf4a8f = { package = "dof", version = "0.4.0", default-features =
hyper-rustls = { version = "0.27.7", features = ["http2", "ring", "webpki-tokio"] }
hyper-util = { version = "0.1.20", features = ["full"] }
linux-raw-sys = { version = "0.4.15", default-features = false, features = ["elf", "errno", "general", "ioctl", "no_std", "system"] }
miniz_oxide = { version = "0.8.9", default-features = false, features = ["simd", "with-alloc"] }
mio = { version = "1.2.0", features = ["net", "os-ext"] }
object = { version = "0.37.3", default-features = false, features = ["read", "std"] }
rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38.44", features = ["fs", "stdio", "system", "termios"] }
Expand All @@ -347,7 +345,6 @@ cookie = { version = "0.18.1", default-features = false, features = ["percent-en
errno = { version = "0.3.14" }
hyper-rustls = { version = "0.27.7", features = ["http2", "ring", "webpki-tokio"] }
hyper-util = { version = "0.1.20", features = ["full"] }
miniz_oxide = { version = "0.8.9", default-features = false, features = ["simd", "with-alloc"] }
mio = { version = "1.2.0", features = ["net", "os-ext"] }
object = { version = "0.37.3", default-features = false, features = ["read", "std"] }
rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38.44", features = ["fs", "stdio", "system", "termios"] }
Expand All @@ -359,7 +356,6 @@ cookie = { version = "0.18.1", default-features = false, features = ["percent-en
errno = { version = "0.3.14" }
hyper-rustls = { version = "0.27.7", features = ["http2", "ring", "webpki-tokio"] }
hyper-util = { version = "0.1.20", features = ["full"] }
miniz_oxide = { version = "0.8.9", default-features = false, features = ["simd", "with-alloc"] }
mio = { version = "1.2.0", features = ["net", "os-ext"] }
object = { version = "0.37.3", default-features = false, features = ["read", "std"] }
rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38.44", features = ["fs", "stdio", "system", "termios"] }
Expand All @@ -371,7 +367,6 @@ cookie = { version = "0.18.1", default-features = false, features = ["percent-en
errno = { version = "0.3.14" }
hyper-rustls = { version = "0.27.7", features = ["http2", "ring", "webpki-tokio"] }
hyper-util = { version = "0.1.20", features = ["full"] }
miniz_oxide = { version = "0.8.9", default-features = false, features = ["simd", "with-alloc"] }
mio = { version = "1.2.0", features = ["net", "os-ext"] }
object = { version = "0.37.3", default-features = false, features = ["read", "std"] }
rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38.44", features = ["fs", "stdio", "system", "termios"] }
Expand All @@ -383,7 +378,6 @@ cookie = { version = "0.18.1", default-features = false, features = ["percent-en
errno = { version = "0.3.14" }
hyper-rustls = { version = "0.27.7", features = ["http2", "ring", "webpki-tokio"] }
hyper-util = { version = "0.1.20", features = ["full"] }
miniz_oxide = { version = "0.8.9", default-features = false, features = ["simd", "with-alloc"] }
mio = { version = "1.2.0", features = ["net", "os-ext"] }
object = { version = "0.37.3", default-features = false, features = ["read", "std"] }
rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38.44", features = ["fs", "stdio", "system", "termios"] }
Expand All @@ -398,7 +392,6 @@ errno = { version = "0.3.14" }
getrandom-9fbad63c4bcf4a8f = { package = "getrandom", version = "0.4.1", default-features = false, features = ["std", "sys_rng"] }
hyper-rustls = { version = "0.27.7", features = ["http2", "ring", "webpki-tokio"] }
hyper-util = { version = "0.1.20", features = ["full"] }
miniz_oxide = { version = "0.8.9", default-features = false, features = ["simd", "with-alloc"] }
mio = { version = "1.2.0", features = ["net", "os-ext"] }
object = { version = "0.37.3", default-features = false, features = ["read", "std"] }
rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38.44", features = ["fs", "stdio", "system", "termios"] }
Expand All @@ -415,7 +408,6 @@ errno = { version = "0.3.14" }
getrandom-9fbad63c4bcf4a8f = { package = "getrandom", version = "0.4.1", default-features = false, features = ["std", "sys_rng"] }
hyper-rustls = { version = "0.27.7", features = ["http2", "ring", "webpki-tokio"] }
hyper-util = { version = "0.1.20", features = ["full"] }
miniz_oxide = { version = "0.8.9", default-features = false, features = ["simd", "with-alloc"] }
mio = { version = "1.2.0", features = ["net", "os-ext"] }
object = { version = "0.37.3", default-features = false, features = ["read", "std"] }
rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38.44", features = ["fs", "stdio", "system", "termios"] }
Expand Down
Loading