mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
Fix runner changes (#135)
* Upgrade iron-io/runner to 165c16a9 * fix support for Stdin to work
This commit is contained in:
committed by
C Cirello
parent
1da3c7c7cf
commit
064d597b60
@@ -29,7 +29,7 @@ type Config struct {
|
||||
AppName string
|
||||
Memory uint64
|
||||
Env map[string]string
|
||||
Input io.Reader
|
||||
Stdin io.Reader
|
||||
Stdout io.Writer
|
||||
Stderr io.Writer
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"bytes"
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
@@ -33,11 +34,9 @@ func TestRunnerHello(t *testing.T) {
|
||||
ID: fmt.Sprintf("hello-%d-%d", i, time.Now().Unix()),
|
||||
Image: test.route.Image,
|
||||
Timeout: 5 * time.Second,
|
||||
Env: map[string]string{
|
||||
"PAYLOAD": test.payload,
|
||||
},
|
||||
Stdout: &stdout,
|
||||
Stderr: &stderr,
|
||||
Stdin: strings.NewReader(test.payload),
|
||||
Stdout: &stdout,
|
||||
Stderr: &stderr,
|
||||
}
|
||||
|
||||
result, err := runner.Run(ctx, cfg)
|
||||
@@ -82,11 +81,9 @@ func TestRunnerError(t *testing.T) {
|
||||
ID: fmt.Sprintf("err-%d-%d", i, time.Now().Unix()),
|
||||
Image: test.route.Image,
|
||||
Timeout: 5 * time.Second,
|
||||
Env: map[string]string{
|
||||
"PAYLOAD": test.payload,
|
||||
},
|
||||
Stdout: &stdout,
|
||||
Stderr: &stderr,
|
||||
Stdin: strings.NewReader(test.payload),
|
||||
Stdout: &stdout,
|
||||
Stderr: &stderr,
|
||||
}
|
||||
|
||||
result, err := runner.Run(ctx, cfg)
|
||||
|
||||
@@ -20,7 +20,7 @@ func (t *containerTask) EnvVars() map[string]string {
|
||||
return t.cfg.Env
|
||||
}
|
||||
func (t *containerTask) Input() io.Reader {
|
||||
return t.cfg.Input
|
||||
return t.cfg.Stdin
|
||||
}
|
||||
|
||||
func (t *containerTask) Labels() map[string]string {
|
||||
|
||||
@@ -141,7 +141,7 @@ func handleRequest(c *gin.Context, enqueue models.Enqueue) {
|
||||
Stderr: stderr,
|
||||
Env: envVars,
|
||||
Memory: el.Memory,
|
||||
Input: payload,
|
||||
Stdin: payload,
|
||||
}
|
||||
|
||||
var err error
|
||||
|
||||
Reference in New Issue
Block a user