c7cc62ab5a
* agent: consolidate http method not allowed checks
This patch uses the error handling of the http handlers to handle HTTP
method not allowed errors across all available endpoints. It also adds a
test for testing whether the endpoints respond with the correct status
code.
* agent: do not panic on metrics tests
* agent: drop other tests for MethodNotAllowed
* agent: align /agent/join with reality
/agent/join uses PUT instead of GET as documented.
* agent: align /agent/check/{fail,warn,pass} with reality
/agent/check/{fail,warn,pass} uses PUT instead of GET as documented.
* fix some tests
* Drop more tests for method not allowed
* Align TestAgent_RegisterService_InvalidAddress with reality
* Changes API client join to use PUT instead of GET.
* Fixes agent endpoint verbs and removes obsolete tests.
* Updates the change log.
50 lines
1.2 KiB
Go
50 lines
1.2 KiB
Go
package agent
|
|
|
|
import (
|
|
"bytes"
|
|
"net/http"
|
|
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
)
|
|
|
|
// Snapshot handles requests to take and restore snapshots. This uses a special
|
|
// mechanism to make the RPC since we potentially stream large amounts of data
|
|
// as part of these requests.
|
|
func (s *HTTPServer) Snapshot(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
|
var args structs.SnapshotRequest
|
|
s.parseDC(req, &args.Datacenter)
|
|
s.parseToken(req, &args.Token)
|
|
if _, ok := req.URL.Query()["stale"]; ok {
|
|
args.AllowStale = true
|
|
}
|
|
|
|
switch req.Method {
|
|
case "GET":
|
|
args.Op = structs.SnapshotSave
|
|
|
|
// Headers need to go out before we stream the body.
|
|
replyFn := func(reply *structs.SnapshotResponse) error {
|
|
setMeta(resp, &reply.QueryMeta)
|
|
return nil
|
|
}
|
|
|
|
// Don't bother sending any request body through since it will
|
|
// be ignored.
|
|
var null bytes.Buffer
|
|
if err := s.agent.SnapshotRPC(&args, &null, resp, replyFn); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, nil
|
|
|
|
case "PUT":
|
|
args.Op = structs.SnapshotRestore
|
|
if err := s.agent.SnapshotRPC(&args, req.Body, resp, nil); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, nil
|
|
|
|
default:
|
|
return nil, MethodNotAllowedError{req.Method, []string{"GET", "PUT"}}
|
|
}
|
|
}
|