Skip to content

Commit

Permalink
[meta] update dropshot (#6226)
Browse files Browse the repository at this point in the history
Include the change to add `_mod` as a default suffix.

Also bump `rand_seeder` to 0.3.0, fixing issues with the `rand_core`
transitive dep snapping back to an older version (as I saw happen while
updating dropshot here).
  • Loading branch information
sunshowers authored Aug 5, 2024
1 parent 30edf1c commit 0babdbe
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 52 deletions.
50 changes: 25 additions & 25 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ quote = "1.0"
rand = "0.8.5"
rand_core = "0.6.4"
rand_distr = "0.4.3"
rand_seeder = "0.2.3"
rand_seeder = "0.3.0"
ratatui = "0.27.0"
rayon = "1.10"
rcgen = "0.12.1"
Expand Down
4 changes: 1 addition & 3 deletions cockroach-admin/api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ use omicron_uuid_kinds::OmicronZoneUuid;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};

#[dropshot::api_description {
module = "cockroach_admin_api_mod",
}]
#[dropshot::api_description]
pub trait CockroachAdminApi {
type Context;

Expand Down
4 changes: 2 additions & 2 deletions dev-tools/openapi-manager/src/spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub fn all_apis() -> Vec<ApiSpec> {
description: "API for the internal DNS server",
boundary: ApiBoundary::Internal,
api_description:
dns_server_api::dns_server_api::stub_api_description,
dns_server_api::dns_server_api_mod::stub_api_description,
filename: "dns-server.json",
extra_validation: None,
},
Expand All @@ -63,7 +63,7 @@ pub fn all_apis() -> Vec<ApiSpec> {
and report progress",
boundary: ApiBoundary::Internal,
api_description:
installinator_api::installinator_api::stub_api_description,
installinator_api::installinator_api_mod::stub_api_description,
filename: "installinator.json",
extra_validation: None,
},
Expand Down
2 changes: 1 addition & 1 deletion dns-server/src/http_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ impl Context {
}

pub fn api() -> dropshot::ApiDescription<Context> {
dns_server_api::dns_server_api::api_description::<DnsServerApiImpl>()
dns_server_api::dns_server_api_mod::api_description::<DnsServerApiImpl>()
.expect("registered DNS server entrypoints")
}

Expand Down
4 changes: 1 addition & 3 deletions gateway-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ use schemars::JsonSchema;
use serde::Deserialize;
use uuid::Uuid;

#[dropshot::api_description {
module = "gateway_api_mod",
}]
#[dropshot::api_description]
pub trait GatewayApi {
type Context;

Expand Down
2 changes: 1 addition & 1 deletion installinator-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ pub fn make_server_starter<T: InstallinatorApi>(
log_headers: vec![],
};

let api = crate::installinator_api::api_description::<T>()?;
let api = crate::installinator_api_mod::api_description::<T>()?;
let server =
dropshot::HttpServerStarter::new(&dropshot_config, api, context, &log)
.map_err(|error| {
Expand Down
5 changes: 1 addition & 4 deletions nexus/internal-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@ use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use uuid::Uuid;

#[dropshot::api_description {
// Named something different to let 'import nexus_internal_api::*;' work.
module = "nexus_internal_api_mod",
}]
#[dropshot::api_description]
pub trait NexusInternalApi {
type Context;

Expand Down
4 changes: 1 addition & 3 deletions oximeter/api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use uuid::Uuid;

#[dropshot::api_description {
module = "oximeter_api_mod",
}]
#[dropshot::api_description]
pub trait OximeterApi {
type Context;

Expand Down
4 changes: 1 addition & 3 deletions sled-agent/bootstrap-agent-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ use sled_agent_types::{
};
use sled_hardware_types::Baseboard;

#[dropshot::api_description {
module = "bootstrap_agent_api_mod",
}]
#[dropshot::api_description]
pub trait BootstrapAgentApi {
type Context;

Expand Down
4 changes: 1 addition & 3 deletions wicketd-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ use wicket_common::rack_update::ClearUpdateStateResponse;
use wicket_common::rack_update::StartUpdateOptions;
use wicket_common::update_events::EventReport;

#[dropshot::api_description {
module = "wicketd_api_mod",
}]
#[dropshot::api_description]
pub trait WicketdApi {
type Context;

Expand Down
2 changes: 1 addition & 1 deletion wicketd/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ impl Server {
SocketAddr::V6(args.artifact_address),
);
let api_description =
installinator_api::installinator_api::api_description::<
installinator_api::installinator_api_mod::api_description::<
WicketdInstallinatorApiImpl,
>()?;

Expand Down
4 changes: 2 additions & 2 deletions workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ 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.30", features = ["full"] }
indexmap = { version = "2.2.6", features = ["serde"] }
indexmap = { version = "2.3.0", features = ["serde"] }
inout = { version = "0.1.3", default-features = false, features = ["std"] }
ipnetwork = { version = "0.20.0", features = ["schemars"] }
itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
Expand Down Expand Up @@ -167,7 +167,7 @@ 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.30", features = ["full"] }
indexmap = { version = "2.2.6", features = ["serde"] }
indexmap = { version = "2.3.0", features = ["serde"] }
inout = { version = "0.1.3", default-features = false, features = ["std"] }
ipnetwork = { version = "0.20.0", features = ["schemars"] }
itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
Expand Down

0 comments on commit 0babdbe

Please sign in to comment.