Implement environment vars for executions

Author: mblaschke

sync/config.go

@@ -31,6 +31,11 @@ type DatabaseOptions struct {
 	Mysql string
 }
 
+type EnvironmentVar struct {
+	Name string
+	Value string
+}
+
 type Database struct {
 	Type string
 	Schema string
@@ -64,6 +69,7 @@ type Execution struct {
 	Type string
 	Command YamlStringArray
 	Workdir string
+	Environment []EnvironmentVar
 	Options struct {
 	}
 }

sync/database.go

@@ -9,7 +9,7 @@ import (
 
 func (database *Database) ApplyDefaults(server *Server) {
 	// set default connection if not set
-	if (commandbuilder.Connection{}) == database.Connection {
+	if database.Connection.IsEmpty() {
 		database.Connection = server.Connection
 	}
 }

sync/execution.go

@@ -35,13 +35,20 @@ func (execution *Execution) commandBuilder(server *Server) []interface{} {
 	case "local":
 		connection = commandbuilder.Connection{Type:"local"}
 	case "remote":
-		connection = server.Connection
+		connection = server.Connection.Clone()
 	}
 
+	// set working directory
 	if execution.Workdir != "" {
 		connection.WorkDir = execution.Workdir
 	}
 
+	// set environment
+	connection.Environment = map[string]string{}
+	for _, val := range execution.Environment {
+		connection.Environment[val.Name] = val.Value
+	}
+
 	if len(execution.Command.Multi) >= 1 {
 		// multi element command (use safer quoting)
 		return connection.ShellCommandBuilder(execution.Command.Multi...)

sync/filesystem.go

@@ -3,12 +3,11 @@ package sync
 import (
 	"fmt"
 	"strings"
-	"github.com/webdevops/go-shell/commandbuilder"
 )
 
 func (filesystem *Filesystem) ApplyDefaults(server *Server) {
 	// set default connection if not set
-	if (commandbuilder.Connection{}) == filesystem.Connection {
+	if filesystem.Connection.IsEmpty() {
 		filesystem.Connection = server.Connection
 	}