From 25759bcbb48104ba5902b2f17fdcc10192cee143 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 1 May 2017 19:15:40 -0600 Subject: [PATCH] fix: use correct flag positional argument --- .../network-compute-ports/network-compute-ports.go | 6 +++--- .../src/triggers/network-get-ipaddr/network-get-ipaddr.go | 8 ++++---- .../network-get-listeners/network-get-listeners.go | 2 +- .../src/triggers/network-get-port/network-get-port.go | 8 ++++---- .../triggers/network-write-ipaddr/network-write-ipaddr.go | 8 ++++---- .../src/triggers/network-write-port/network-write-port.go | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/plugins/network/src/triggers/network-compute-ports/network-compute-ports.go b/plugins/network/src/triggers/network-compute-ports/network-compute-ports.go index 845d5daf3..baad620c3 100644 --- a/plugins/network/src/triggers/network-compute-ports/network-compute-ports.go +++ b/plugins/network/src/triggers/network-compute-ports/network-compute-ports.go @@ -13,9 +13,9 @@ import ( // computes the ports for a given app container func main() { flag.Parse() - appName := flag.Arg(1) - procType := flag.Arg(2) - isHerokuishContainer := common.ToBool(flag.Arg(3)) + appName := flag.Arg(0) + procType := flag.Arg(1) + isHerokuishContainer := common.ToBool(flag.Arg(2)) if procType != "web" { return diff --git a/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go b/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go index ee8b97665..270a208a1 100644 --- a/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go +++ b/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go @@ -12,10 +12,10 @@ import ( // write the ipaddress to stdout for a given app container func main() { flag.Parse() - appName := flag.Arg(1) - procType := flag.Arg(2) - isHerokuishContainer := common.ToBool(flag.Arg(3)) - containerId := flag.Arg(4) + appName := flag.Arg(0) + procType := flag.Arg(1) + isHerokuishContainer := common.ToBool(flag.Arg(2)) + containerId := flag.Arg(3) ipAddress := network.GetContainerIpaddress(appName, procType, isHerokuishContainer, containerId) fmt.Fprintln(os.Stdout, ipAddress) diff --git a/plugins/network/src/triggers/network-get-listeners/network-get-listeners.go b/plugins/network/src/triggers/network-get-listeners/network-get-listeners.go index f7155c720..9260a8447 100644 --- a/plugins/network/src/triggers/network-get-listeners/network-get-listeners.go +++ b/plugins/network/src/triggers/network-get-listeners/network-get-listeners.go @@ -13,7 +13,7 @@ import ( // returns the listeners (host:port combinations) for a given app container func main() { flag.Parse() - appName := flag.Arg(1) + appName := flag.Arg(0) dokkuRoot := common.MustGetEnv("DOKKU_ROOT") appRoot := strings.Join([]string{dokkuRoot, appName}, "/") diff --git a/plugins/network/src/triggers/network-get-port/network-get-port.go b/plugins/network/src/triggers/network-get-port/network-get-port.go index 5ec64ef52..bf695d34f 100644 --- a/plugins/network/src/triggers/network-get-port/network-get-port.go +++ b/plugins/network/src/triggers/network-get-port/network-get-port.go @@ -12,10 +12,10 @@ import ( // write the port to stdout for a given app container func main() { flag.Parse() - appName := flag.Arg(1) - procType := flag.Arg(2) - isHerokuishContainer := common.ToBool(flag.Arg(3)) - containerId := flag.Arg(4) + appName := flag.Arg(0) + procType := flag.Arg(1) + isHerokuishContainer := common.ToBool(flag.Arg(2)) + containerId := flag.Arg(3) port := network.GetContainerPort(appName, procType, isHerokuishContainer, containerId) fmt.Fprintln(os.Stdout, port) diff --git a/plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go b/plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go index effc303ce..32fa1fb9e 100644 --- a/plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go +++ b/plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go @@ -12,10 +12,10 @@ import ( // writes the ip to disk func main() { flag.Parse() - appName := flag.Arg(1) - procType := flag.Arg(2) - containerIndex := flag.Arg(3) - ip := flag.Arg(4) + appName := flag.Arg(0) + procType := flag.Arg(1) + containerIndex := flag.Arg(2) + ip := flag.Arg(3) if appName == "" { common.LogFail("Please specify an app to run the command on") diff --git a/plugins/network/src/triggers/network-write-port/network-write-port.go b/plugins/network/src/triggers/network-write-port/network-write-port.go index eef3ad488..97490246d 100644 --- a/plugins/network/src/triggers/network-write-port/network-write-port.go +++ b/plugins/network/src/triggers/network-write-port/network-write-port.go @@ -12,10 +12,10 @@ import ( // writes the port to disk func main() { flag.Parse() - appName := flag.Arg(1) - procType := flag.Arg(2) - containerIndex := flag.Arg(3) - port := flag.Arg(4) + appName := flag.Arg(0) + procType := flag.Arg(1) + containerIndex := flag.Arg(2) + port := flag.Arg(3) if appName == "" { common.LogFail("Please specify an app to run the command on")