Merge pull request #2 from ethpandaops/test-scheduler

Split test definitions from test executions & rework UI (structural work to allow dynamic test invocation)

Author: pk910

cmd/root.go

@@ -31,7 +31,7 @@ var rootCmd = &cobra.Command{
 			logr.SetLevel(logrus.DebugLevel)
 		}
 
-		coord := coordinator.NewCoordinator(config, logr, metricsPort, lameDuckSeconds)
+		coord := coordinator.NewCoordinator(config, logr, metricsPort)
 
 		if err := coord.Run(cmd.Context()); err != nil {
 			log.Fatal(err)
@@ -41,11 +41,10 @@ var rootCmd = &cobra.Command{
 }
 
 var (
-	cfgFile         string
-	logFormat       string
-	verbose         bool
-	metricsPort     int
-	lameDuckSeconds int
+	cfgFile     string
+	logFormat   string
+	verbose     bool
+	metricsPort int
 )
 
 // Execute adds all child commands to the root command and sets flags appropriately.
@@ -65,5 +64,4 @@ func init() {
 	rootCmd.Flags().BoolVarP(&verbose, "verbose", "v", false, "Verbose output")
 
 	rootCmd.Flags().IntVarP(&metricsPort, "metrics-port", "", 9090, "Port to serve Prometheus metrics on")
-	rootCmd.Flags().IntVarP(&lameDuckSeconds, "lame-duck-seconds", "", 30, "Lame duck period in seconds (wait for this long after completion before terminating")
 }

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/donovanhide/eventsource v0.0.0-20210830082556-c59027999da0
 	github.com/ethereum/go-ethereum v1.13.8
 	github.com/ethpandaops/ethwallclock v0.3.0
+	github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75
 	github.com/gorilla/mux v1.8.1
 	github.com/herumi/bls-eth-go-binary v1.31.0
 	github.com/holiman/uint256 v1.2.4

go.sum

@@ -113,6 +113,8 @@ github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 h1:f0n1xnMSmBLzVfsMMvriDyA75NB/oBgILX2GcHXIQzY=
+github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=

pkg/coordinator/config.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/ethpandaops/assertoor/pkg/coordinator/clients"
 	"github.com/ethpandaops/assertoor/pkg/coordinator/names"
-	"github.com/ethpandaops/assertoor/pkg/coordinator/test"
+	"github.com/ethpandaops/assertoor/pkg/coordinator/types"
 	web_types "github.com/ethpandaops/assertoor/pkg/coordinator/web/types"
 	"gopkg.in/yaml.v3"
 )
@@ -24,10 +24,10 @@ type Config struct {
 	GlobalVars map[string]interface{} `yaml:"globalVars" json:"globalVars"`
 
 	// List of Test configurations.
-	Tests []*test.Config `yaml:"tests" json:"tests"`
+	Tests []*types.TestConfig `yaml:"tests" json:"tests"`
 
 	// List of yaml files with test configurations
-	ExternalTests []*test.ExternalConfig `yaml:"externalTests" json:"externalTests"`
+	ExternalTests []*types.ExternalTestConfig `yaml:"externalTests" json:"externalTests"`
 }
 
 // DefaultConfig represents a sane-default configuration.
@@ -41,8 +41,8 @@ func DefaultConfig() *Config {
 			},
 		},
 		GlobalVars:    make(map[string]interface{}),
-		Tests:         []*test.Config{},
-		ExternalTests: []*test.ExternalConfig{},
+		Tests:         []*types.TestConfig{},
+		ExternalTests: []*types.ExternalTestConfig{},
 	}
 }