fix #5: complete forward mapping

kamilsk · May 30, 2019 · b7a6bca · b7a6bca
1 parent 527c0d9
commit b7a6bca
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 37 deletions.
diff --git a/Makefile b/Makefile
@@ -49,12 +49,12 @@ install:
 
 .PHONY: run
 run:
-	@go run main.go up -f testdata/app.toml -m 6379:16379 -m 5432:15432
+	@go run main.go up -f testdata/app.toml -m 6379:16379 -m 5672:15672 -m 5432:15432
 	@echo ---
-	@go run main.go down -f testdata/app.toml -m 6379:16379 -m 5432:15432
+	@go run main.go down -f testdata/app.toml -m 6379:16379 -m 5672:15672 -m 5432:15432
 	@echo ---
-	@go run main.go env -f testdata/app.toml -m 6379:16379 -m 5432:15432
+	@go run main.go env -f testdata/app.toml -m 6379:16379 -m 5672:15672 -m 5432:15432
 	@echo ---
-	@go run main.go forward -f testdata/app.toml -m 6379:16379 -m 5432:15432
+	@go run main.go forward -f testdata/app.toml -m 6379:16379 -m 5672:15672 -m 5432:15432
 	@echo ---
-	@go run main.go call -f testdata/app.toml -m 6379:16379 -m 5432:15432 -- echo '$$REDIS_PORT $$PGPORT'
+	@go run main.go call -f testdata/app.toml -m 6379:16379 -m 5672:15672 -m 5432:15432 -- echo '$$REDIS_PORT $$PGPORT'
diff --git a/internal/cmd/call.go b/internal/cmd/call.go
@@ -7,6 +7,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/kamilsk/lift/internal/config"
+	"github.com/kamilsk/lift/internal/forward"
 	"github.com/kamilsk/lift/internal/shell"
 )
 
@@ -17,16 +18,12 @@ var callCmd = &cobra.Command{
 	Example: "lift call -- echo $GOMODULE",
 	Args:    cobra.MinimumNArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
-		ctx, err := scope(cmd)
-		if err != nil {
-			return err
-		}
-		cnf, err := config.FromScope(ctx)
+		cnf, err := config.FromScope(scope(cmd))
 		if err != nil {
 			return err
 		}
 		vars := make([]string, 0, len(cnf.Environment))
-		for variable, value := range cnf.Environment {
+		for variable, value := range forward.TransformEnvironment(cnf) {
 			vars = append(vars, fmt.Sprintf("%s=%s", variable, value))
 		}
 		var command = shell.Command(args[0])

diff --git a/internal/cmd/down.go b/internal/cmd/down.go
@@ -15,11 +15,7 @@ var downCmd = &cobra.Command{
 	Short: "Dump instruction for eval to down environment locally",
 	Long:  "Dump instruction for eval to down environment locally.",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		ctx, err := scope(cmd)
-		if err != nil {
-			return err
-		}
-		cnf, err := config.FromScope(ctx)
+		cnf, err := config.FromScope(scope(cmd))
 		if err != nil {
 			return err
 		}

diff --git a/internal/cmd/env.go b/internal/cmd/env.go
@@ -7,23 +7,20 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/kamilsk/lift/internal/config"
+	"github.com/kamilsk/lift/internal/forward"
 )
 
 var envCmd = &cobra.Command{
 	Use:   "env",
 	Short: "Dump environment variables from configuration file",
 	Long:  "Dump environment variables from configuration file.",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		ctx, err := scope(cmd)
-		if err != nil {
-			return err
-		}
-		cnf, err := config.FromScope(ctx)
+		cnf, err := config.FromScope(scope(cmd))
 		if err != nil {
 			return err
 		}
 		vars := make([]string, 0, len(cnf.Environment))
-		for variable, value := range cnf.Environment {
+		for variable, value := range forward.TransformEnvironment(cnf) {
 			vars = append(vars, fmt.Sprintf("%s=%s", variable, value))
 		}
 		_, err = fmt.Fprintln(cmd.OutOrStdout(), strings.Join(vars, "\n"))

diff --git a/internal/cmd/forward.go b/internal/cmd/forward.go
@@ -15,11 +15,7 @@ var forwardCmd = &cobra.Command{
 	Short: "Dump instruction for port forwarding",
 	Long:  "Dump instruction for port forwarding.",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		ctx, err := scope(cmd)
-		if err != nil {
-			return err
-		}
-		cnf, err := config.FromScope(ctx)
+		cnf, err := config.FromScope(scope(cmd))
 		if err != nil {
 			return err
 		}

diff --git a/internal/cmd/up.go b/internal/cmd/up.go
@@ -15,17 +15,13 @@ var upCmd = &cobra.Command{
 	Short: "Dump instruction for eval to up environment locally",
 	Long:  "Dump instruction for eval to up environment locally.",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		ctx, err := scope(cmd)
-		if err != nil {
-			return err
-		}
-		cnf, err := config.FromScope(ctx)
+		cnf, err := config.FromScope(scope(cmd))
 		if err != nil {
 			return err
 		}
 		sh := shell.New(os.Getenv("SHELL"))
 		commands := make([]shell.Command, 0, 8)
-		for variable, value := range cnf.Environment {
+		for variable, value := range forward.TransformEnvironment(cnf) {
 			commands = append(commands, sh.Assign(variable, value))
 		}
 		command, err := forward.Command(cnf, true)

diff --git a/internal/config/service.go b/internal/config/service.go
@@ -117,10 +117,14 @@ func Decode(scope internal.Scope, r io.Reader) (Service, error) {
 }
 
 // FromScope reads configuration from file and decodes it into the struct.
-func FromScope(scope internal.Scope) (Service, error) {
+func FromScope(scope internal.Scope, err error) (Service, error) {
+	var service Service
+	if err != nil {
+		return service, err
+	}
 	f, err := os.Open(scope.ConfigPath)
 	if err != nil {
-		return Service{}, err
+		return service, err
 	}
 	defer safe.Close(f)
 	return Decode(scope, f)

diff --git a/internal/forward/forward.go b/internal/forward/forward.go
@@ -31,12 +31,12 @@ func Command(cnf config.Service, detach bool) (shell.Command, error) {
 			if err != nil {
 				return command, err
 			}
-			if _, present := ports[remote]; present {
+			if _, found := ports[remote]; found {
 				continue
 			}
 			ports[remote] = struct{}{}
 			forward := strconv.Itoa(int(remote))
-			if local, present := cnf.PortMapping[remote]; present {
+			if local, found := cnf.PortMapping[remote]; found {
 				forward = fmt.Sprintf("%d:%d", local, remote)
 			}
 			args = append(args, forward)
@@ -71,6 +71,11 @@ func ExtractPort(connection string) (uint16, error) {
 	}
 }
 
+// ReplacePort replaces a port number in a connection definition.
+func ReplacePort(connection string, from, to uint16) string {
+	return strings.Replace(connection, strconv.FormatUint(uint64(from), 10), strconv.FormatUint(uint64(to), 10), 1)
+}
+
 // PodName builds pod name.
 func PodName(service, entity string, isLocal bool) string {
 	parts := append(make([]string, 0, 4), service)
@@ -81,6 +86,35 @@ func PodName(service, entity string, isLocal bool) string {
 	return strings.ToLower(strings.Join(parts, "-"))
 }
 
+// TransformEnvironment applies a port mapping to a copy of environment variables.
+func TransformEnvironment(cnf config.Service) config.Environment {
+	if len(cnf.PortMapping) == 0 {
+		return cnf.Environment
+	}
+
+	copied := config.Environment{}
+	for k, v := range cnf.Environment {
+		copied[k] = v
+	}
+
+	for _, dep := range cnf.Dependencies {
+		if len(dep.Forward) == 0 {
+			continue
+		}
+		for _, env := range dep.Forward {
+			remote, err := ExtractPort(copied[env])
+			if err != nil {
+				continue
+			}
+			if local, found := cnf.PortMapping[remote]; found {
+				copied[env] = ReplacePort(copied[env], remote, local)
+			}
+		}
+	}
+
+	return copied
+}
+
 // Shutdown returns commands to shutdown the forward tool.
 func Shutdown(cnf config.Service) []shell.Command {
 	return []shell.Command{