luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

command: fix up env var/cli arg precedence and tests

This commit is contained in:
Ryan Uber 2015-01-16 17:45:13 -08:00
parent 49127722ec
commit 059866cce6
2 changed files with 68 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
command/rpc.go
View File

@ -8,9 +8,15 @@ import (
"github.com/hashicorp/consul/command/agent" "github.com/hashicorp/consul/command/agent"
) )
// RPCAddrEnvName defines an environment variable name which sets const (
// an RPC address if there is no -rpc-addr specified. // RPCAddrEnvName defines an environment variable name which sets
const RPCAddrEnvName = "CONSUL_RPC_ADDR" // an RPC address if there is no -rpc-addr specified.
RPCAddrEnvName = "CONSUL_RPC_ADDR"
// HTTPAddrEnvName defines an environment variable name which sets
// the HTTP address if there is no -http-addr specified.
HTTPAddrEnvName = "CONSUL_HTTP_ADDR"
)
// RPCAddrFlag returns a pointer to a string that will be populated // RPCAddrFlag returns a pointer to a string that will be populated
// when the given flagset is parsed with the RPC address of the Consul. // when the given flagset is parsed with the RPC address of the Consul.
@ -31,7 +37,11 @@ func RPCClient(addr string) (*agent.RPCClient, error) {
// HTTPAddrFlag returns a pointer to a string that will be populated // HTTPAddrFlag returns a pointer to a string that will be populated
// when the given flagset is parsed with the HTTP address of the Consul. // when the given flagset is parsed with the HTTP address of the Consul.
func HTTPAddrFlag(f *flag.FlagSet) *string { func HTTPAddrFlag(f *flag.FlagSet) *string {
return f.String("http-addr", "127.0.0.1:8500", defaultHTTPAddr := os.Getenv(HTTPAddrEnvName)
if defaultHTTPAddr == "" {
defaultHTTPAddr = "127.0.0.1:8500"
}
return f.String("http-addr", defaultHTTPAddr,
"HTTP address of the Consul agent") "HTTP address of the Consul agent")
} }
@ -43,7 +53,7 @@ func HTTPClient(addr string) (*consulapi.Client, error) {
// HTTPClientDC returns a new Consul HTTP client with the given address and datacenter // HTTPClientDC returns a new Consul HTTP client with the given address and datacenter
func HTTPClientDC(addr, dc string) (*consulapi.Client, error) { func HTTPClientDC(addr, dc string) (*consulapi.Client, error) {
conf := consulapi.DefaultConfig() conf := consulapi.DefaultConfig()
if envAddr := os.Getenv("CONSUL_HTTP_ADDR"); envAddr != "" { if envAddr := os.Getenv(HTTPAddrEnvName); addr == "" && envAddr != "" {
addr = envAddr addr = envAddr
} }
conf.Address = addr conf.Address = addr

78
command/rpc_test.go
View File

@ -6,54 +6,82 @@ import (
"testing" "testing"
) )
const defaultRPC = "127.0.0.1:8400" const (
defaultRPC = "127.0.0.1:8400"
defaultHTTP = "127.0.0.1:8500"
)
func getParsedRPC(t *testing.T, cliRPC, envRPC string) string { type flagFunc func(f *flag.FlagSet) *string
func getParsedAddr(t *testing.T, addrType, cliVal, envVal string) string {
var cliFlag, envVar string
var fn flagFunc
args := []string{} args := []string{}
if cliRPC != "" { switch addrType {
args = append(args, "-rpc-addr="+cliRPC) case "rpc":
fn = RPCAddrFlag
envVar = RPCAddrEnvName
cliFlag = "-rpc-addr"
case "http":
fn = HTTPAddrFlag
envVar = HTTPAddrEnvName
cliFlag = "-http-addr"
default:
t.Fatalf("unknown address type %s", addrType)
}
if cliVal != "" {
args = append(args, cliFlag+"="+cliVal)
} }
os.Clearenv() os.Clearenv()
if envRPC != "" { if envVal != "" {
os.Setenv(RPCAddrEnvName, envRPC) os.Setenv(envVar, envVal)
} }
cmdFlags := flag.NewFlagSet("rpc", flag.ContinueOnError) cmdFlags := flag.NewFlagSet(addrType, flag.ContinueOnError)
rpc := RPCAddrFlag(cmdFlags) result := fn(cmdFlags)
if err := cmdFlags.Parse(args); err != nil { if err := cmdFlags.Parse(args); err != nil {
t.Fatal("Parse error", err) t.Fatal("Parse error", err)
} }
return *rpc return *result
} }
func TestRPCAddrFlag_default(t *testing.T) { func TestAddrFlag_default(t *testing.T) {
rpc := getParsedRPC(t, "", "") for a, def := range map[string]string{
"rpc": defaultRPC,
"http": defaultHTTP,
} {
res := getParsedAddr(t, a, "", "")
if rpc != defaultRPC { if res != def {
t.Fatalf("Expected rpc addr: %s, got: %s", defaultRPC, rpc) t.Fatalf("Expected %s addr: %s, got: %s", def, res)
}
} }
} }
func TestRPCAddrFlag_onlyEnv(t *testing.T) { func TestAddrFlag_onlyEnv(t *testing.T) {
envRPC := "4.4.4.4:8400" envAddr := "4.4.4.4:1234"
rpc := getParsedRPC(t, "", envRPC) for _, a := range []string{"rpc", "http"} {
res := getParsedAddr(t, a, "", envAddr)
if rpc != envRPC { if res != envAddr {
t.Fatalf("Expected rpc addr: %s, got: %s", envRPC, rpc) t.Fatalf("Expected %s addr: %s, got: %s", a, envAddr, res)
}
} }
} }
func TestRPCAddrFlag_precedence(t *testing.T) { func TestAddrFlag_precedence(t *testing.T) {
cliRPC := "8.8.8.8:8400" cliAddr := "8.8.8.8:8400"
envRPC := "4.4.4.4:8400" envAddr := "4.4.4.4:8400"
for _, a := range []string{"rpc", "http"} {
res := getParsedAddr(t, a, cliAddr, envAddr)
rpc := getParsedRPC(t, cliRPC, envRPC) if res != cliAddr {
t.Fatalf("Expected %s addr: %s, got: %s", a, cliAddr, res)
if rpc != cliRPC { }
t.Fatalf("Expected rpc addr: %s, got: %s", cliRPC, rpc)
} }
} }