job,run: Move Input and Output structs to run namespace

Signed-off-by: Alexander Jung <a.jung@lancs.ac.uk>

cmd/run.go

@@ -39,10 +39,9 @@ import (
   "os/signal"
 
 	"github.com/spf13/cobra"
-	"github.com/lancs-net/ukbench/log"
 
+	"github.com/lancs-net/ukbench/log"
 	"github.com/lancs-net/ukbench/job"
-	"github.com/lancs-net/ukbench/run"
 )
 
 type RunConfig struct {

job/job.go

@@ -41,6 +41,7 @@ import (
 
   "gopkg.in/yaml.v2"
   "github.com/lancs-net/ukbench/log"
+  "github.com/lancs-net/ukbench/run"
 )
 
 type JobParam struct {
@@ -54,16 +55,6 @@ type JobParam struct {
   StepMode  string `yaml:"step_mode"`
 }
 
-type Input struct {
-  Name string `yaml:"name"`
-  Path string `yaml:"path"`
-}
-
-type Output struct {
-  Name string `yaml:"name"`
-  Path string `yaml:"path"`
-}
-
 type Run struct {
   Name      string `yaml:"name"`
   Image     string `yaml:"image"`
@@ -75,10 +66,10 @@ type Run struct {
 }
 
 type Job struct {
-  Params        []JobParam `yaml:"params"`
-  Inputs        []Input    `yaml:"inputs"`
-  Outputs       []Output   `yaml:"outputs"`
-  Runs          []Run      `yaml:"runs"`
+  Params        []JobParam   `yaml:"params"`
+  Inputs        []run.Input  `yaml:"inputs"`
+  Outputs       []run.Output `yaml:"outputs"`
+  Runs          []Run        `yaml:"runs"`
   waitList     *List
   scheduleGrace int
 }

job/task.go

@@ -50,8 +50,8 @@ type TaskParam struct {
 // Task is the specific iterated configuration
 type Task struct {
   Params      []TaskParam
-  Inputs     *[]Input
-  Outputs    *[]Output
+  Inputs     *[]run.Input
+  Outputs    *[]run.Output
   runs         *Queue
   uuid          string
   workDir       string

run/run.go

@@ -44,6 +44,16 @@ const (
   RUNC
 )
 
+type Input struct {
+  Name string `yaml:"name"`
+  Path string `yaml:"path"`
+}
+
+type Output struct {
+  Name string `yaml:"name"`
+  Path string `yaml:"path"`
+}
+
 type RunnerConfig struct {
   Log          *log.Logger
   WorkDir       string