Bypass gateway to access gateway

scaleway · Jul 17, 2015 · 0782d9f · 0782d9f
1 parent 98e3a64
commit 0782d9f
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 21 deletions.
diff --git a/commands/cp.go b/commands/cp.go
@@ -84,9 +84,14 @@ func TarFromSource(apiClient *api.ScalewayAPI, source string) (*io.ReadCloser, e
 		remoteCommand = append(remoteCommand, base)
 
 		// Resolve gateway
-		gateway, err := api.ResolveGateway(apiClient, cpGateway)
-		if err != nil {
-			log.Fatalf("Cannot resolve Gateway '%s': %v", cpGateway, err)
+		var gateway string
+		if cpGateway == serverID || cpGateway == serverParts[0] {
+			gateway = ""
+		} else {
+			gateway, err = api.ResolveGateway(apiClient, cpGateway)
+			if err != nil {
+				log.Fatalf("Cannot resolve Gateway '%s': %v", cpGateway, err)
+			}
 		}
 
 		// execCmd contains the ssh connection + the remoteCommand
@@ -173,9 +178,14 @@ func UntarToDest(apiClient *api.ScalewayAPI, sourceStream *io.ReadCloser, destin
 		remoteCommand = append(remoteCommand, "-xf", "-")
 
 		// Resolve gateway
-		gateway, err := api.ResolveGateway(apiClient, cpGateway)
-		if err != nil {
-			log.Fatalf("Cannot resolve Gateway '%s': %v", cpGateway, err)
+		var gateway string
+		if cpGateway == serverID || cpGateway == serverParts[0] {
+			gateway = ""
+		} else {
+			gateway, err = api.ResolveGateway(apiClient, cpGateway)
+			if err != nil {
+				log.Fatalf("Cannot resolve Gateway '%s': %v", cpGateway, err)
+			}
 		}
 
 		// execCmd contains the ssh connection + the remoteCommand

diff --git a/commands/exec.go b/commands/exec.go
@@ -58,9 +58,15 @@ func runExec(cmd *types.Command, args []string) {
 	serverID := cmd.API.GetServerID(args[0])
 
 	// Resolve gateway
-	gateway, err := api.ResolveGateway(cmd.API, execGateway)
-	if err != nil {
-		log.Fatalf("Cannot resolve Gateway '%s': %v", execGateway, err)
+	var gateway string
+	var err error
+	if execGateway == serverID || execGateway == args[0] {
+		gateway = ""
+	} else {
+		gateway, err = api.ResolveGateway(cmd.API, execGateway)
+		if err != nil {
+			log.Fatalf("Cannot resolve Gateway '%s': %v", execGateway, err)
+		}
 	}
 
 	var server *api.ScalewayServer

diff --git a/commands/kill.go b/commands/kill.go
@@ -49,9 +49,14 @@ func runKill(cmd *types.Command, args []string) {
 	}
 
 	// Resolve gateway
-	gateway, err := api.ResolveGateway(cmd.API, killGateway)
-	if err != nil {
-		log.Fatalf("Cannot resolve Gateway '%s': %v", killGateway, err)
+	var gateway string
+	if killGateway == serverID || killGateway == args[0] {
+		gateway = ""
+	} else {
+		gateway, err = api.ResolveGateway(cmd.API, killGateway)
+		if err != nil {
+			log.Fatalf("Cannot resolve Gateway '%s': %v", killGateway, err)
+		}
 	}
 
 	execCmd := append(utils.NewSSHExecCmd(server.PublicAddress.IP, server.PrivateIP, true, nil, []string{command}, gateway))

diff --git a/commands/logs.go b/commands/logs.go
@@ -45,9 +45,14 @@ func runLogs(cmd *types.Command, args []string) {
 	// FIXME: switch to serial history when API is ready
 
 	// Resolve gateway
-	gateway, err := api.ResolveGateway(cmd.API, logsGateway)
-	if err != nil {
-		log.Fatalf("Cannot resolve Gateway '%s': %v", logsGateway, err)
+	var gateway string
+	if logsGateway == serverID || logsGateway == args[0] {
+		gateway = ""
+	} else {
+		gateway, err = api.ResolveGateway(cmd.API, logsGateway)
+		if err != nil {
+			log.Fatalf("Cannot resolve Gateway '%s': %v", logsGateway, err)
+		}
 	}
 
 	command := []string{"dmesg"}

diff --git a/commands/port.go b/commands/port.go
@@ -43,9 +43,14 @@ func runPort(cmd *types.Command, args []string) {
 	}
 
 	// Resolve gateway
-	gateway, err := api.ResolveGateway(cmd.API, portGateway)
-	if err != nil {
-		log.Fatalf("Cannot resolve Gateway '%s': %v", portGateway, err)
+	var gateway string
+	if portGateway == serverID || portGateway == args[0] {
+		gateway = ""
+	} else {
+		gateway, err = api.ResolveGateway(cmd.API, portGateway)
+		if err != nil {
+			log.Fatalf("Cannot resolve Gateway '%s': %v", portGateway, err)
+		}
 	}
 
 	command := []string{"netstat -lutn 2>/dev/null | grep LISTEN"}

diff --git a/commands/top.go b/commands/top.go
@@ -48,9 +48,14 @@ func runTop(cmd *types.Command, args []string) {
 	}
 
 	// Resolve gateway
-	gateway, err := api.ResolveGateway(cmd.API, topGateway)
-	if err != nil {
-		log.Fatalf("Cannot resolve Gateway '%s': %v", topGateway, err)
+	var gateway string
+	if topGateway == serverID || topGateway == args[0] {
+		gateway = ""
+	} else {
+		gateway, err = api.ResolveGateway(cmd.API, topGateway)
+		if err != nil {
+			log.Fatalf("Cannot resolve Gateway '%s': %v", topGateway, err)
+		}
 	}
 
 	execCmd := utils.NewSSHExecCmd(server.PublicAddress.IP, server.PrivateIP, true, nil, []string{command}, gateway)