[𝘀𝗽𝗿] changes introduced through rebase

Created using spr 1.3.6-beta.1

[skip ci]

cockroach-admin/src/http_entrypoints.rs

@@ -6,6 +6,7 @@ use crate::cockroach_cli::NodeDecommission;
 use crate::cockroach_cli::NodeStatus;
 use crate::context::ServerContext;
 use dropshot::endpoint;
+use dropshot::ApiDescriptionRegisterError;
 use dropshot::HttpError;
 use dropshot::HttpResponseOk;
 use dropshot::RequestContext;
@@ -19,7 +20,9 @@ use std::sync::Arc;
 type CrdbApiDescription = dropshot::ApiDescription<Arc<ServerContext>>;
 
 pub fn api() -> CrdbApiDescription {
-    fn register_endpoints(api: &mut CrdbApiDescription) -> Result<(), String> {
+    fn register_endpoints(
+        api: &mut CrdbApiDescription,
+    ) -> Result<(), ApiDescriptionRegisterError> {
         api.register(local_node_id)?;
         api.register(node_status)?;
         api.register(node_decommission)?;

gateway/src/http_entrypoints.rs

@@ -17,6 +17,7 @@ use crate::ServerContext;
 use base64::Engine;
 use dropshot::endpoint;
 use dropshot::ApiDescription;
+use dropshot::ApiDescriptionRegisterError;
 use dropshot::HttpError;
 use dropshot::HttpResponseOk;
 use dropshot::HttpResponseUpdatedNoContent;
@@ -1677,7 +1678,7 @@ type GatewayApiDescription = ApiDescription<Arc<ServerContext>>;
 pub fn api() -> GatewayApiDescription {
     fn register_endpoints(
         api: &mut GatewayApiDescription,
-    ) -> Result<(), String> {
+    ) -> Result<(), ApiDescriptionRegisterError> {
         api.register(sp_get)?;
         api.register(sp_startup_options_get)?;
         api.register(sp_startup_options_set)?;

installinator-artifactd/src/http_entrypoints.rs

@@ -5,9 +5,9 @@
 // Copyright 2022 Oxide Computer Company
 
 use dropshot::{
-    endpoint, ApiDescription, FreeformBody, HttpError, HttpResponseHeaders,
-    HttpResponseOk, HttpResponseUpdatedNoContent, Path, RequestContext,
-    TypedBody,
+    endpoint, ApiDescription, ApiDescriptionRegisterError, FreeformBody,
+    HttpError, HttpResponseHeaders, HttpResponseOk,
+    HttpResponseUpdatedNoContent, Path, RequestContext, TypedBody,
 };
 use hyper::{header, Body, StatusCode};
 use installinator_common::EventReport;
@@ -24,7 +24,7 @@ type ArtifactServerApiDesc = ApiDescription<ServerContext>;
 pub fn api() -> ArtifactServerApiDesc {
     fn register_endpoints(
         api: &mut ArtifactServerApiDesc,
-    ) -> Result<(), String> {
+    ) -> Result<(), ApiDescriptionRegisterError> {
         api.register(get_artifact_by_hash)?;
         api.register(report_progress)?;
         Ok(())

nexus/src/external_api/http_entrypoints.rs

@@ -14,7 +14,6 @@ use super::{
     },
 };
 use crate::{context::ApiContext, external_api::shared};
-use dropshot::HttpError;
 use dropshot::HttpResponseAccepted;
 use dropshot::HttpResponseCreated;
 use dropshot::HttpResponseDeleted;
@@ -32,6 +31,7 @@ use dropshot::{
     channel, endpoint, WebsocketChannelResult, WebsocketConnection,
 };
 use dropshot::{ApiDescription, StreamingBody};
+use dropshot::{ApiDescriptionRegisterError, HttpError};
 use dropshot::{ApiEndpoint, EmptyScanParams};
 use ipnetwork::IpNetwork;
 use nexus_db_queries::db;
@@ -100,7 +100,9 @@ type NexusApiDescription = ApiDescription<ApiContext>;
 
 /// Returns a description of the external nexus API
 pub(crate) fn external_api() -> NexusApiDescription {
-    fn register_endpoints(api: &mut NexusApiDescription) -> Result<(), String> {
+    fn register_endpoints(
+        api: &mut NexusApiDescription,
+    ) -> Result<(), ApiDescriptionRegisterError> {
         api.register(ping)?;
 
         api.register(system_policy_view)?;
@@ -368,7 +370,7 @@ pub(crate) fn external_api() -> NexusApiDescription {
     fn register_experimental<T>(
         api: &mut NexusApiDescription,
         endpoint: T,
-    ) -> Result<(), String>
+    ) -> Result<(), ApiDescriptionRegisterError>
     where
         T: Into<ApiEndpoint<ApiContext>>,
     {
@@ -381,7 +383,7 @@ pub(crate) fn external_api() -> NexusApiDescription {
 
     fn register_experimental_endpoints(
         api: &mut NexusApiDescription,
-    ) -> Result<(), String> {
+    ) -> Result<(), ApiDescriptionRegisterError> {
         register_experimental(api, probe_list)?;
         register_experimental(api, probe_view)?;
         register_experimental(api, probe_create)?;

nexus/src/internal_api/http_entrypoints.rs

@@ -8,6 +8,7 @@ use super::params::{OximeterInfo, RackInitializationRequest};
 use crate::context::ApiContext;
 use dropshot::endpoint;
 use dropshot::ApiDescription;
+use dropshot::ApiDescriptionRegisterError;
 use dropshot::FreeformBody;
 use dropshot::HttpError;
 use dropshot::HttpResponseCreated;
@@ -68,7 +69,9 @@ type NexusApiDescription = ApiDescription<ApiContext>;
 
 /// Returns a description of the internal nexus API
 pub(crate) fn internal_api() -> NexusApiDescription {
-    fn register_endpoints(api: &mut NexusApiDescription) -> Result<(), String> {
+    fn register_endpoints(
+        api: &mut NexusApiDescription,
+    ) -> Result<(), ApiDescriptionRegisterError> {
         api.register(sled_agent_get)?;
         api.register(sled_agent_put)?;
         api.register(sled_firewall_rules_request)?;

package-manifest.toml

@@ -643,8 +643,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "a262fe770c173f7879cd942c98ab28a829890661"
-source.sha256 = "6f991dacd72c63d7fcff734b1f5c406c001e4d509f7b36e68b89d8b07f69ed79"
+source.commit = "e83f4f164fd3dbb2100989a399a4fa087232ac36"
+source.sha256 = "b28247df4d301540b0a46e4d9fdf410ee6fbdb23d18c80acbd36c016a084e30e"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -668,8 +668,8 @@ only_for_targets.image = "standard"
 # 2. Copy the output zone image from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "a262fe770c173f7879cd942c98ab28a829890661"
-source.sha256 = "66f38e194d4899a18825ec1a28adc9e63b5c3806696ffe9b210a16071d892013"
+source.commit = "e83f4f164fd3dbb2100989a399a4fa087232ac36"
+source.sha256 = "caf988e39d800bdccb1b9423568a19ba10a79aa2b07f74bf7eb65589fd81f8b1"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -686,8 +686,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "a262fe770c173f7879cd942c98ab28a829890661"
-source.sha256 = "6d4870275f9119da6bcafd0f57ee3e467aae4ff32c861af9ebf5a81ff304d6ce"
+source.commit = "e83f4f164fd3dbb2100989a399a4fa087232ac36"
+source.sha256 = "378a2f32c1850a5a62fa9b320813e342a647647d2f014ab5eced7c2d1d4f9c95"
 output.type = "zone"
 output.intermediate_only = true
 

sled-agent/src/bootstrap/http_entrypoints.rs

@@ -15,6 +15,7 @@ use crate::bootstrap::rack_ops::{RackInitId, RackResetId};
 use crate::updates::ConfigUpdates;
 use crate::updates::{Component, UpdateManager};
 use bootstore::schemes::v0 as bootstore;
+use dropshot::ApiDescriptionRegisterError;
 use dropshot::{
     endpoint, ApiDescription, HttpError, HttpResponseOk,
     HttpResponseUpdatedNoContent, RequestContext, TypedBody,
@@ -63,7 +64,7 @@ type BootstrapApiDescription = ApiDescription<BootstrapServerContext>;
 pub(crate) fn api() -> BootstrapApiDescription {
     fn register_endpoints(
         api: &mut BootstrapApiDescription,
-    ) -> Result<(), String> {
+    ) -> Result<(), ApiDescriptionRegisterError> {
         api.register(baseboard_get)?;
         api.register(components_get)?;
         api.register(rack_initialization_status)?;

sled-agent/src/http_entrypoints.rs

@@ -20,10 +20,10 @@ use bootstore::schemes::v0::NetworkConfig;
 use camino::Utf8PathBuf;
 use display_error_chain::DisplayErrorChain;
 use dropshot::{
-    endpoint, ApiDescription, FreeformBody, HttpError, HttpResponseCreated,
-    HttpResponseDeleted, HttpResponseHeaders, HttpResponseOk,
-    HttpResponseUpdatedNoContent, Path, Query, RequestContext, StreamingBody,
-    TypedBody,
+    endpoint, ApiDescription, ApiDescriptionRegisterError, FreeformBody,
+    HttpError, HttpResponseCreated, HttpResponseDeleted, HttpResponseHeaders,
+    HttpResponseOk, HttpResponseUpdatedNoContent, Path, Query, RequestContext,
+    StreamingBody, TypedBody,
 };
 use illumos_utils::opte::params::VirtualNetworkInterfaceHost;
 use installinator_common::M2Slot;
@@ -46,7 +46,9 @@ type SledApiDescription = ApiDescription<SledAgent>;
 
 /// Returns a description of the sled agent API
 pub fn api() -> SledApiDescription {
-    fn register_endpoints(api: &mut SledApiDescription) -> Result<(), String> {
+    fn register_endpoints(
+        api: &mut SledApiDescription,
+    ) -> Result<(), ApiDescriptionRegisterError> {
         api.register(disk_put)?;
         api.register(cockroachdb_init)?;
         api.register(instance_issue_disk_snapshot_request)?;

sled-agent/src/sim/http_entrypoints.rs

@@ -12,14 +12,14 @@ use crate::params::{
     InstancePutStateResponse, InstanceUnregisterResponse, Inventory,
     OmicronPhysicalDisksConfig, OmicronZonesConfig, VpcFirewallRulesEnsureBody,
 };
-use dropshot::endpoint;
 use dropshot::ApiDescription;
 use dropshot::HttpError;
 use dropshot::HttpResponseOk;
 use dropshot::HttpResponseUpdatedNoContent;
 use dropshot::Path;
 use dropshot::RequestContext;
 use dropshot::TypedBody;
+use dropshot::{endpoint, ApiDescriptionRegisterError};
 use illumos_utils::opte::params::VirtualNetworkInterfaceHost;
 use omicron_common::api::internal::nexus::DiskRuntimeState;
 use omicron_common::api::internal::nexus::SledInstanceState;
@@ -40,7 +40,9 @@ type SledApiDescription = ApiDescription<Arc<SledAgent>>;
 
 /// Returns a description of the sled agent API
 pub fn api() -> SledApiDescription {
-    fn register_endpoints(api: &mut SledApiDescription) -> Result<(), String> {
+    fn register_endpoints(
+        api: &mut SledApiDescription,
+    ) -> Result<(), ApiDescriptionRegisterError> {
         api.register(instance_put_migration_ids)?;
         api.register(instance_put_state)?;
         api.register(instance_get_state)?;

sled-agent/src/sim/http_entrypoints_pantry.rs

@@ -5,8 +5,9 @@
 //! HTTP entrypoint functions for simulating the crucible pantry API.
 
 use dropshot::{
-    endpoint, ApiDescription, HttpError, HttpResponseDeleted, HttpResponseOk,
-    HttpResponseUpdatedNoContent, Path as TypedPath, RequestContext, TypedBody,
+    endpoint, ApiDescription, ApiDescriptionRegisterError, HttpError,
+    HttpResponseDeleted, HttpResponseOk, HttpResponseUpdatedNoContent,
+    Path as TypedPath, RequestContext, TypedBody,
 };
 use propolis_client::types::VolumeConstructionRequest;
 use schemars::JsonSchema;
@@ -21,7 +22,7 @@ type CruciblePantryApiDescription = ApiDescription<Arc<Pantry>>;
 pub fn api() -> CruciblePantryApiDescription {
     fn register_endpoints(
         api: &mut CruciblePantryApiDescription,
-    ) -> Result<(), String> {
+    ) -> Result<(), ApiDescriptionRegisterError> {
         api.register(attach)?;
         api.register(is_job_finished)?;
         api.register(job_result_ok)?;

sled-agent/src/sim/http_entrypoints_storage.rs

@@ -9,8 +9,9 @@ use crucible_agent_client::types::{
     Snapshot,
 };
 use dropshot::{
-    endpoint, ApiDescription, HttpError, HttpResponseDeleted, HttpResponseOk,
-    Path as TypedPath, RequestContext, TypedBody,
+    endpoint, ApiDescription, ApiDescriptionRegisterError, HttpError,
+    HttpResponseDeleted, HttpResponseOk, Path as TypedPath, RequestContext,
+    TypedBody,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -24,7 +25,7 @@ type CrucibleAgentApiDescription = ApiDescription<Arc<CrucibleData>>;
 pub fn api() -> CrucibleAgentApiDescription {
     fn register_endpoints(
         api: &mut CrucibleAgentApiDescription,
-    ) -> Result<(), String> {
+    ) -> Result<(), ApiDescriptionRegisterError> {
         api.register(region_list)?;
         api.register(region_create)?;
         api.register(region_get)?;

tools/dendrite_openapi_version

@@ -1,2 +1,2 @@
-COMMIT="a262fe770c173f7879cd942c98ab28a829890661"
+COMMIT="e83f4f164fd3dbb2100989a399a4fa087232ac36"
 SHA2="12dc61e7c62b2e1ee1cf3c2bf7cdda6bee6ec96925d2fc1c021c6c1a8fdd56cd"

tools/dendrite_stub_checksums

@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="6f991dacd72c63d7fcff734b1f5c406c001e4d509f7b36e68b89d8b07f69ed79"
-CIDL_SHA256_LINUX_DPD="d97029a5c2c2f136fc76dbfa941ef0b114135232c6f96948453b5c83f744beb7"
+CIDL_SHA256_ILLUMOS="b28247df4d301540b0a46e4d9fdf410ee6fbdb23d18c80acbd36c016a084e30e"
+CIDL_SHA256_LINUX_DPD="35a27ec52a79badf8f8d57f2f5daf9332654ffb4e27108263870982d8c5f8658"
 CIDL_SHA256_LINUX_SWADM="a1308303fd0d8f8ac272288e801beb913f695dcf820dd53f5c03871e6b8674f7"

wicketd/src/http_entrypoints.rs

@@ -18,6 +18,7 @@ use bootstrap_agent_client::types::RackOperationStatus;
 use bootstrap_agent_client::types::RackResetId;
 use dropshot::endpoint;
 use dropshot::ApiDescription;
+use dropshot::ApiDescriptionRegisterError;
 use dropshot::HttpError;
 use dropshot::HttpResponseOk;
 use dropshot::HttpResponseUpdatedNoContent;
@@ -59,7 +60,7 @@ type WicketdApiDescription = ApiDescription<ServerContext>;
 pub fn api() -> WicketdApiDescription {
     fn register_endpoints(
         api: &mut WicketdApiDescription,
-    ) -> Result<(), String> {
+    ) -> Result<(), ApiDescriptionRegisterError> {
         api.register(get_bootstrap_sleds)?;
         api.register(get_rss_config)?;
         api.register(put_rss_config)?;