2013-12-23 22:26:34 +00:00
|
|
|
package agent
|
|
|
|
|
|
|
|
import (
|
2013-12-24 00:20:51 +00:00
|
|
|
"fmt"
|
2013-12-23 22:26:34 +00:00
|
|
|
"net/http"
|
2013-12-24 19:55:14 +00:00
|
|
|
"strings"
|
2016-08-15 22:05:02 +00:00
|
|
|
|
pkg refactor
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
)
2017-06-09 22:28:28 +00:00
|
|
|
"github.com/hashicorp/consul/agent/consul/structs"
|
2013-12-23 22:26:34 +00:00
|
|
|
)
|
|
|
|
|
2013-12-24 00:20:51 +00:00
|
|
|
func (s *HTTPServer) CatalogRegister(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
|
|
|
var args structs.RegisterRequest
|
2014-04-21 22:02:36 +00:00
|
|
|
if err := decodeBody(req, &args, nil); err != nil {
|
2013-12-24 00:20:51 +00:00
|
|
|
resp.WriteHeader(400)
|
Use fmt.Fprint/Fprintf/Fprintln
Used the following rewrite rules:
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b, c, d))) -> fmt.Fprintf(resp, a, b, c, d)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b, c))) -> fmt.Fprintf(resp, a, b, c)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b))) -> fmt.Fprintf(resp, a, b)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a))) -> fmt.Fprint(resp, a)' *.go
gofmt -w -r 'resp.Write([]byte(a + "\n")) -> fmt.Fprintln(resp, a)' *.go
gofmt -w -r 'resp.Write([]byte(a)) -> fmt.Fprint(resp, a)' *.go
2017-04-20 14:07:42 +00:00
|
|
|
fmt.Fprintf(resp, "Request decode failed: %v", err)
|
2013-12-24 00:20:51 +00:00
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Setup the default DC if not provided
|
|
|
|
if args.Datacenter == "" {
|
|
|
|
args.Datacenter = s.agent.config.Datacenter
|
|
|
|
}
|
2016-05-17 17:16:33 +00:00
|
|
|
s.parseToken(req, &args.Token)
|
2013-12-24 00:20:51 +00:00
|
|
|
|
|
|
|
// Forward to the servers
|
|
|
|
var out struct{}
|
|
|
|
if err := s.agent.RPC("Catalog.Register", &args, &out); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
|
2013-12-24 19:55:14 +00:00
|
|
|
func (s *HTTPServer) CatalogDeregister(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
|
|
|
var args structs.DeregisterRequest
|
2014-04-21 22:02:36 +00:00
|
|
|
if err := decodeBody(req, &args, nil); err != nil {
|
2013-12-24 19:55:14 +00:00
|
|
|
resp.WriteHeader(400)
|
Use fmt.Fprint/Fprintf/Fprintln
Used the following rewrite rules:
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b, c, d))) -> fmt.Fprintf(resp, a, b, c, d)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b, c))) -> fmt.Fprintf(resp, a, b, c)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b))) -> fmt.Fprintf(resp, a, b)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a))) -> fmt.Fprint(resp, a)' *.go
gofmt -w -r 'resp.Write([]byte(a + "\n")) -> fmt.Fprintln(resp, a)' *.go
gofmt -w -r 'resp.Write([]byte(a)) -> fmt.Fprint(resp, a)' *.go
2017-04-20 14:07:42 +00:00
|
|
|
fmt.Fprintf(resp, "Request decode failed: %v", err)
|
2013-12-24 19:55:14 +00:00
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Setup the default DC if not provided
|
|
|
|
if args.Datacenter == "" {
|
|
|
|
args.Datacenter = s.agent.config.Datacenter
|
|
|
|
}
|
2016-05-17 17:16:33 +00:00
|
|
|
s.parseToken(req, &args.Token)
|
2013-12-24 19:55:14 +00:00
|
|
|
|
|
|
|
// Forward to the servers
|
|
|
|
var out struct{}
|
|
|
|
if err := s.agent.RPC("Catalog.Deregister", &args, &out); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
|
2013-12-24 00:20:51 +00:00
|
|
|
func (s *HTTPServer) CatalogDatacenters(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
2013-12-23 22:26:34 +00:00
|
|
|
var out []string
|
|
|
|
if err := s.agent.RPC("Catalog.ListDatacenters", struct{}{}, &out); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return out, nil
|
|
|
|
}
|
2013-12-24 00:20:51 +00:00
|
|
|
|
2014-04-21 19:40:11 +00:00
|
|
|
func (s *HTTPServer) CatalogNodes(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
2014-02-05 22:36:13 +00:00
|
|
|
// Setup the request
|
|
|
|
args := structs.DCSpecificRequest{}
|
2015-06-30 21:25:40 +00:00
|
|
|
s.parseSource(req, &args.Source)
|
2017-01-11 19:41:12 +00:00
|
|
|
args.NodeMetaFilters = s.parseMetaFilter(req)
|
2014-04-21 19:25:36 +00:00
|
|
|
if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
|
2014-04-21 19:40:11 +00:00
|
|
|
return nil, nil
|
2013-12-24 00:20:51 +00:00
|
|
|
}
|
|
|
|
|
2014-02-05 22:36:13 +00:00
|
|
|
var out structs.IndexedNodes
|
2014-04-21 19:40:11 +00:00
|
|
|
defer setMeta(resp, &out.QueryMeta)
|
2014-02-05 22:36:13 +00:00
|
|
|
if err := s.agent.RPC("Catalog.ListNodes", &args, &out); err != nil {
|
2014-04-21 19:40:11 +00:00
|
|
|
return nil, err
|
2013-12-24 00:20:51 +00:00
|
|
|
}
|
2016-08-15 22:05:02 +00:00
|
|
|
translateAddresses(s.agent.config, args.Datacenter, out.Nodes)
|
2015-11-15 05:05:37 +00:00
|
|
|
|
|
|
|
// Use empty list instead of nil
|
|
|
|
if out.Nodes == nil {
|
|
|
|
out.Nodes = make(structs.Nodes, 0)
|
|
|
|
}
|
2014-04-21 19:40:11 +00:00
|
|
|
return out.Nodes, nil
|
2013-12-24 00:20:51 +00:00
|
|
|
}
|
2013-12-24 19:55:14 +00:00
|
|
|
|
2014-04-21 19:40:11 +00:00
|
|
|
func (s *HTTPServer) CatalogServices(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
2013-12-24 19:55:14 +00:00
|
|
|
// Set default DC
|
2014-02-05 22:36:13 +00:00
|
|
|
args := structs.DCSpecificRequest{}
|
2017-01-11 19:41:12 +00:00
|
|
|
args.NodeMetaFilters = s.parseMetaFilter(req)
|
2014-04-21 19:25:36 +00:00
|
|
|
if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
|
2014-04-21 19:40:11 +00:00
|
|
|
return nil, nil
|
2013-12-24 19:55:14 +00:00
|
|
|
}
|
|
|
|
|
2014-02-05 22:36:13 +00:00
|
|
|
var out structs.IndexedServices
|
2014-04-21 19:40:11 +00:00
|
|
|
defer setMeta(resp, &out.QueryMeta)
|
2014-02-05 22:36:13 +00:00
|
|
|
if err := s.agent.RPC("Catalog.ListServices", &args, &out); err != nil {
|
2014-04-21 19:40:11 +00:00
|
|
|
return nil, err
|
2013-12-24 19:55:14 +00:00
|
|
|
}
|
2017-04-28 01:22:07 +00:00
|
|
|
|
|
|
|
// Use empty map instead of nil
|
|
|
|
if out.Services == nil {
|
|
|
|
out.Services = make(structs.Services, 0)
|
|
|
|
}
|
2014-04-21 19:40:11 +00:00
|
|
|
return out.Services, nil
|
2013-12-24 19:55:14 +00:00
|
|
|
}
|
|
|
|
|
2014-04-21 19:40:11 +00:00
|
|
|
func (s *HTTPServer) CatalogServiceNodes(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
2013-12-24 19:55:14 +00:00
|
|
|
// Set default DC
|
2014-02-05 22:36:13 +00:00
|
|
|
args := structs.ServiceSpecificRequest{}
|
2015-06-30 21:25:40 +00:00
|
|
|
s.parseSource(req, &args.Source)
|
2017-01-14 01:08:43 +00:00
|
|
|
args.NodeMetaFilters = s.parseMetaFilter(req)
|
2014-04-21 19:25:36 +00:00
|
|
|
if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
|
2014-04-21 19:40:11 +00:00
|
|
|
return nil, nil
|
2013-12-24 19:55:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Check for a tag
|
2014-02-05 22:36:13 +00:00
|
|
|
params := req.URL.Query()
|
2013-12-24 19:55:14 +00:00
|
|
|
if _, ok := params["tag"]; ok {
|
|
|
|
args.ServiceTag = params.Get("tag")
|
|
|
|
args.TagFilter = true
|
|
|
|
}
|
|
|
|
|
|
|
|
// Pull out the service name
|
|
|
|
args.ServiceName = strings.TrimPrefix(req.URL.Path, "/v1/catalog/service/")
|
|
|
|
if args.ServiceName == "" {
|
|
|
|
resp.WriteHeader(400)
|
Use fmt.Fprint/Fprintf/Fprintln
Used the following rewrite rules:
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b, c, d))) -> fmt.Fprintf(resp, a, b, c, d)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b, c))) -> fmt.Fprintf(resp, a, b, c)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b))) -> fmt.Fprintf(resp, a, b)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a))) -> fmt.Fprint(resp, a)' *.go
gofmt -w -r 'resp.Write([]byte(a + "\n")) -> fmt.Fprintln(resp, a)' *.go
gofmt -w -r 'resp.Write([]byte(a)) -> fmt.Fprint(resp, a)' *.go
2017-04-20 14:07:42 +00:00
|
|
|
fmt.Fprint(resp, "Missing service name")
|
2014-04-21 19:40:11 +00:00
|
|
|
return nil, nil
|
2013-12-24 19:55:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Make the RPC request
|
2014-02-05 22:36:13 +00:00
|
|
|
var out structs.IndexedServiceNodes
|
2014-04-21 19:40:11 +00:00
|
|
|
defer setMeta(resp, &out.QueryMeta)
|
2013-12-24 19:55:14 +00:00
|
|
|
if err := s.agent.RPC("Catalog.ServiceNodes", &args, &out); err != nil {
|
2014-04-21 19:40:11 +00:00
|
|
|
return nil, err
|
2013-12-24 19:55:14 +00:00
|
|
|
}
|
2016-08-15 22:05:02 +00:00
|
|
|
translateAddresses(s.agent.config, args.Datacenter, out.ServiceNodes)
|
2015-11-15 05:05:37 +00:00
|
|
|
|
|
|
|
// Use empty list instead of nil
|
|
|
|
if out.ServiceNodes == nil {
|
|
|
|
out.ServiceNodes = make(structs.ServiceNodes, 0)
|
|
|
|
}
|
2017-04-28 01:22:07 +00:00
|
|
|
for _, s := range out.ServiceNodes {
|
|
|
|
if s.ServiceTags == nil {
|
|
|
|
s.ServiceTags = make([]string, 0)
|
|
|
|
}
|
|
|
|
}
|
2014-04-21 19:40:11 +00:00
|
|
|
return out.ServiceNodes, nil
|
2013-12-24 19:55:14 +00:00
|
|
|
}
|
|
|
|
|
2014-04-21 19:40:11 +00:00
|
|
|
func (s *HTTPServer) CatalogNodeServices(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
|
2013-12-24 19:55:14 +00:00
|
|
|
// Set default Datacenter
|
2014-02-05 22:36:13 +00:00
|
|
|
args := structs.NodeSpecificRequest{}
|
2014-04-21 19:25:36 +00:00
|
|
|
if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
|
2014-04-21 19:40:11 +00:00
|
|
|
return nil, nil
|
2013-12-24 19:55:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Pull out the node name
|
|
|
|
args.Node = strings.TrimPrefix(req.URL.Path, "/v1/catalog/node/")
|
|
|
|
if args.Node == "" {
|
|
|
|
resp.WriteHeader(400)
|
Use fmt.Fprint/Fprintf/Fprintln
Used the following rewrite rules:
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b, c, d))) -> fmt.Fprintf(resp, a, b, c, d)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b, c))) -> fmt.Fprintf(resp, a, b, c)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a, b))) -> fmt.Fprintf(resp, a, b)' *.go
gofmt -w -r 'resp.Write([]byte(fmt.Sprintf(a))) -> fmt.Fprint(resp, a)' *.go
gofmt -w -r 'resp.Write([]byte(a + "\n")) -> fmt.Fprintln(resp, a)' *.go
gofmt -w -r 'resp.Write([]byte(a)) -> fmt.Fprint(resp, a)' *.go
2017-04-20 14:07:42 +00:00
|
|
|
fmt.Fprint(resp, "Missing node name")
|
2014-04-21 19:40:11 +00:00
|
|
|
return nil, nil
|
2013-12-24 19:55:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Make the RPC request
|
2014-02-05 22:36:13 +00:00
|
|
|
var out structs.IndexedNodeServices
|
2014-04-21 19:40:11 +00:00
|
|
|
defer setMeta(resp, &out.QueryMeta)
|
2014-02-05 22:36:13 +00:00
|
|
|
if err := s.agent.RPC("Catalog.NodeServices", &args, &out); err != nil {
|
2014-04-21 19:40:11 +00:00
|
|
|
return nil, err
|
2013-12-24 19:55:14 +00:00
|
|
|
}
|
2016-08-15 22:05:02 +00:00
|
|
|
if out.NodeServices != nil && out.NodeServices.Node != nil {
|
|
|
|
translateAddresses(s.agent.config, args.Datacenter, out.NodeServices.Node)
|
2016-06-15 18:02:51 +00:00
|
|
|
}
|
|
|
|
|
2017-04-28 01:22:07 +00:00
|
|
|
// Use empty list instead of nil
|
|
|
|
if out.NodeServices != nil {
|
|
|
|
for _, s := range out.NodeServices.Services {
|
|
|
|
if s.Tags == nil {
|
|
|
|
s.Tags = make([]string, 0)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-04-21 19:40:11 +00:00
|
|
|
return out.NodeServices, nil
|
2013-12-24 19:55:14 +00:00
|
|
|
}
|