Skip to content

Commit d8c8bfe

Browse files
committed
sources: update actix-web to 4.0.0-beta.10
1 parent 2fb0796 commit d8c8bfe

File tree

3 files changed

+28
-164
lines changed

3 files changed

+28
-164
lines changed

sources/Cargo.lock

Lines changed: 23 additions & 153 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sources/api/apiserver/src/server/mod.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ mod exec;
88
pub use error::Error;
99

1010
use actix_web::{
11-
body::Body, error::ResponseError, web, App, FromRequest, HttpRequest, HttpResponse, HttpServer,
12-
Responder,
11+
body::Body, error::ResponseError, web, App, HttpRequest, HttpResponse, HttpServer, Responder,
1312
};
1413
use bottlerocket_release::BottlerocketRelease;
1514
use datastore::{Committed, FilesystemDataStore, Key, Value};
@@ -78,14 +77,6 @@ where
7877

7978
let http_server = HttpServer::new(move || {
8079
App::new()
81-
// In our implementation of ResponseError on our own error type below, we include the
82-
// error message in the response for debugging purposes. If actix rejects a request
83-
// early because it doesn't fit our model, though, it doesn't even get to the
84-
// ResponseError implementation. This configuration of the Json extractor allows us to
85-
// add the error message into the response.
86-
.app_data(web::Json::<Settings>::configure(|cfg| {
87-
cfg.error_handler(|err, _req| actix_web::Error::from(err))
88-
}))
8980
// This makes the data store available to API methods merely by having a Data
9081
// parameter.
9182
.app_data(shared_data.clone())
@@ -507,7 +498,7 @@ impl ResponseError for error::Error {
507498
UpdateLockOpen { .. } => StatusCode::INTERNAL_SERVER_ERROR,
508499
};
509500

510-
HttpResponse::new(status_code)
501+
HttpResponse::build(status_code).body(self.to_string())
511502
}
512503
}
513504

sources/deny.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ skip = [
5454

5555
# older version used by webpki-roots 0.21.1
5656
{ name = "pem", version = "0.8.3" },
57+
58+
# older version used by chrono 0.4.19
59+
{ name = "time", version = "0.1.43" },
5760
]
5861

5962
skip-tree = [

0 commit comments

Comments
 (0)