[WIP] update to oxidecomputer/dropshot#1180

Cargo.toml

@@ -886,3 +886,8 @@ path = "workspace-hack"
 [patch."https://github.com/oxidecomputer/omicron"]
 omicron-uuid-kinds = { path = "uuid-kinds" }
 omicron-common = { path = "common" }
+
+# /!\ REMOVE BEFORE FLIGHT: Temporary patch to test dropshot breaking changes
+[patch.crates-io.dropshot]
+git = 'https://github.com/oxidecomputer/dropshot'
+branch = 'eliza/custom-error-httpresponse-result'

clickhouse-admin/src/clickhouse_cli.rs

@@ -55,7 +55,8 @@ impl From<ClickhouseCliError> for HttpError {
             | ClickhouseCliError::ExecutionError(_) => {
                 let message = InlineErrorChain::new(&err).to_string();
                 HttpError {
-                    status_code: http::StatusCode::INTERNAL_SERVER_ERROR,
+                    status_code:
+                        dropshot::ErrorStatusCode::INTERNAL_SERVER_ERROR,
                     error_code: Some(String::from("Internal")),
                     external_message: message.clone(),
                     internal_message: message,

clickhouse-admin/src/clickward.rs

@@ -23,7 +23,8 @@ impl From<ClickwardError> for HttpError {
             ClickwardError::Failure { .. } => {
                 let message = InlineErrorChain::new(&err).to_string();
                 HttpError {
-                    status_code: http::StatusCode::INTERNAL_SERVER_ERROR,
+                    status_code:
+                        dropshot::ErrorStatusCode::INTERNAL_SERVER_ERROR,
                     error_code: Some(String::from("Internal")),
                     external_message: message.clone(),
                     internal_message: message,

cockroach-admin/src/cockroach_cli.rs

@@ -45,7 +45,8 @@ impl From<CockroachCliError> for HttpError {
             | CockroachCliError::ParseOutput { .. } => {
                 let message = InlineErrorChain::new(&err).to_string();
                 HttpError {
-                    status_code: http::StatusCode::INTERNAL_SERVER_ERROR,
+                    status_code:
+                        dropshot::ErrorStatusCode::INTERNAL_SERVER_ERROR,
                     error_code: Some(String::from("Internal")),
                     external_message: message.clone(),
                     internal_message: message,

cockroach-admin/src/context.rs

@@ -53,7 +53,7 @@ impl ServerContext {
                     {err:#}",
                 );
                 Err(HttpError {
-                    status_code: http::StatusCode::SERVICE_UNAVAILABLE,
+                    status_code: dropshot::ErrorStatusCode::SERVICE_UNAVAILABLE,
                     error_code: None,
                     external_message: message.clone(),
                     internal_message: message,

common/src/api/external/error.rs

@@ -413,7 +413,7 @@ impl From<Error> for HttpError {
                 };
                 HttpError::for_client_error(
                     Some(String::from("ObjectNotFound")),
-                    http::StatusCode::NOT_FOUND,
+                    dropshot::ClientErrorStatusCode::NOT_FOUND,
                     format!("not found: {}", message),
                 )
             }
@@ -427,7 +427,7 @@ impl From<Error> for HttpError {
             }
 
             Error::Unauthenticated { internal_message } => HttpError {
-                status_code: http::StatusCode::UNAUTHORIZED,
+                status_code: dropshot::ErrorStatusCode::UNAUTHORIZED,
                 // TODO-polish We may want to rethink this error code.  This is
                 // what HTTP calls it, but it's confusing.
                 error_code: Some(String::from("Unauthorized")),
@@ -441,7 +441,7 @@ impl From<Error> for HttpError {
                 let (internal_message, external_message) =
                     message.into_internal_external();
                 HttpError {
-                    status_code: http::StatusCode::BAD_REQUEST,
+                    status_code: dropshot::ErrorStatusCode::BAD_REQUEST,
                     error_code: Some(String::from("InvalidRequest")),
                     external_message,
                     internal_message,
@@ -452,7 +452,7 @@ impl From<Error> for HttpError {
                 let (internal_message, external_message) =
                     message.into_internal_external();
                 HttpError {
-                    status_code: http::StatusCode::BAD_REQUEST,
+                    status_code: dropshot::ErrorStatusCode::BAD_REQUEST,
                     error_code: Some(String::from("InvalidValue")),
                     external_message: format!(
                         "unsupported value for \"{}\": {}",
@@ -464,7 +464,7 @@ impl From<Error> for HttpError {
 
             Error::Forbidden => HttpError::for_client_error(
                 Some(String::from("Forbidden")),
-                http::StatusCode::FORBIDDEN,
+                dropshot::ClientErrorStatusCode::FORBIDDEN,
                 String::from("Forbidden"),
             ),
 
@@ -485,7 +485,8 @@ impl From<Error> for HttpError {
                 // Need to construct an `HttpError` explicitly to present both
                 // an internal and an external message.
                 HttpError {
-                    status_code: http::StatusCode::INSUFFICIENT_STORAGE,
+                    status_code:
+                        dropshot::ErrorStatusCode::INSUFFICIENT_STORAGE,
                     error_code: Some(String::from("InsufficientCapacity")),
                     external_message: format!(
                         "Insufficient capacity: {}",
@@ -503,7 +504,7 @@ impl From<Error> for HttpError {
                 let (internal_message, external_message) =
                     message.into_internal_external();
                 HttpError {
-                    status_code: http::StatusCode::CONFLICT,
+                    status_code: dropshot::ErrorStatusCode::CONFLICT,
                     error_code: Some(String::from("Conflict")),
                     external_message,
                     internal_message,
@@ -514,7 +515,7 @@ impl From<Error> for HttpError {
                 let (internal_message, external_message) =
                     message.into_internal_external();
                 HttpError {
-                    status_code: http::StatusCode::NOT_FOUND,
+                    status_code: dropshot::ErrorStatusCode::NOT_FOUND,
                     error_code: Some(String::from("Not Found")),
                     external_message,
                     internal_message,
@@ -523,7 +524,7 @@ impl From<Error> for HttpError {
 
             Error::Gone => HttpError::for_client_error(
                 Some(String::from("Gone")),
-                http::StatusCode::GONE,
+                dropshot::ClientErrorStatusCode::GONE,
                 String::from("Gone"),
             ),
         }

dns-server/src/http_server.rs

@@ -64,7 +64,7 @@ impl From<UpdateError> for dropshot::HttpError {
         let message = format!("{:#}", error);
         match &error {
             UpdateError::BadUpdateGeneration { .. } => dropshot::HttpError {
-                status_code: http::StatusCode::CONFLICT,
+                status_code: dropshot::ErrorStatusCode::CONFLICT,
                 error_code: Some(String::from(
                     ERROR_CODE_BAD_UPDATE_GENERATION,
                 )),
@@ -73,7 +73,7 @@ impl From<UpdateError> for dropshot::HttpError {
             },
 
             UpdateError::UpdateInProgress { .. } => dropshot::HttpError {
-                status_code: http::StatusCode::CONFLICT,
+                status_code: dropshot::ErrorStatusCode::CONFLICT,
                 error_code: Some(String::from(ERROR_CODE_UPDATE_IN_PROGRESS)),
                 external_message: message.clone(),
                 internal_message: message,

dns-server/src/lib.rs

@@ -137,7 +137,7 @@ impl TransientServer {
             &dns_server::Config { bind_address: dns_bind_address },
             &dropshot::ConfigDropshot {
                 bind_address: "[::1]:0".parse().unwrap(),
-                request_body_max_bytes: 4 * 1024 * 1024,
+                default_request_body_max_bytes: 4 * 1024 * 1024,
                 default_handler_task_mode: dropshot::HandlerTaskMode::Detached,
                 log_headers: vec![],
             },

dns-server/tests/basic_test.rs

@@ -508,7 +508,7 @@ fn test_config(
         dns_server::storage::Config { storage_path, keep_old_generations: 3 };
     let config_dropshot = dropshot::ConfigDropshot {
         bind_address: "[::1]:0".to_string().parse().unwrap(),
-        request_body_max_bytes: 1024,
+        default_request_body_max_bytes: 1024,
         default_handler_task_mode: HandlerTaskMode::Detached,
         log_headers: vec![],
     };

gateway/src/error.rs

@@ -114,7 +114,7 @@ impl From<SpCommsError> for HttpError {
                     )),
                 ..
             } => http_err_with_message(
-                http::StatusCode::SERVICE_UNAVAILABLE,
+                dropshot::ErrorStatusCode::SERVICE_UNAVAILABLE,
                 "UpdateSlotBusy",
                 InlineErrorChain::new(&error).to_string(),
             ),
@@ -125,29 +125,29 @@ impl From<SpCommsError> for HttpError {
                     )),
                 ..
             } => http_err_with_message(
-                http::StatusCode::SERVICE_UNAVAILABLE,
+                dropshot::ErrorStatusCode::SERVICE_UNAVAILABLE,
                 "UpdateInProgress",
                 InlineErrorChain::new(&error).to_string(),
             ),
             SpCommsError::SpAddressUnknown(_) => http_err_with_message(
-                http::StatusCode::SERVICE_UNAVAILABLE,
+                dropshot::ErrorStatusCode::SERVICE_UNAVAILABLE,
                 "SpAddressUnknown",
                 InlineErrorChain::new(&error).to_string(),
             ),
             SpCommsError::Timeout { .. } => http_err_with_message(
-                http::StatusCode::SERVICE_UNAVAILABLE,
+                dropshot::ErrorStatusCode::SERVICE_UNAVAILABLE,
                 "Timeout ",
                 InlineErrorChain::new(&error).to_string(),
             ),
             SpCommsError::SpCommunicationFailed { .. } => {
                 http_err_with_message(
-                    http::StatusCode::SERVICE_UNAVAILABLE,
+                    dropshot::ErrorStatusCode::SERVICE_UNAVAILABLE,
                     "SpCommunicationFailed",
                     InlineErrorChain::new(&error).to_string(),
                 )
             }
             SpCommsError::UpdateFailed { .. } => http_err_with_message(
-                http::StatusCode::SERVICE_UNAVAILABLE,
+                dropshot::ErrorStatusCode::SERVICE_UNAVAILABLE,
                 "UpdateFailed",
                 InlineErrorChain::new(&error).to_string(),
             ),
@@ -163,12 +163,12 @@ impl From<SpLookupError> for HttpError {
                 InlineErrorChain::new(&error).to_string(),
             ),
             SpLookupError::DiscoveryNotYetComplete => http_err_with_message(
-                http::StatusCode::SERVICE_UNAVAILABLE,
+                dropshot::ErrorStatusCode::SERVICE_UNAVAILABLE,
                 "DiscoveryNotYetComplete",
                 InlineErrorChain::new(&error).to_string(),
             ),
             SpLookupError::DiscoveryFailed { .. } => http_err_with_message(
-                http::StatusCode::SERVICE_UNAVAILABLE,
+                dropshot::ErrorStatusCode::SERVICE_UNAVAILABLE,
                 "DiscoveryFailed ",
                 InlineErrorChain::new(&error).to_string(),
             ),
@@ -181,7 +181,7 @@ impl From<SpLookupError> for HttpError {
 // status code, we want to give our caller some information about what is going
 // wrong (e.g., we timed out waiting for an SP).
 pub(crate) fn http_err_with_message(
-    status_code: http::StatusCode,
+    status_code: dropshot::ErrorStatusCode,
     error_code: &str,
     message: String,
 ) -> HttpError {

gateway/src/http_entrypoints.rs

@@ -236,7 +236,7 @@ impl GatewayApi for GatewayImpl {
                 let key = str::from_utf8(key).unwrap();
                 String::from_utf8(bytes).map_err(|_| {
                     http_err_with_message(
-                        http::StatusCode::SERVICE_UNAVAILABLE,
+                        dropshot::ErrorStatusCode::SERVICE_UNAVAILABLE,
                         "InvalidCaboose",
                         format!("non-utf8 data returned for caboose key {key}"),
                     )

gateway/src/lib.rs

@@ -91,7 +91,7 @@ fn start_dropshot_server(
         Entry::Vacant(slot) => {
             let dropshot = ConfigDropshot {
                 bind_address: SocketAddr::V6(addr),
-                request_body_max_bytes,
+                default_request_body_max_bytes: request_body_max_bytes,
                 default_handler_task_mode: HandlerTaskMode::Detached,
                 log_headers: vec![],
             };

illumos-utils/src/lib.rs

@@ -78,7 +78,7 @@ impl From<ExecutionError> for HttpError {
     fn from(err: ExecutionError) -> Self {
         let message = InlineErrorChain::new(&err).to_string();
         HttpError {
-            status_code: http::StatusCode::INTERNAL_SERVER_ERROR,
+            status_code: dropshot::ErrorStatusCode::INTERNAL_SERVER_ERROR,
             error_code: Some(String::from("Internal")),
             external_message: message.clone(),
             internal_message: message,

installinator-api/src/lib.rs

@@ -14,7 +14,7 @@ use dropshot::{
     HttpResponseHeaders, HttpResponseOk, HttpResponseUpdatedNoContent, Path,
     RequestContext, TypedBody,
 };
-use hyper::{header, StatusCode};
+use hyper::header;
 use installinator_common::EventReport;
 use omicron_common::update::ArtifactHashId;
 use schemars::JsonSchema;
@@ -99,7 +99,7 @@ impl EventReportStatus {
             EventReportStatus::UnrecognizedUpdateId => {
                 Err(HttpError::for_client_error(
                     None,
-                    StatusCode::UNPROCESSABLE_ENTITY,
+                    dropshot::ClientErrorStatusCode::UNPROCESSABLE_ENTITY,
                     format!(
                         "update ID {update_id} unrecognized by this server"
                     ),
@@ -108,7 +108,7 @@ impl EventReportStatus {
             EventReportStatus::ReceiverClosed => {
                 Err(HttpError::for_client_error(
                     None,
-                    StatusCode::GONE,
+                    dropshot::ClientErrorStatusCode::GONE,
                     format!("update ID {update_id}: receiver closed"),
                 ))
             }
@@ -129,7 +129,7 @@ pub fn default_config(bind_address: std::net::SocketAddr) -> ConfigDropshot {
         // TODO: replace with an endpoint-specific option once
         // https://github.com/oxidecomputer/dropshot/pull/618 lands and is
         // available in omicron.
-        request_body_max_bytes: 4 * 1024 * 1024,
+        default_request_body_max_bytes: 4 * 1024 * 1024,
         default_handler_task_mode: HandlerTaskMode::Detached,
         log_headers: vec![],
     }

internal-dns/resolver/src/resolver.rs

@@ -466,7 +466,7 @@ mod test {
                 },
                 &dropshot::ConfigDropshot {
                     bind_address: "[::1]:0".parse().unwrap(),
-                    request_body_max_bytes: 8 * 1024,
+                    default_request_body_max_bytes: 8 * 1024,
                     default_handler_task_mode: HandlerTaskMode::Detached,
                     log_headers: vec![],
                 },