package agent
import (
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
8 years ago
"fmt"
"net/http"
"sort"
"strings"
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
)
8 years ago
"github.com/hashicorp/consul/agent/consul/structs"
"github.com/hashicorp/consul/api"
)
// ServiceSummary is used to summarize a service
type ServiceSummary struct {
Name string
Nodes [ ] string
ChecksPassing int
ChecksWarning int
ChecksCritical int
}
// UINodes is used to list the nodes in a given datacenter. We return a
// NodeDump which provides overview information for all the nodes
func ( s * HTTPServer ) UINodes ( resp http . ResponseWriter , req * http . Request ) ( interface { } , error ) {
// Parse arguments
args := structs . DCSpecificRequest { }
if done := s . parse ( resp , req , & args . Datacenter , & args . QueryOptions ) ; done {
return nil , nil
}
// Make the RPC request
var out structs . IndexedNodeDump
defer setMeta ( resp , & out . QueryMeta )
RPC :
if err := s . agent . RPC ( "Internal.NodeDump" , & args , & out ) ; err != nil {
// Retry the request allowing stale data if no leader
if strings . Contains ( err . Error ( ) , structs . ErrNoLeader . Error ( ) ) && ! args . AllowStale {
args . AllowStale = true
goto RPC
}
return nil , err
}
// Use empty list instead of nil
for _ , info := range out . Dump {
if info . Services == nil {
info . Services = make ( [ ] * structs . NodeService , 0 )
}
if info . Checks == nil {
info . Checks = make ( [ ] * structs . HealthCheck , 0 )
}
}
if out . Dump == nil {
out . Dump = make ( structs . NodeDump , 0 )
}
return out . Dump , nil
}
// UINodeInfo is used to get info on a single node in a given datacenter. We return a
// NodeInfo which provides overview information for the node
func ( s * HTTPServer ) UINodeInfo ( resp http . ResponseWriter , req * http . Request ) ( interface { } , error ) {
// Parse arguments
args := structs . NodeSpecificRequest { }
if done := s . parse ( resp , req , & args . Datacenter , & args . QueryOptions ) ; done {
return nil , nil
}
// Verify we have some DC, or use the default
args . Node = strings . TrimPrefix ( req . URL . Path , "/v1/internal/ui/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
8 years ago
fmt . Fprint ( resp , "Missing node name" )
return nil , nil
}
// Make the RPC request
var out structs . IndexedNodeDump
defer setMeta ( resp , & out . QueryMeta )
RPC :
if err := s . agent . RPC ( "Internal.NodeInfo" , & args , & out ) ; err != nil {
// Retry the request allowing stale data if no leader
if strings . Contains ( err . Error ( ) , structs . ErrNoLeader . Error ( ) ) && ! args . AllowStale {
args . AllowStale = true
goto RPC
}
return nil , err
}
// Return only the first entry
if len ( out . Dump ) > 0 {
info := out . Dump [ 0 ]
if info . Services == nil {
info . Services = make ( [ ] * structs . NodeService , 0 )
}
if info . Checks == nil {
info . Checks = make ( [ ] * structs . HealthCheck , 0 )
}
return info , nil
} else {
resp . WriteHeader ( http . StatusNotFound )
return nil , nil
}
return nil , nil
}
// UIServices is used to list the services in a given datacenter. We return a
// ServiceSummary which provides overview information for the service
func ( s * HTTPServer ) UIServices ( resp http . ResponseWriter , req * http . Request ) ( interface { } , error ) {
// Parse arguments
args := structs . DCSpecificRequest { }
if done := s . parse ( resp , req , & args . Datacenter , & args . QueryOptions ) ; done {
return nil , nil
}
// Make the RPC request
var out structs . IndexedNodeDump
defer setMeta ( resp , & out . QueryMeta )
RPC :
if err := s . agent . RPC ( "Internal.NodeDump" , & args , & out ) ; err != nil {
// Retry the request allowing stale data if no leader
if strings . Contains ( err . Error ( ) , structs . ErrNoLeader . Error ( ) ) && ! args . AllowStale {
args . AllowStale = true
goto RPC
}
return nil , err
}
// Generate the summary
return summarizeServices ( out . Dump ) , nil
}
func summarizeServices ( dump structs . NodeDump ) [ ] * ServiceSummary {
// Collect the summary information
var services [ ] string
summary := make ( map [ string ] * ServiceSummary )
getService := func ( service string ) * ServiceSummary {
serv , ok := summary [ service ]
if ! ok {
serv = & ServiceSummary { Name : service }
summary [ service ] = serv
services = append ( services , service )
}
return serv
}
// Aggregate all the node information
for _ , node := range dump {
nodeServices := make ( [ ] * ServiceSummary , len ( node . Services ) )
for idx , service := range node . Services {
sum := getService ( service . Service )
sum . Nodes = append ( sum . Nodes , node . Node )
nodeServices [ idx ] = sum
}
for _ , check := range node . Checks {
var services [ ] * ServiceSummary
if check . ServiceName == "" {
services = nodeServices
} else {
services = [ ] * ServiceSummary { getService ( check . ServiceName ) }
}
for _ , sum := range services {
switch check . Status {
case api . HealthPassing :
sum . ChecksPassing ++
case api . HealthWarning :
sum . ChecksWarning ++
case api . HealthCritical :
sum . ChecksCritical ++
}
}
}
}
// Return the services in sorted order
sort . Strings ( services )
output := make ( [ ] * ServiceSummary , len ( summary ) )
for idx , service := range services {
// Sort the nodes
sum := summary [ service ]
sort . Strings ( sum . Nodes )
output [ idx ] = sum
}
return output
}