Skip to content
Closed
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
41 changes: 41 additions & 0 deletions Cargo.lock

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

9 changes: 9 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ members = [
"wicket",
"wicketd",
"wicketd-api",
"wicketd-commission-api",
"wicketd-commission-types",
"wicketd-commission-types-versions",
"workspace-hack",
"zone-setup"
]
Expand Down Expand Up @@ -378,6 +381,9 @@ default-members = [
"wicket",
"wicketd",
"wicketd-api",
"wicketd-commission-api",
"wicketd-commission-types",
"wicketd-commission-types-versions",
"workspace-hack",
"zone-setup",
]
Expand Down Expand Up @@ -891,6 +897,9 @@ wicket = { path = "wicket" }
wicket-common = { path = "wicket-common" }
wicketd-api = { path = "wicketd-api" }
wicketd-client = { path = "clients/wicketd-client" }
wicketd-commission-api = { path = "wicketd-commission-api" }
wicketd-commission-types = { path = "wicketd-commission-types" }
wicketd-commission-types-versions = { path = "wicketd-commission-types-versions" }
x509-cert = { version = "0.2.5", default-features = false }
xshell = "0.2.7"
zerocopy = "0.8.26"
Expand Down
3 changes: 3 additions & 0 deletions common/src/address.rs
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,9 @@ pub const NEXUS_TECHPORT_EXTERNAL_PORT: u16 = 12228;
/// interface(s).
pub const WICKETD_NEXUS_PROXY_PORT: u16 = 12229;

/// The port on which `wicketd` serves its "commission" API
pub const WICKETD_COMMISSION_PORT: u16 = 12230;

/// The port on which NTP runs
pub const NTP_PORT: u16 = 123;

Expand Down
1 change: 1 addition & 0 deletions dev-tools/dropshot-apis/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ serde.workspace = true
serde_json.workspace = true
sled-agent-api.workspace = true
wicketd-api.workspace = true
wicketd-commission-api.workspace = true

[lints]
workspace = true
19 changes: 19 additions & 0 deletions dev-tools/dropshot-apis/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use repo_depot_api::*;
use serde::{Deserialize, Serialize};
use sled_agent_api::*;
use wicketd_api::*;
use wicketd_commission_api::*;

fn environment() -> anyhow::Result<Environment> {
// The workspace root is two levels up from this crate's directory.
Expand Down Expand Up @@ -339,6 +340,24 @@ fn all_apis() -> anyhow::Result<ManagedApis> {
api_description: wicketd_api_mod::stub_api_description,
ident: "wicketd",
}),
ManagedApi::from(ManagedApiConfig {
title: "Wicketd Commission API",
versions: Versions::new_versioned(
wicketd_commission_api::supported_versions(),
),
metadata: ManagedApiMetadata {
description: Some(
"Subset of the wicketd API used by external \
commissioning tools",
),
contact_url: Some("https://oxide.computer"),
contact_email: Some("api@oxide.computer"),
extra: to_value(ApiBoundary::Internal),
},
api_description:
wicketd_commission_api_mod::stub_api_description,
ident: "wicketd-commission",
}),
];

let apis = ManagedApis::new(apis)
Expand Down
Loading
Loading