medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature: Arguments are now also passed as ENV variables (#296)

This commit is contained in:
James Read 2024-04-27 00:03:17 +01:00 committed by GitHub
parent 6a16a7c6c2
commit a783fc8cd4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/executor/executor.go
View File

@ -14,8 +14,10 @@ import (
"context" "context"
"fmt" "fmt"
"io" "io"
"os"
"os/exec" "os/exec"
"runtime" "runtime"
"strings"
"sync" "sync"
"time" "time"
) )
@ -352,6 +354,16 @@ func appendErrorToStderr(err error, logEntry *InternalLogEntry) {
} }
} }
func buildEnv(req *ExecutionRequest) []string {
ret := append(os.Environ(), "OLIVETIN=1")
for k, v := range req.Arguments {
ret = append(ret, fmt.Sprintf("%v=%v", strings.ToUpper(k), v))
}
return ret
}
func stepExec(req *ExecutionRequest) bool { func stepExec(req *ExecutionRequest) bool {
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(req.Action.Timeout)*time.Second) ctx, cancel := context.WithTimeout(context.Background(), time.Duration(req.Action.Timeout)*time.Second)
defer cancel() defer cancel()
@ -360,6 +372,7 @@ func stepExec(req *ExecutionRequest) bool {
var stderr bytes.Buffer var stderr bytes.Buffer
cmd := wrapCommandInShell(ctx, req.finalParsedCommand) cmd := wrapCommandInShell(ctx, req.finalParsedCommand)
cmd.Env = buildEnv(req)
cmd.Stdout = &stdout cmd.Stdout = &stdout
cmd.Stderr = &stderr cmd.Stderr = &stderr
req.logEntry.StdoutBuffer, _ = cmd.StdoutPipe() req.logEntry.StdoutBuffer, _ = cmd.StdoutPipe()