2016-08-15 22:05:02 +00:00
|
|
|
package agent
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
|
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"
|
2016-08-15 22:05:02 +00:00
|
|
|
)
|
|
|
|
|
2017-06-30 19:42:53 +00:00
|
|
|
// TranslateAddress is used to provide the final, translated address for a node,
|
2016-08-15 22:05:02 +00:00
|
|
|
// depending on how the agent and the other node are configured. The dc
|
|
|
|
// parameter is the dc the datacenter this node is from.
|
2017-06-30 19:42:53 +00:00
|
|
|
func (a *Agent) TranslateAddress(dc string, addr string, taggedAddresses map[string]string) string {
|
|
|
|
if a.config.TranslateWanAddrs && (a.config.Datacenter != dc) {
|
2016-08-15 22:05:02 +00:00
|
|
|
wanAddr := taggedAddresses["wan"]
|
|
|
|
if wanAddr != "" {
|
|
|
|
addr = wanAddr
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return addr
|
|
|
|
}
|
|
|
|
|
2017-06-30 19:42:53 +00:00
|
|
|
// TranslateAddresses translates addresses in the given structure into the
|
2016-08-15 22:05:02 +00:00
|
|
|
// final, translated address, depending on how the agent and the other node are
|
|
|
|
// configured. The dc parameter is the datacenter this structure is from.
|
2017-06-30 19:42:53 +00:00
|
|
|
func (a *Agent) TranslateAddresses(dc string, subj interface{}) {
|
2016-08-15 22:05:02 +00:00
|
|
|
// CAUTION - SUBTLE! An agent running on a server can, in some cases,
|
|
|
|
// return pointers directly into the immutable state store for
|
|
|
|
// performance (it's via the in-memory RPC mechanism). It's never safe
|
|
|
|
// to modify those values, so we short circuit here so that we never
|
|
|
|
// update any structures that are from our own datacenter. This works
|
|
|
|
// for address translation because we *never* need to translate local
|
|
|
|
// addresses, but this is super subtle, so we've piped all the in-place
|
|
|
|
// address translation into this function which makes sure this check is
|
|
|
|
// done. This also happens to skip looking at any of the incoming
|
|
|
|
// structure for the common case of not needing to translate, so it will
|
|
|
|
// skip a lot of work if no translation needs to be done.
|
2017-06-30 19:42:53 +00:00
|
|
|
if !a.config.TranslateWanAddrs || (a.config.Datacenter == dc) {
|
2016-08-15 22:05:02 +00:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Translate addresses in-place, subject to the condition checked above
|
|
|
|
// which ensures this is safe to do since we are operating on a local
|
|
|
|
// copy of the data.
|
|
|
|
switch v := subj.(type) {
|
|
|
|
case structs.CheckServiceNodes:
|
|
|
|
for _, entry := range v {
|
2017-06-30 19:42:53 +00:00
|
|
|
entry.Node.Address = a.TranslateAddress(dc, entry.Node.Address, entry.Node.TaggedAddresses)
|
2016-08-15 22:05:02 +00:00
|
|
|
}
|
|
|
|
case *structs.Node:
|
2017-06-30 19:42:53 +00:00
|
|
|
v.Address = a.TranslateAddress(dc, v.Address, v.TaggedAddresses)
|
2016-08-15 22:05:02 +00:00
|
|
|
case structs.Nodes:
|
|
|
|
for _, node := range v {
|
2017-06-30 19:42:53 +00:00
|
|
|
node.Address = a.TranslateAddress(dc, node.Address, node.TaggedAddresses)
|
2016-08-15 22:05:02 +00:00
|
|
|
}
|
|
|
|
case structs.ServiceNodes:
|
|
|
|
for _, entry := range v {
|
2017-06-30 19:42:53 +00:00
|
|
|
entry.Address = a.TranslateAddress(dc, entry.Address, entry.TaggedAddresses)
|
2016-08-15 22:05:02 +00:00
|
|
|
}
|
|
|
|
default:
|
|
|
|
panic(fmt.Errorf("Unhandled type passed to address translator: %#v", subj))
|
|
|
|
}
|
|
|
|
}
|