agent: align /agent/join with reality

/agent/join uses PUT instead of GET as documented.
hashicorp · Aug 19, 2017 · a90783f · a90783f
1 parent ea2facc
commit a90783f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/agent/agent_endpoint.go b/agent/agent_endpoint.go
@@ -186,8 +186,8 @@ func (s *HTTPServer) AgentMembers(resp http.ResponseWriter, req *http.Request) (
 }
 
 func (s *HTTPServer) AgentJoin(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
-	if req.Method != "GET" {
-		return nil, MethodNotAllowedError{req.Method, []string{"GET"}}
+	if req.Method != "PUT" {
+		return nil, MethodNotAllowedError{req.Method, []string{"PUT"}}
 	}
 
 	// Fetch the ACL token, if any, and enforce agent policy.

diff --git a/agent/http_test.go b/agent/http_test.go
@@ -327,7 +327,7 @@ func TestHTTPAPI_MethodNotAllowed(t *testing.T) {
 		{"GET", "/v1/agent/check/warn/"}, // GET ??
 		{"GET", "/v1/agent/checks"},
 		{"PUT", "/v1/agent/force-leave/"},
-		{"GET", "/v1/agent/join/"},
+		{"PUT", "/v1/agent/join/"},
 		{"PUT", "/v1/agent/leave"},
 		{"PUT", "/v1/agent/maintenance"},
 		{"GET", "/v1/agent/metrics"},

diff --git a/website/source/api/agent.html.md b/website/source/api/agent.html.md
@@ -417,7 +417,7 @@ This endpoint instructs the agent to attempt to connect to a given address.
 
 | Method | Path                         | Produces                   |
 | ------ | ---------------------------- | -------------------------- |
-| `GET`  | `/agent/join/:address`       | `application/json`         |
+| `PUT`  | `/agent/join/:address`       | `application/json`         |
 
 The table below shows this endpoint's support for
 [blocking queries](/api/index.html#blocking-queries),