kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-04 09:25:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

command: unexport helpers

Browse Source
This commit is contained in:
Ryan Uber
2015-09-11 10:16:36 -07:00
parent 45c5f4f9cc
commit 7901677c2c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
command/helpers.go
View File

@@ -18,9 +18,9 @@ const (
DefaultHttpAddr = "http://127.0.0.1:4646"
)
// HttpAddrFlag is used to add the -http-addr flag to a flag
// httpAddrFlag is used to add the -http-addr flag to a flag
// set. Allows setting the value from an environment variable.
func HttpAddrFlag(f *flag.FlagSet) *string {
func httpAddrFlag(f *flag.FlagSet) *string {
defaultAddr := os.Getenv(HttpEnvVar)
if defaultAddr == "" {
defaultAddr = DefaultHttpAddr
@@ -29,9 +29,9 @@ func HttpAddrFlag(f *flag.FlagSet) *string {
"HTTP address of the Nomad agent")
}
// HttpClient is used to get a new Nomad client using the
// httpClient is used to get a new Nomad client using the
// given address.
func HttpClient(addr string) (*api.Client, error) {
func httpClient(addr string) (*api.Client, error) {
conf := api.DefaultConfig()
conf.URL = addr
return api.NewClient(conf)

6
command/helpers_test.go
View File

@@ -11,7 +11,7 @@ func TestHelpers_HttpAddrFlag(t *testing.T) {
// Returns the default
flags := flag.NewFlagSet("test", flag.ContinueOnError)
addr = HttpAddrFlag(flags)
addr = httpAddrFlag(flags)
if err := flags.Parse([]string{}); err != nil {
t.Fatalf("err: %s", err)
}
@@ -24,7 +24,7 @@ func TestHelpers_HttpAddrFlag(t *testing.T) {
t.Fatalf("err: %s", err)
}
flags = flag.NewFlagSet("test", flag.ContinueOnError)
addr = HttpAddrFlag(flags)
addr = httpAddrFlag(flags)
if err := flags.Parse([]string{}); err != nil {
t.Fatalf("err: %s", err)
}
@@ -34,7 +34,7 @@ func TestHelpers_HttpAddrFlag(t *testing.T) {
// Returns from flag
flags = flag.NewFlagSet("test", flag.ContinueOnError)
addr = HttpAddrFlag(flags)
addr = httpAddrFlag(flags)
if err := flags.Parse([]string{"-http-addr", "http://127.0.0.1:2222"}); err != nil {
t.Fatalf("err: %s", err)
}

4
command/status.go
View File

@@ -42,7 +42,7 @@ func (c *StatusCommand) Run(args []string) int {
flags := flag.NewFlagSet("status", flag.ContinueOnError)
flags.Usage = func() { c.Ui.Output(c.Help()) }
httpAddr = HttpAddrFlag(flags)
httpAddr = httpAddrFlag(flags)
if err := flags.Parse(args); err != nil {
return 1
@@ -55,7 +55,7 @@ func (c *StatusCommand) Run(args []string) int {
}
// Get the HTTP client
client, err := HttpClient(*httpAddr)
client, err := httpClient(*httpAddr)
if err != nil {
c.Ui.Error(fmt.Sprintf("Failed initializing Nomad client: %s", err))
return 1