refactor: rename files -> stdin, stdout, stderr

_example/simple/conf.toml

@@ -12,12 +12,12 @@ procLimit = 50
 copyInCwd = true
 copyOut = ["stdout", "stderr"]
 copyOutCached = ["a"]
-[[stages.executor.with.default.files]]
+[stages.executor.with.default.stdin]
 content = ""
-[[stages.executor.with.default.files]]
+[stages.executor.with.default.stdout]
 name = "stdout"
 max = 4_096
-[[stages.executor.with.default.files]]
+[stages.executor.with.default.stderr]
 name = "stderr"
 max = 4_096
 [stages.parser]
@@ -39,21 +39,21 @@ copyOut = ["stdout", "stderr"]
 [stages.executor.with.default.copyInCached]
 a = "a"
 [[stages.executor.with.cases]]
-[[stages.executor.with.cases.files]]
+[stages.executor.with.cases.stdin]
 src = "1.stdin"
-[[stages.executor.with.cases.files]]
+[stages.executor.with.cases.stdout]
 name = "stdout"
 max = 4_096
-[[stages.executor.with.cases.files]]
+[stages.executor.with.cases.stderr]
 name = "stderr"
 max = 4_096
 [[stages.executor.with.cases]]
-[[stages.executor.with.cases.files]]
+[stages.executor.with.cases.stdin]
 src = "2.stdin"
-[[stages.executor.with.cases.files]]
+[stages.executor.with.cases.stdout]
 name = "stdout"
 max = 4_096
-[[stages.executor.with.cases.files]]
+[stages.executor.with.cases.stderr]
 name = "stderr"
 max = 4_096
 [stages.parser]

cmd/joj3/conf.go

@@ -22,9 +22,11 @@ type Conf struct {
 }
 
 type OptionalCmd struct {
-	Args  *[]string
-	Env   *[]string
-	Files *[]*stage.CmdFile
+	Args   *[]string
+	Env    *[]string
+	Stdin  *stage.CmdFile
+	Stdout *stage.CmdFile
+	Stderr *stage.CmdFile
 
 	CPULimit     *uint64
 	RealCPULimit *uint64

internal/executors/sandbox/convert.go

@@ -17,7 +17,7 @@ func convertPBCmd(cmd []stage.Cmd) []*pb.Request_CmdType {
 			Args:              c.Args,
 			Env:               c.Env,
 			Tty:               c.TTY,
-			Files:             convertPBFiles(c.Files),
+			Files:             convertPBFiles([]*stage.CmdFile{c.Stdin, c.Stdout, c.Stderr}),
 			CpuTimeLimit:      c.CPULimit,
 			ClockTimeLimit:    c.ClockLimit,
 			MemoryLimit:       c.MemoryLimit,

internal/stage/model.go

@@ -30,9 +30,11 @@ type CmdFile struct {
 
 // Cmd defines command and limits to start a program using in envexec
 type Cmd struct {
-	Args  []string   `json:"args"`
-	Env   []string   `json:"env,omitempty"`
-	Files []*CmdFile `json:"files,omitempty"`
+	Args   []string `json:"args"`
+	Env    []string `json:"env,omitempty"`
+	Stdin  *CmdFile `json:"stdin,omitempty"`
+	Stdout *CmdFile `json:"stdout,omitempty"`
+	Stderr *CmdFile `json:"stderr,omitempty"`
 
 	CPULimit     uint64 `json:"cpuLimit"`
 	RealCPULimit uint64 `json:"realCpuLimit"`