Can now pass gateway var using environment (#70, #71)

scaleway · Jul 18, 2015 · 99b210a · 99b210a
1 parent 0782d9f
commit 99b210a
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 0 deletions.
diff --git a/commands/cp.go b/commands/cp.go
@@ -84,6 +84,9 @@ func TarFromSource(apiClient *api.ScalewayAPI, source string) (*io.ReadCloser, e
 		remoteCommand = append(remoteCommand, base)
 
 		// Resolve gateway
+		if cpGateway == "" {
+			cpGateway = os.Getenv("SCW_GATEWAY")
+		}
 		var gateway string
 		if cpGateway == serverID || cpGateway == serverParts[0] {
 			gateway = ""
@@ -178,6 +181,9 @@ func UntarToDest(apiClient *api.ScalewayAPI, sourceStream *io.ReadCloser, destin
 		remoteCommand = append(remoteCommand, "-xf", "-")
 
 		// Resolve gateway
+		if cpGateway == "" {
+			cpGateway = os.Getenv("SCW_GATEWAY")
+		}
 		var gateway string
 		if cpGateway == serverID || cpGateway == serverParts[0] {
 			gateway = ""

diff --git a/commands/exec.go b/commands/exec.go
@@ -58,6 +58,9 @@ func runExec(cmd *types.Command, args []string) {
 	serverID := cmd.API.GetServerID(args[0])
 
 	// Resolve gateway
+	if execGateway == "" {
+		execGateway = os.Getenv("SCW_GATEWAY")
+	}
 	var gateway string
 	var err error
 	if execGateway == serverID || execGateway == args[0] {

diff --git a/commands/kill.go b/commands/kill.go
@@ -49,6 +49,9 @@ func runKill(cmd *types.Command, args []string) {
 	}
 
 	// Resolve gateway
+	if killGateway == "" {
+		killGateway = os.Getenv("SCW_GATEWAY")
+	}
 	var gateway string
 	if killGateway == serverID || killGateway == args[0] {
 		gateway = ""

diff --git a/commands/logs.go b/commands/logs.go
@@ -5,6 +5,8 @@
 package commands
 
 import (
+	"os"
+
 	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
@@ -45,6 +47,9 @@ func runLogs(cmd *types.Command, args []string) {
 	// FIXME: switch to serial history when API is ready
 
 	// Resolve gateway
+	if logsGateway == "" {
+		logsGateway = os.Getenv("SCW_GATEWAY")
+	}
 	var gateway string
 	if logsGateway == serverID || logsGateway == args[0] {
 		gateway = ""

diff --git a/commands/port.go b/commands/port.go
@@ -5,6 +5,8 @@
 package commands
 
 import (
+	"os"
+
 	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
@@ -43,6 +45,9 @@ func runPort(cmd *types.Command, args []string) {
 	}
 
 	// Resolve gateway
+	if portGateway == "" {
+		portGateway = os.Getenv("SCW_GATEWAY")
+	}
 	var gateway string
 	if portGateway == serverID || portGateway == args[0] {
 		gateway = ""

diff --git a/commands/run.go b/commands/run.go
@@ -101,6 +101,9 @@ func runRun(cmd *types.Command, args []string) {
 		}
 	} else {
 		// Resolve gateway
+		if runGateway == "" {
+			runGateway = os.Getenv("SCW_GATEWAY")
+		}
 		gateway, err := api.ResolveGateway(cmd.API, runGateway)
 		if err != nil {
 			log.Fatalf("Cannot resolve Gateway '%s': %v", runGateway, err)

diff --git a/commands/top.go b/commands/top.go
@@ -6,6 +6,7 @@ package commands
 
 import (
 	"fmt"
+	"os"
 	"os/exec"
 	"strings"
 
@@ -48,6 +49,9 @@ func runTop(cmd *types.Command, args []string) {
 	}
 
 	// Resolve gateway
+	if topGateway == "" {
+		topGateway = os.Getenv("SCW_GATEWAY")
+	}
 	var gateway string
 	if topGateway == serverID || topGateway == args[0] {
 		gateway = ""