You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2015/12/10 17:54:08 UTC
[3/3] mesos git commit: Replaced `BadRequest` with `MethodNotAllowed`
for unsupported methods.
Replaced `BadRequest` with `MethodNotAllowed` for unsupported methods.
Review: https://reviews.apache.org/r/40906
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e6114795
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e6114795
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e6114795
Branch: refs/heads/master
Commit: e6114795de19d45cfce8c0a683bc48f02dcab320
Parents: 44bd0a2
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Thu Dec 10 08:23:22 2015 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Thu Dec 10 08:51:11 2015 -0800
----------------------------------------------------------------------
src/master/http.cpp | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e6114795/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index dce248d..37fbcb9 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -551,7 +551,8 @@ static Resources removeDiskInfos(const Resources& resources)
Future<Response> Master::Http::createVolumes(const Request& request) const
{
if (request.method != "POST") {
- return BadRequest("Expecting POST");
+ return MethodNotAllowed(
+ {"POST"}, "Expecting 'POST', received '" + request.method + "'");
}
Result<Credential> credential = authenticate(request);
@@ -639,7 +640,8 @@ string Master::Http::DESTROY_VOLUMES_HELP()
Future<Response> Master::Http::destroyVolumes(const Request& request) const
{
if (request.method != "POST") {
- return BadRequest("Expecting POST");
+ return MethodNotAllowed(
+ {"POST"}, "Expecting 'POST', received '" + request.method + "'");
}
Result<Credential> credential = authenticate(request);
@@ -965,7 +967,8 @@ string Master::Http::RESERVE_HELP()
Future<Response> Master::Http::reserve(const Request& request) const
{
if (request.method != "POST") {
- return BadRequest("Expecting POST");
+ return MethodNotAllowed(
+ {"POST"}, "Expecting 'POST', received '" + request.method + "'");
}
Result<Credential> credential = authenticate(request);
@@ -1106,8 +1109,9 @@ Future<Response> Master::Http::quota(const Request& request) const
// TODO(joerg84): Add update logic for PUT requests
// once Quota supports updates.
- return BadRequest(
- "Expecting GET, DELETE or POST, got '" + request.method + "'");
+ return MethodNotAllowed(
+ {"GET", "POST", "DELETE"},
+ "Expecting 'GET', 'POST' or 'DELETE', received '" + request.method + "'");
}
@@ -1570,7 +1574,8 @@ string Master::Http::TEARDOWN_HELP()
Future<Response> Master::Http::teardown(const Request& request) const
{
if (request.method != "POST") {
- return BadRequest("Expecting POST");
+ return MethodNotAllowed(
+ {"POST"}, "Expecting 'POST', received '" + request.method + "'");
}
Result<Credential> credential = authenticate(request);
@@ -1787,7 +1792,9 @@ string Master::Http::MAINTENANCE_SCHEDULE_HELP()
Future<Response> Master::Http::maintenanceSchedule(const Request& request) const
{
if (request.method != "GET" && request.method != "POST") {
- return BadRequest("Expecting GET or POST, got '" + request.method + "'");
+ return MethodNotAllowed(
+ {"GET", "POST"},
+ "Expecting 'GET' or 'POST', received '" + request.method + "'");
}
// JSON-ify and return the current maintenance schedule.
@@ -1905,7 +1912,8 @@ string Master::Http::MACHINE_DOWN_HELP()
Future<Response> Master::Http::machineDown(const Request& request) const
{
if (request.method != "POST") {
- return BadRequest("Expecting POST, got '" + request.method + "'");
+ return MethodNotAllowed(
+ {"POST"}, "Expecting 'POST', received '" + request.method + "'");
}
// Parse the POST body as JSON.
@@ -2007,7 +2015,8 @@ string Master::Http::MACHINE_UP_HELP()
Future<Response> Master::Http::machineUp(const Request& request) const
{
if (request.method != "POST") {
- return BadRequest("Expecting POST, got '" + request.method + "'");
+ return MethodNotAllowed(
+ {"POST"}, "Expecting 'POST', received '" + request.method + "'");
}
// Parse the POST body as JSON.
@@ -2110,7 +2119,8 @@ string Master::Http::MAINTENANCE_STATUS_HELP()
Future<Response> Master::Http::maintenanceStatus(const Request& request) const
{
if (request.method != "GET") {
- return BadRequest("Expecting GET, got '" + request.method + "'");
+ return MethodNotAllowed(
+ {"GET"}, "Expecting 'GET', received '" + request.method + "'");
}
return master->allocator->getInverseOfferStatuses()
@@ -2182,7 +2192,8 @@ string Master::Http::UNRESERVE_HELP()
Future<Response> Master::Http::unreserve(const Request& request) const
{
if (request.method != "POST") {
- return BadRequest("Expecting POST");
+ return MethodNotAllowed(
+ {"POST"}, "Expecting 'POST', received '" + request.method + "'");
}
Result<Credential> credential = authenticate(request);