b2ad8114fe
The following hardcoded environment variables are removed: * CONSUL_RPC_ADDR * CONSUL_HTTP_ADDR
52 lines
1.5 KiB
Go
52 lines
1.5 KiB
Go
package command
|
|
|
|
import (
|
|
"flag"
|
|
"os"
|
|
|
|
consulapi "github.com/hashicorp/consul/api"
|
|
"github.com/hashicorp/consul/command/agent"
|
|
)
|
|
|
|
// RPCAddrFlag returns a pointer to a string that will be populated
|
|
// when the given flagset is parsed with the RPC address of the Consul.
|
|
func RPCAddrFlag(f *flag.FlagSet) *string {
|
|
defaultRPCAddr := os.Getenv(agent.RPCAddrEnvName)
|
|
if defaultRPCAddr == "" {
|
|
defaultRPCAddr = "127.0.0.1:8400"
|
|
}
|
|
return f.String("rpc-addr", defaultRPCAddr,
|
|
"RPC address of the Consul agent")
|
|
}
|
|
|
|
// RPCClient returns a new Consul RPC client with the given address.
|
|
func RPCClient(addr string) (*agent.RPCClient, error) {
|
|
return agent.NewRPCClient(addr)
|
|
}
|
|
|
|
// HTTPAddrFlag returns a pointer to a string that will be populated
|
|
// when the given flagset is parsed with the HTTP address of the Consul.
|
|
func HTTPAddrFlag(f *flag.FlagSet) *string {
|
|
defaultHTTPAddr := os.Getenv(consulapi.HTTPAddrEnvName)
|
|
if defaultHTTPAddr == "" {
|
|
defaultHTTPAddr = "127.0.0.1:8500"
|
|
}
|
|
return f.String("http-addr", defaultHTTPAddr,
|
|
"HTTP address of the Consul agent")
|
|
}
|
|
|
|
// HTTPClient returns a new Consul HTTP client with the given address.
|
|
func HTTPClient(addr string) (*consulapi.Client, error) {
|
|
return HTTPClientConfig(func(c *consulapi.Config) {
|
|
c.Address = addr
|
|
})
|
|
}
|
|
|
|
// HTTPClientConfig is used to return a new API client and modify its
|
|
// configuration by passing in a config modifier function.
|
|
func HTTPClientConfig(fn func(c *consulapi.Config)) (*consulapi.Client, error) {
|
|
conf := consulapi.DefaultConfig()
|
|
fn(conf)
|
|
return consulapi.NewClient(conf)
|
|
}
|