cd837b0b18
command/agent/* -> agent/* command/consul/* -> agent/consul/* command/agent/command{,_test}.go -> command/agent{,_test}.go command/base/command.go -> command/base.go command/base/* -> command/* commands.go -> command/commands.go The script which did the refactor is: ( cd $GOPATH/src/github.com/hashicorp/consul git mv command/agent/command.go command/agent.go git mv command/agent/command_test.go command/agent_test.go git mv command/agent/flag_slice_value{,_test}.go command/ git mv command/agent . git mv command/base/command.go command/base.go git mv command/base/config_util{,_test}.go command/ git mv commands.go command/ git mv consul agent rmdir command/base/ gsed -i -e 's|package agent|package command|' command/agent{,_test}.go gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go gsed -i -e 's|package main|package command|' command/commands.go gsed -i -e 's|base.Command|BaseCommand|' command/commands.go gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go gsed -i -e 's|base\.||' command/commands.go gsed -i -e 's|command\.||' command/commands.go gsed -i -e 's|command|c|' main.go gsed -i -e 's|range Commands|range command.Commands|' main.go gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go gsed -i -e 's|base.Command|BaseCommand|' command/*.go gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go gsed -i -e 's|base\.||' command/*_test.go gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go # fix imports f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go') gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f goimports -w $f f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go') gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f goimports -w $f goimports -w command/*.go main.go )
276 lines
7.9 KiB
Go
276 lines
7.9 KiB
Go
package agent
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/consul/agent/consul"
|
|
"github.com/hashicorp/consul/agent/consul/structs"
|
|
)
|
|
|
|
const (
|
|
preparedQueryEndpoint = "PreparedQuery"
|
|
preparedQueryExecuteSuffix = "/execute"
|
|
preparedQueryExplainSuffix = "/explain"
|
|
)
|
|
|
|
// preparedQueryCreateResponse is used to wrap the query ID.
|
|
type preparedQueryCreateResponse struct {
|
|
ID string
|
|
}
|
|
|
|
// preparedQueryCreate makes a new prepared query.
|
|
func (s *HTTPServer) preparedQueryCreate(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
|
args := structs.PreparedQueryRequest{
|
|
Op: structs.PreparedQueryCreate,
|
|
}
|
|
s.parseDC(req, &args.Datacenter)
|
|
s.parseToken(req, &args.Token)
|
|
if req.ContentLength > 0 {
|
|
if err := decodeBody(req, &args.Query, nil); err != nil {
|
|
resp.WriteHeader(400)
|
|
fmt.Fprintf(resp, "Request decode failed: %v", err)
|
|
return nil, nil
|
|
}
|
|
}
|
|
|
|
var reply string
|
|
endpoint := s.agent.getEndpoint(preparedQueryEndpoint)
|
|
if err := s.agent.RPC(endpoint+".Apply", &args, &reply); err != nil {
|
|
return nil, err
|
|
}
|
|
return preparedQueryCreateResponse{reply}, nil
|
|
}
|
|
|
|
// preparedQueryList returns all the prepared queries.
|
|
func (s *HTTPServer) preparedQueryList(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
|
var args structs.DCSpecificRequest
|
|
if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
|
|
return nil, nil
|
|
}
|
|
|
|
var reply structs.IndexedPreparedQueries
|
|
endpoint := s.agent.getEndpoint(preparedQueryEndpoint)
|
|
if err := s.agent.RPC(endpoint+".List", &args, &reply); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Use empty list instead of nil.
|
|
if reply.Queries == nil {
|
|
reply.Queries = make(structs.PreparedQueries, 0)
|
|
}
|
|
return reply.Queries, nil
|
|
}
|
|
|
|
// PreparedQueryGeneral handles all the general prepared query requests.
|
|
func (s *HTTPServer) PreparedQueryGeneral(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
|
switch req.Method {
|
|
case "POST":
|
|
return s.preparedQueryCreate(resp, req)
|
|
|
|
case "GET":
|
|
return s.preparedQueryList(resp, req)
|
|
|
|
default:
|
|
resp.WriteHeader(405)
|
|
return nil, nil
|
|
}
|
|
}
|
|
|
|
// parseLimit parses the optional limit parameter for a prepared query execution.
|
|
func parseLimit(req *http.Request, limit *int) error {
|
|
*limit = 0
|
|
if arg := req.URL.Query().Get("limit"); arg != "" {
|
|
i, err := strconv.Atoi(arg)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
*limit = i
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// preparedQueryExecute executes a prepared query.
|
|
func (s *HTTPServer) preparedQueryExecute(id string, resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
|
args := structs.PreparedQueryExecuteRequest{
|
|
QueryIDOrName: id,
|
|
Agent: structs.QuerySource{
|
|
Node: s.agent.config.NodeName,
|
|
Datacenter: s.agent.config.Datacenter,
|
|
},
|
|
}
|
|
s.parseSource(req, &args.Source)
|
|
if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
|
|
return nil, nil
|
|
}
|
|
if err := parseLimit(req, &args.Limit); err != nil {
|
|
return nil, fmt.Errorf("Bad limit: %s", err)
|
|
}
|
|
|
|
var reply structs.PreparedQueryExecuteResponse
|
|
endpoint := s.agent.getEndpoint(preparedQueryEndpoint)
|
|
if err := s.agent.RPC(endpoint+".Execute", &args, &reply); err != nil {
|
|
// We have to check the string since the RPC sheds
|
|
// the specific error type.
|
|
if err.Error() == consul.ErrQueryNotFound.Error() {
|
|
resp.WriteHeader(404)
|
|
fmt.Fprint(resp, err.Error())
|
|
return nil, nil
|
|
}
|
|
return nil, err
|
|
}
|
|
|
|
// Note that we translate using the DC that the results came from, since
|
|
// a query can fail over to a different DC than where the execute request
|
|
// was sent to. That's why we use the reply's DC and not the one from
|
|
// the args.
|
|
translateAddresses(s.agent.config, reply.Datacenter, reply.Nodes)
|
|
|
|
// Use empty list instead of nil.
|
|
if reply.Nodes == nil {
|
|
reply.Nodes = make(structs.CheckServiceNodes, 0)
|
|
}
|
|
return reply, nil
|
|
}
|
|
|
|
// preparedQueryExplain shows which query a name resolves to, the fully
|
|
// interpolated template (if it's a template), as well as additional info
|
|
// about the execution of a query.
|
|
func (s *HTTPServer) preparedQueryExplain(id string, resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
|
args := structs.PreparedQueryExecuteRequest{
|
|
QueryIDOrName: id,
|
|
Agent: structs.QuerySource{
|
|
Node: s.agent.config.NodeName,
|
|
Datacenter: s.agent.config.Datacenter,
|
|
},
|
|
}
|
|
s.parseSource(req, &args.Source)
|
|
if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
|
|
return nil, nil
|
|
}
|
|
if err := parseLimit(req, &args.Limit); err != nil {
|
|
return nil, fmt.Errorf("Bad limit: %s", err)
|
|
}
|
|
|
|
var reply structs.PreparedQueryExplainResponse
|
|
endpoint := s.agent.getEndpoint(preparedQueryEndpoint)
|
|
if err := s.agent.RPC(endpoint+".Explain", &args, &reply); err != nil {
|
|
// We have to check the string since the RPC sheds
|
|
// the specific error type.
|
|
if err.Error() == consul.ErrQueryNotFound.Error() {
|
|
resp.WriteHeader(404)
|
|
fmt.Fprint(resp, err.Error())
|
|
return nil, nil
|
|
}
|
|
return nil, err
|
|
}
|
|
return reply, nil
|
|
}
|
|
|
|
// preparedQueryGet returns a single prepared query.
|
|
func (s *HTTPServer) preparedQueryGet(id string, resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
|
args := structs.PreparedQuerySpecificRequest{
|
|
QueryID: id,
|
|
}
|
|
if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
|
|
return nil, nil
|
|
}
|
|
|
|
var reply structs.IndexedPreparedQueries
|
|
endpoint := s.agent.getEndpoint(preparedQueryEndpoint)
|
|
if err := s.agent.RPC(endpoint+".Get", &args, &reply); err != nil {
|
|
// We have to check the string since the RPC sheds
|
|
// the specific error type.
|
|
if err.Error() == consul.ErrQueryNotFound.Error() {
|
|
resp.WriteHeader(404)
|
|
fmt.Fprint(resp, err.Error())
|
|
return nil, nil
|
|
}
|
|
return nil, err
|
|
}
|
|
return reply.Queries, nil
|
|
}
|
|
|
|
// preparedQueryUpdate updates a prepared query.
|
|
func (s *HTTPServer) preparedQueryUpdate(id string, resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
|
args := structs.PreparedQueryRequest{
|
|
Op: structs.PreparedQueryUpdate,
|
|
}
|
|
s.parseDC(req, &args.Datacenter)
|
|
s.parseToken(req, &args.Token)
|
|
if req.ContentLength > 0 {
|
|
if err := decodeBody(req, &args.Query, nil); err != nil {
|
|
resp.WriteHeader(400)
|
|
fmt.Fprintf(resp, "Request decode failed: %v", err)
|
|
return nil, nil
|
|
}
|
|
}
|
|
|
|
// Take the ID from the URL, not the embedded one.
|
|
args.Query.ID = id
|
|
|
|
var reply string
|
|
endpoint := s.agent.getEndpoint(preparedQueryEndpoint)
|
|
if err := s.agent.RPC(endpoint+".Apply", &args, &reply); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
// preparedQueryDelete deletes prepared query.
|
|
func (s *HTTPServer) preparedQueryDelete(id string, resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
|
args := structs.PreparedQueryRequest{
|
|
Op: structs.PreparedQueryDelete,
|
|
Query: &structs.PreparedQuery{
|
|
ID: id,
|
|
},
|
|
}
|
|
s.parseDC(req, &args.Datacenter)
|
|
s.parseToken(req, &args.Token)
|
|
|
|
var reply string
|
|
endpoint := s.agent.getEndpoint(preparedQueryEndpoint)
|
|
if err := s.agent.RPC(endpoint+".Apply", &args, &reply); err != nil {
|
|
return nil, err
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
// PreparedQuerySpecific handles all the prepared query requests specific to a
|
|
// particular query.
|
|
func (s *HTTPServer) PreparedQuerySpecific(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
|
id := strings.TrimPrefix(req.URL.Path, "/v1/query/")
|
|
|
|
execute, explain := false, false
|
|
if strings.HasSuffix(id, preparedQueryExecuteSuffix) {
|
|
execute = true
|
|
id = strings.TrimSuffix(id, preparedQueryExecuteSuffix)
|
|
} else if strings.HasSuffix(id, preparedQueryExplainSuffix) {
|
|
explain = true
|
|
id = strings.TrimSuffix(id, preparedQueryExplainSuffix)
|
|
}
|
|
|
|
switch req.Method {
|
|
case "GET":
|
|
if execute {
|
|
return s.preparedQueryExecute(id, resp, req)
|
|
} else if explain {
|
|
return s.preparedQueryExplain(id, resp, req)
|
|
} else {
|
|
return s.preparedQueryGet(id, resp, req)
|
|
}
|
|
|
|
case "PUT":
|
|
return s.preparedQueryUpdate(id, resp, req)
|
|
|
|
case "DELETE":
|
|
return s.preparedQueryDelete(id, resp, req)
|
|
|
|
default:
|
|
resp.WriteHeader(405)
|
|
return nil, nil
|
|
}
|
|
}
|