diff --git a/.gitignore b/.gitignore index 4526a6e..10cfefe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ # Project binary poseidon + # TLS certificate/key *.crt *.key + +configuration.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d512d05..4a4e9ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ test: stage: test needs: [] script: - - go test ./... -v -coverprofile coverage.cov + - go test $(go list ./... | grep -v /e2e) -v -coverprofile coverage.cov - go tool cover -func=coverage.cov - go tool cover -html=coverage.cov -o coverage.html artifacts: diff --git a/README.md b/README.md index 2340611..2540ee1 100644 --- a/README.md +++ b/README.md @@ -69,3 +69,11 @@ You can create a self-signed certificate to use with this API using the followin ```shell $ openssl req -x509 -nodes -newkey rsa:2048 -keyout server.rsa.key -out server.rsa.crt -days 3650 ``` + +## Tests + +As testing framework we use the [testify](https://github.com/stretchr/testify) toolkit. +For mocks we use [mockery](https://github.com/vektra/mockery). +With Mockery, you can create mocks by running `mockery -r --name=<>` on a specific interface. +If the interface changes, you can rerun this command. +For e2e tests we provide a separate package. E2e tests require the connection to a Nomad cluster. diff --git a/api/api.go b/api/api.go index d32413f..a06d63b 100644 --- a/api/api.go +++ b/api/api.go @@ -3,12 +3,19 @@ package api import ( "encoding/json" "github.com/gorilla/mux" + "gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/logging" "net/http" ) var log = logging.GetLogger("api") +const ( + RouteBase = "/api/v1" + RouteHealth = "/health" + RouteRunners = "/runners" +) + // NewRouter returns an HTTP handler (http.Handler) which can be // used by the net/http package to serve the routes of our API. It // always returns a router for the newest version of our API. We @@ -23,20 +30,34 @@ func NewRouter() http.Handler { return router } -// newRouterV1 returns a subrouter containing the routes of version +// newRouterV1 returns a sub-router containing the routes of version // 1 of our API. func newRouterV1(router *mux.Router) *mux.Router { - v1 := router.PathPrefix("/api/v1").Subrouter() - v1.HandleFunc("/health", Health).Methods(http.MethodGet) + v1 := router.PathPrefix(RouteBase).Subrouter() + v1.HandleFunc(RouteHealth, Health).Methods(http.MethodGet) + registerRunnerRoutes(v1.PathPrefix(RouteRunners).Subrouter()) return v1 } -func writeJson(writer http.ResponseWriter, content interface{}) { +func writeInternalServerError(writer http.ResponseWriter, err error, errorCode dto.ErrorCode) { + sendJson(writer, &dto.InternalServerError{Message: err.Error(), ErrorCode: errorCode}, http.StatusInternalServerError) +} + +func writeBadRequest(writer http.ResponseWriter, err error) { + sendJson(writer, &dto.ClientError{Message: err.Error()}, http.StatusBadRequest) +} + +func writeNotFound(writer http.ResponseWriter, err error) { + sendJson(writer, &dto.ClientError{Message: err.Error()}, http.StatusNotFound) +} + +func sendJson(writer http.ResponseWriter, content interface{}, httpStatusCode int) { writer.Header().Set("Content-Type", "application/json") + writer.WriteHeader(httpStatusCode) response, err := json.Marshal(content) if err != nil { - log.WithError(err).Warn("JSON marshal error") - http.Error(writer, err.Error(), http.StatusInternalServerError) + // cannot produce infinite recursive loop, since json.Marshal of dto.InternalServerError won't return an error + writeInternalServerError(writer, err, dto.ErrorUnknown) return } if _, err := writer.Write(response); err != nil { diff --git a/api/dto/dto.go b/api/dto/dto.go new file mode 100644 index 0000000..6e000ab --- /dev/null +++ b/api/dto/dto.go @@ -0,0 +1,33 @@ +package dto + +// RequestRunner is the expected json structure of the request body for the ProvideRunner function +type RequestRunner struct { + ExecutionEnvironmentId int `json:"executionEnvironmentId"` + InactivityTimeout int `json:"inactivityTimeout"` +} + +// ResponseRunner is the expected result from the api server +type ResponseRunner struct { + Id string `json:"runnerId"` +} + +// ClientError is the response interface if the request is not valid +type ClientError struct { + Message string `json:"message"` +} + +// InternalServerError is the response interface that is returned when an error occurs +type InternalServerError struct { + Message string `json:"message"` + ErrorCode ErrorCode `json:"errorCode"` +} + +// ErrorCode is the type for error codes expected by CodeOcean +type ErrorCode string + +const ( + ErrorNomadUnreachable ErrorCode = "NOMAD_UNREACHABLE" + ErrorNomadOverload ErrorCode = "NOMAD_OVERLOAD" + ErrorNomadInternalServerError ErrorCode = "NOMAD_INTERNAL_SERVER_ERROR" + ErrorUnknown ErrorCode = "UNKNOWN" +) diff --git a/api/health.go b/api/health.go index 3ba843f..18dfdd8 100644 --- a/api/health.go +++ b/api/health.go @@ -7,8 +7,5 @@ import ( // Health tries to respond that the server is alive. // If it is not, the response won't reach the client. func Health(writer http.ResponseWriter, _ *http.Request) { - writeJson( - writer, - Message{"I'm alive!"}, - ) + writer.WriteHeader(http.StatusNoContent) } diff --git a/api/health_test.go b/api/health_test.go index 06209de..5be57d1 100644 --- a/api/health_test.go +++ b/api/health_test.go @@ -1,7 +1,6 @@ package api import ( - "encoding/json" "github.com/stretchr/testify/assert" "net/http" "net/http/httptest" @@ -15,10 +14,5 @@ func TestHealthRoute(t *testing.T) { } recorder := httptest.NewRecorder() http.HandlerFunc(Health).ServeHTTP(recorder, request) - result := Message{} - _ = json.Unmarshal(recorder.Body.Bytes(), &result) - - assert.Equal(t, http.StatusOK, recorder.Code) - assert.Equal(t, "application/json", recorder.Header().Get("Content-Type")) - assert.Equal(t, "I'm alive!", result.Message) + assert.Equal(t, http.StatusNoContent, recorder.Code) } diff --git a/api/response_messages.go b/api/response_messages.go deleted file mode 100644 index a3de614..0000000 --- a/api/response_messages.go +++ /dev/null @@ -1,5 +0,0 @@ -package api - -type Message struct { - Message string `json:"msg"` -} diff --git a/api/runners.go b/api/runners.go new file mode 100644 index 0000000..a1096b0 --- /dev/null +++ b/api/runners.go @@ -0,0 +1,35 @@ +package api + +import ( + "encoding/json" + "github.com/gorilla/mux" + "gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" + "gitlab.hpi.de/codeocean/codemoon/poseidon/environment" + "net/http" +) + +// ProvideRunner tries to respond with the id of a runner. +// This runner is then reserved for future use. +func ProvideRunner(writer http.ResponseWriter, request *http.Request) { + runnerRequest := new(dto.RequestRunner) + if err := json.NewDecoder(request.Body).Decode(runnerRequest); err != nil { + writeBadRequest(writer, err) + return + } + environment, err := environment.GetExecutionEnvironment(runnerRequest.ExecutionEnvironmentId) + if err != nil { + writeNotFound(writer, err) + return + } + runner, err := environment.NextRunner() + if err != nil { + writeInternalServerError(writer, err, dto.ErrorNomadOverload) + return + } + + sendJson(writer, &dto.ResponseRunner{Id: runner.Id()}, http.StatusOK) +} + +func registerRunnerRoutes(router *mux.Router) { + router.HandleFunc("", ProvideRunner).Methods(http.MethodPost) +} diff --git a/config/config.go b/config/config.go index 90e22f9..1237e24 100644 --- a/config/config.go +++ b/config/config.go @@ -6,6 +6,7 @@ import ( "fmt" "gitlab.hpi.de/codeocean/codemoon/poseidon/logging" "gopkg.in/yaml.v3" + "net/url" "os" "reflect" "strconv" @@ -24,6 +25,7 @@ var ( Nomad: nomad{ Address: "", Token: "", + Port: 4646, TLS: false, }, Logger: logger{ @@ -49,6 +51,7 @@ type server struct { type nomad struct { Address string Token string + Port int TLS bool } @@ -68,9 +71,29 @@ func InitConfig() { Config.mergeEnvironmentVariables() } +func (c *configuration) NomadAPIURL() *url.URL { + return parseURL(Config.Nomad.Address, Config.Nomad.Port, Config.Nomad.TLS) +} + +func (c *configuration) PoseidonAPIURL() *url.URL { + return parseURL(Config.Server.Address, Config.Server.Port, false) +} + +func parseURL(address string, port int, tls bool) *url.URL { + scheme := "http" + if tls { + scheme = "https" + } + return &url.URL{ + Scheme: scheme, + Host: fmt.Sprintf("%s:%d", address, port), + } +} + func readConfigFile() []byte { var configFilePath string flag.StringVar(&configFilePath, "config", "./configuration.yaml", "path of the yaml config file") + flag.Parse() data, err := os.ReadFile(configFilePath) if err != nil { log.WithError(err).Info("Using default configuration...") diff --git a/e2e/e2e_tests.go b/e2e/e2e_tests.go new file mode 100644 index 0000000..eed680f --- /dev/null +++ b/e2e/e2e_tests.go @@ -0,0 +1,21 @@ +package e2e + +import ( + "fmt" + "gitlab.hpi.de/codeocean/codemoon/poseidon/api" + "gitlab.hpi.de/codeocean/codemoon/poseidon/config" + "strings" +) + +/* +* # E2E Tests +* +* For the e2e tests a nomad cluster must be connected and poseidon must be running. + */ + +var baseURL = fmt.Sprintf("http://%s:%d", config.Config.Server.Address, config.Config.Server.Port) + +func buildURL(parts ...string) (url string) { + parts = append([]string{baseURL, api.RouteBase}, parts...) + return strings.Join(parts, "") +} diff --git a/e2e/health_test.go b/e2e/health_test.go new file mode 100644 index 0000000..5ce45af --- /dev/null +++ b/e2e/health_test.go @@ -0,0 +1,14 @@ +package e2e + +import ( + "github.com/stretchr/testify/assert" + "gitlab.hpi.de/codeocean/codemoon/poseidon/api" + "net/http" + "testing" +) + +func TestHealthRoute(t *testing.T) { + resp, err := http.Get(buildURL(api.RouteHealth)) + assert.NoError(t, err) + assert.Equal(t, http.StatusNoContent, resp.StatusCode, "The response code should be NoContent") +} diff --git a/e2e/runners_test.go b/e2e/runners_test.go new file mode 100644 index 0000000..c131213 --- /dev/null +++ b/e2e/runners_test.go @@ -0,0 +1,24 @@ +package e2e + +import ( + "encoding/json" + "github.com/stretchr/testify/assert" + "gitlab.hpi.de/codeocean/codemoon/poseidon/api" + "gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" + "net/http" + "strings" + "testing" +) + +func TestProvideRunnerRoute(t *testing.T) { + reader := strings.NewReader(`{"executionEnvironmentId":0}`) + resp, err := http.Post(buildURL(api.RouteRunners), "application/json", reader) + assert.NoError(t, err) + assert.Equal(t, http.StatusOK, resp.StatusCode, "The response code should be ok") + + runnerResponse := new(dto.ResponseRunner) + err = json.NewDecoder(resp.Body).Decode(runnerResponse) + assert.NoError(t, err) + + assert.True(t, runnerResponse.Id != "", "The response contains a runner id") +} diff --git a/environment/execution_environment.go b/environment/execution_environment.go new file mode 100644 index 0000000..176ef02 --- /dev/null +++ b/environment/execution_environment.go @@ -0,0 +1,107 @@ +package environment + +import ( + "errors" + "gitlab.hpi.de/codeocean/codemoon/poseidon/environment/pool" + "gitlab.hpi.de/codeocean/codemoon/poseidon/logging" + "gitlab.hpi.de/codeocean/codemoon/poseidon/nomad" + "gitlab.hpi.de/codeocean/codemoon/poseidon/runner" + "time" +) + +var log = logging.GetLogger("execution_environment") + +// ExecutionEnvironment is a partial image of an execution environment in CodeOcean. +type ExecutionEnvironment interface { + // NextRunner gets the next available runner and marks it as running. + // If no runner is available it throws a error after a small timeout + NextRunner() (runner.Runner, error) + // Refresh fetches the runners for this execution environment and sends them to the pool. + // This function does not terminate. Instead it fetches new runners periodically. + Refresh() +} + +// NomadExecutionEnvironment is an implementation that returns a nomad specific execution environment. +// Here it is mapped on a Job in Nomad. +// The jobId has to match the only Nomad task group name! +type NomadExecutionEnvironment struct { + id int + jobId string + availableRunners chan runner.Runner + allRunners pool.RunnerPool + nomadApiClient nomad.ExecutorApi +} + +var executionEnvironment ExecutionEnvironment + +// DebugInit initializes one execution environment so that its runners can be provided. +// ToDo: This should be replaced by a create Execution Environment route +func DebugInit(runnersPool pool.RunnerPool, nomadApi nomad.ExecutorApi) { + executionEnvironment = &NomadExecutionEnvironment{ + id: 0, + jobId: "python", + availableRunners: make(chan runner.Runner, 50), + nomadApiClient: nomadApi, + allRunners: runnersPool, + } + go executionEnvironment.Refresh() +} + +// GetExecutionEnvironment returns a previously added ExecutionEnvironment. +// This way you can access all Runners for that environment, +func GetExecutionEnvironment(id int) (ExecutionEnvironment, error) { + // TODO: Remove hardcoded execution environment + return executionEnvironment, nil +} + +func (environment *NomadExecutionEnvironment) NextRunner() (r runner.Runner, err error) { + select { + case r = <-environment.availableRunners: + r.SetStatus(runner.StatusRunning) + return r, nil + case <-time.After(50 * time.Millisecond): + return nil, errors.New("no runners available") + } +} + +// Refresh Big ToDo: Improve this function!! State out that it also rescales the job; Provide context to be terminable... +func (environment *NomadExecutionEnvironment) Refresh() { + for { + runners, err := environment.nomadApiClient.LoadRunners(environment.jobId) + if err != nil { + log.WithError(err).Printf("Failed fetching runners") + break + } + for _, r := range environment.unusedRunners(runners) { + // ToDo: Listen on Nomad event stream + log.Printf("Adding allocation %+v", r) + environment.allRunners.AddRunner(r) + environment.availableRunners <- r + } + jobScale, err := environment.nomadApiClient.GetJobScale(environment.jobId) + if err != nil { + log.WithError(err).Printf("Failed get allocation count") + break + } + neededRunners := cap(environment.availableRunners) - len(environment.availableRunners) + 1 + runnerCount := jobScale + neededRunners + time.Sleep(50 * time.Millisecond) + log.Printf("Set job scaling %d", runnerCount) + err = environment.nomadApiClient.SetJobScaling(environment.jobId, runnerCount, "Runner Requested") + if err != nil { + log.WithError(err).Printf("Failed set allocation scaling") + continue + } + } +} + +func (environment *NomadExecutionEnvironment) unusedRunners(fetchedRunnerIds []string) (newRunners []runner.Runner) { + newRunners = make([]runner.Runner, 0) + for _, runnerId := range fetchedRunnerIds { + _, ok := environment.allRunners.GetRunner(runnerId) + if !ok { + newRunners = append(newRunners, runner.NewExerciseRunner(runnerId)) + } + } + return +} diff --git a/environment/execution_environment_test.go b/environment/execution_environment_test.go new file mode 100644 index 0000000..f9a2367 --- /dev/null +++ b/environment/execution_environment_test.go @@ -0,0 +1,111 @@ +package environment + +import ( + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" + "gitlab.hpi.de/codeocean/codemoon/poseidon/environment/pool" + "gitlab.hpi.de/codeocean/codemoon/poseidon/mocks" + "gitlab.hpi.de/codeocean/codemoon/poseidon/runner" + "testing" + "time" +) + +const runnerId = "s0m3-r4nd0m-1d" +const anotherRunnerId = "4n0th3r-1d" +const jobId = "4n0th3r-1d" + +func TestGetNextRunnerTestSuite(t *testing.T) { + suite.Run(t, new(GetNextRunnerTestSuite)) +} + +type GetNextRunnerTestSuite struct { + suite.Suite + nomadExecutionEnvironment *NomadExecutionEnvironment + exerciseRunner runner.Runner +} + +func (suite *GetNextRunnerTestSuite) SetupTest() { + suite.nomadExecutionEnvironment = &NomadExecutionEnvironment{ + availableRunners: make(chan runner.Runner, 50), + allRunners: pool.NewLocalRunnerPool(), + } + suite.exerciseRunner = runner.NewExerciseRunner(runnerId) +} + +func (suite *GetNextRunnerTestSuite) TestGetNextRunnerReturnsRunnerIfAvailable() { + suite.nomadExecutionEnvironment.availableRunners <- suite.exerciseRunner + + receivedRunner, err := suite.nomadExecutionEnvironment.NextRunner() + suite.NoError(err) + suite.Equal(suite.exerciseRunner, receivedRunner) +} + +func (suite *GetNextRunnerTestSuite) TestGetNextRunnerChangesStatusOfRunner() { + suite.nomadExecutionEnvironment.availableRunners <- suite.exerciseRunner + + receivedRunner, _ := suite.nomadExecutionEnvironment.NextRunner() + suite.Equal(runner.StatusRunning, receivedRunner.Status()) +} + +func (suite *GetNextRunnerTestSuite) TestGetNextRunnerDoesNotReturnTheSameRunnerTwice() { + suite.nomadExecutionEnvironment.availableRunners <- suite.exerciseRunner + suite.nomadExecutionEnvironment.availableRunners <- runner.NewExerciseRunner(anotherRunnerId) + + firstReceivedRunner, _ := suite.nomadExecutionEnvironment.NextRunner() + secondReceivedRunner, _ := suite.nomadExecutionEnvironment.NextRunner() + suite.NotEqual(firstReceivedRunner, secondReceivedRunner) +} + +func (suite *GetNextRunnerTestSuite) TestGetNextRunnerThrowsAnErrorIfNoRunnersAvailable() { + receivedRunner, err := suite.nomadExecutionEnvironment.NextRunner() + suite.Nil(receivedRunner) + suite.Error(err) +} + +func TestRefreshFetchRunners(t *testing.T) { + apiMock, environment := newRefreshMock([]string{runnerId}, pool.NewLocalRunnerPool()) + // ToDo: Terminate Refresh when test finished (also in other tests) + go environment.Refresh() + _, _ = environment.NextRunner() + apiMock.AssertCalled(t, "LoadRunners", jobId) +} + +func TestRefreshFetchesRunnersIntoChannel(t *testing.T) { + _, environment := newRefreshMock([]string{runnerId}, pool.NewLocalRunnerPool()) + go environment.Refresh() + availableRunner, _ := environment.NextRunner() + assert.Equal(t, availableRunner.Id(), runnerId) +} + +func TestRefreshScalesJob(t *testing.T) { + apiMock, environment := newRefreshMock([]string{runnerId}, pool.NewLocalRunnerPool()) + go environment.Refresh() + _, _ = environment.NextRunner() + time.Sleep(100 * time.Millisecond) // ToDo: Be safe this test is not flaky + apiMock.AssertCalled(t, "SetJobScaling", jobId, 52, "Runner Requested") +} + +func TestRefreshAddsRunnerToPool(t *testing.T) { + runnersInUse := pool.NewLocalRunnerPool() + _, environment := newRefreshMock([]string{runnerId}, runnersInUse) + go environment.Refresh() + availableRunner, _ := environment.NextRunner() + poolRunner, ok := runnersInUse.GetRunner(availableRunner.Id()) + assert.True(t, ok, "The requested runner is added to the pool") + assert.Equal(t, availableRunner, poolRunner, "The requested runner equals the runner added to the pool") +} + +func newRefreshMock(returnedRunnerIds []string, allRunners pool.RunnerPool) (apiClient *mocks.ExecutorApi, environment *NomadExecutionEnvironment) { + apiClient = &mocks.ExecutorApi{} + apiClient.On("LoadRunners", jobId).Return(returnedRunnerIds, nil) + apiClient.On("GetJobScale", jobId).Return(len(returnedRunnerIds), nil) + apiClient.On("SetJobScaling", jobId, mock.AnythingOfType("int"), "Runner Requested").Return(nil) + environment = &NomadExecutionEnvironment{ + jobId: jobId, + availableRunners: make(chan runner.Runner, 50), + allRunners: allRunners, + nomadApiClient: apiClient, + } + return +} diff --git a/environment/pool/pool.go b/environment/pool/pool.go new file mode 100644 index 0000000..3a5e169 --- /dev/null +++ b/environment/pool/pool.go @@ -0,0 +1,51 @@ +package pool + +import ( + "gitlab.hpi.de/codeocean/codemoon/poseidon/runner" + "sync" +) + +// RunnerPool is the interface for storing runners +// ToDo: Create interface implementation that use some persistent storage like a database +type RunnerPool interface { + // AddRunner adds a provided runner to the pool storage + AddRunner(runner.Runner) + // GetRunner returns a runner from the pool storage + // If the requested runner is not stored 'ok' will be false + GetRunner(id string) (r runner.Runner, ok bool) + // DeleteRunner deletes the runner with the passed id from the pool storage + DeleteRunner(id string) +} + +// localRunnerPool stores runner objects in the local application memory +type localRunnerPool struct { + sync.RWMutex + runners map[string]runner.Runner +} + +// NewLocalRunnerPool responds with a RunnerPool implementation +// This implementation stores the data thread-safe in the local application memory +func NewLocalRunnerPool() *localRunnerPool { + return &localRunnerPool{ + runners: make(map[string]runner.Runner), + } +} + +func (pool *localRunnerPool) AddRunner(r runner.Runner) { + pool.Lock() + defer pool.Unlock() + pool.runners[r.Id()] = r +} + +func (pool *localRunnerPool) GetRunner(id string) (r runner.Runner, ok bool) { + pool.RLock() + defer pool.RUnlock() + r, ok = pool.runners[id] + return +} + +func (pool *localRunnerPool) DeleteRunner(id string) { + pool.Lock() + defer pool.Unlock() + delete(pool.runners, id) +} diff --git a/environment/pool/pool_test.go b/environment/pool/pool_test.go new file mode 100644 index 0000000..3f71c36 --- /dev/null +++ b/environment/pool/pool_test.go @@ -0,0 +1,24 @@ +package pool + +import ( + "github.com/stretchr/testify/assert" + "gitlab.hpi.de/codeocean/codemoon/poseidon/runner" + "testing" +) + +const runnerId = "s0m3-r4nd0m-1d" + +func TestAddedRunnerCanBeRetrieved(t *testing.T) { + runnerPool := NewLocalRunnerPool() + runnerPool.AddRunner(runner.NewExerciseRunner(runnerId)) + _, ok := runnerPool.GetRunner(runnerId) + assert.True(t, ok, "A saved runner should be retrievable") +} + +func TestDeletedRunnersAreNotAccessible(t *testing.T) { + pool := NewLocalRunnerPool() + pool.AddRunner(runner.NewExerciseRunner(runnerId)) + pool.DeleteRunner(runnerId) + _, ok := pool.GetRunner(runnerId) + assert.False(t, ok, "A deleted runner should not be accessible") +} diff --git a/go.mod b/go.mod index c44181e..31e064b 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,15 @@ go 1.16 require ( github.com/gorilla/mux v1.8.0 + github.com/gorilla/websocket v1.4.2 // indirect + github.com/hashicorp/cronexpr v1.1.1 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/nomad/api v0.0.0-20210430020956-28b8767b278f + github.com/kr/text v0.2.0 // indirect + github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/sirupsen/logrus v1.8.1 github.com/stretchr/testify v1.7.0 + github.com/vektra/mockery/v2 v2.7.4 // indirect golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) diff --git a/go.sum b/go.sum index 3ff8f7b..3265b5c 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,373 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk= +github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/cronexpr v1.1.0/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4= +github.com/hashicorp/cronexpr v1.1.1 h1:NJZDd87hGXjoZBdvyCF9mX4DCq5Wy7+A/w+A7q0wn6c= +github.com/hashicorp/cronexpr v1.1.1/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/nomad/api v0.0.0-20210427204147-c519c9054df8 h1:bkAOQ2qusnIRWuGeDDZJlogP5FS1ebCU/SjL9v8PcdY= +github.com/hashicorp/nomad/api v0.0.0-20210427204147-c519c9054df8/go.mod h1:vYHP9jMXk4/T2qNUbWlQ1OHCA1hHLil3nvqSmz8mtgc= +github.com/hashicorp/nomad/api v0.0.0-20210430020956-28b8767b278f h1:XaaK4F+pOV2ZYk3aCIDAZThm3voKD6nyOUNeUY3yHgY= +github.com/hashicorp/nomad/api v0.0.0-20210430020956-28b8767b278f/go.mod h1:vYHP9jMXk4/T2qNUbWlQ1OHCA1hHLil3nvqSmz8mtgc= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.18.0 h1:CbAm3kP2Tptby1i9sYy2MGRg0uxIN9cyDb59Ys7W8z8= +github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= +github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/vektra/mockery v1.1.2 h1:uc0Yn67rJpjt8U/mAZimdCKn9AeA97BOkjpmtBSlfP4= +github.com/vektra/mockery v1.1.2/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU= +github.com/vektra/mockery/v2 v2.7.4 h1:GCtKjWqi6rC0hauletxdCYXR0XdAzsjVWlRdPBdpXbg= +github.com/vektra/mockery/v2 v2.7.4/go.mod h1:2gU4Cf/f8YyC8oEaSXfCnZBMxMjMl/Ko205rlP0fO90= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 h1:dXfMednGJh/SUUFjTLsWJz3P+TQt9qnR11GgeI3vWKs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e h1:ssd5ulOvVWlh4kDSUF2SqzmMeWfjmwDXM+uGw/aQjRE= +golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/main.go b/main.go index 40f54d8..9b42130 100644 --- a/main.go +++ b/main.go @@ -2,10 +2,12 @@ package main import ( "context" - "fmt" "gitlab.hpi.de/codeocean/codemoon/poseidon/api" "gitlab.hpi.de/codeocean/codemoon/poseidon/config" + "gitlab.hpi.de/codeocean/codemoon/poseidon/environment" + "gitlab.hpi.de/codeocean/codemoon/poseidon/environment/pool" "gitlab.hpi.de/codeocean/codemoon/poseidon/logging" + "gitlab.hpi.de/codeocean/codemoon/poseidon/nomad" "net/http" "os" "os/signal" @@ -36,28 +38,45 @@ func runServer(server *http.Server) { } } -func main() { - config.InitConfig() - logging.InitializeLogging(config.Config.Logger.Level) - - server := &http.Server{ - Addr: fmt.Sprintf("%s:%d", config.Config.Server.Address, config.Config.Server.Port), +func initServer() *http.Server { + return &http.Server{ + Addr: config.Config.PoseidonAPIURL().Host, WriteTimeout: time.Second * 15, ReadTimeout: time.Second * 15, IdleTimeout: time.Second * 60, Handler: api.NewRouter(), } +} - go runServer(server) - +// shutdownOnOSSignal listens for a signal from the operation system +// When receiving a signal the server shuts down but waits up to 15 seconds to close remaining connections +func shutdownOnOSSignal(server *http.Server) { // wait for SIGINT signals := make(chan os.Signal, 1) signal.Notify(signals, os.Interrupt) <-signals log.Info("Received SIGINT, shutting down ...") - // shutdown the server but wait up to 15 seconds to close remaining connections ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) defer cancel() _ = server.Shutdown(ctx) } + +func main() { + config.InitConfig() + logging.InitializeLogging(config.Config.Logger.Level) + server := initServer() + log.WithField("address", server.Addr).Info("Starting server") + + // API initialization + nomadAPIClient, err := nomad.New(config.Config.NomadAPIURL()) + if err != nil { + log.WithError(err).WithField("nomad url", config.Config.NomadAPIURL()).Fatal("Error parsing the nomad url") + } + // ToDo: Move to create execution environment + runnersPool := pool.NewLocalRunnerPool() + environment.DebugInit(runnersPool, nomadAPIClient) + + go runServer(server) + shutdownOnOSSignal(server) +} diff --git a/mocks/ExecutorApi.go b/mocks/ExecutorApi.go new file mode 100644 index 0000000..8bc5b56 --- /dev/null +++ b/mocks/ExecutorApi.go @@ -0,0 +1,94 @@ +// Code generated by mockery v0.0.0-dev. DO NOT EDIT. + +package mocks + +import ( + api "github.com/hashicorp/nomad/api" + mock "github.com/stretchr/testify/mock" +) + +// ExecutorApi is an autogenerated mock type for the ExecutorApi type +type ExecutorApi struct { + mock.Mock +} + +// GetJobScale provides a mock function with given fields: jobId +func (_m *ExecutorApi) GetJobScale(jobId string) (int, error) { + ret := _m.Called(jobId) + + var r0 int + if rf, ok := ret.Get(0).(func(string) int); ok { + r0 = rf(jobId) + } else { + r0 = ret.Get(0).(int) + } + + var r1 error + if rf, ok := ret.Get(1).(func(string) error); ok { + r1 = rf(jobId) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// LoadJobList provides a mock function with given fields: +func (_m *ExecutorApi) LoadJobList() ([]*api.JobListStub, error) { + ret := _m.Called() + + var r0 []*api.JobListStub + if rf, ok := ret.Get(0).(func() []*api.JobListStub); ok { + r0 = rf() + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]*api.JobListStub) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func() error); ok { + r1 = rf() + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// LoadRunners provides a mock function with given fields: jobId +func (_m *ExecutorApi) LoadRunners(jobId string) ([]string, error) { + ret := _m.Called(jobId) + + var r0 []string + if rf, ok := ret.Get(0).(func(string) []string); ok { + r0 = rf(jobId) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]string) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(string) error); ok { + r1 = rf(jobId) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// SetJobScaling provides a mock function with given fields: jobId, count, reason +func (_m *ExecutorApi) SetJobScaling(jobId string, count int, reason string) error { + ret := _m.Called(jobId, count, reason) + + var r0 error + if rf, ok := ret.Get(0).(func(string, int, string) error); ok { + r0 = rf(jobId, count, reason) + } else { + r0 = ret.Error(0) + } + + return r0 +} diff --git a/nomad/nomad.go b/nomad/nomad.go new file mode 100644 index 0000000..9297e91 --- /dev/null +++ b/nomad/nomad.go @@ -0,0 +1,71 @@ +package nomad + +import ( + nomadApi "github.com/hashicorp/nomad/api" + "net/url" +) + +// ExecutorApi provides access to an container orchestration solution +type ExecutorApi interface { + LoadJobList() (list []*nomadApi.JobListStub, err error) + GetJobScale(jobId string) (jobScale int, err error) + SetJobScaling(jobId string, count int, reason string) (err error) + LoadRunners(jobId string) (runnerIds []string, err error) +} + +// ApiClient provides access to the Nomad functionality +type ApiClient struct { + client *nomadApi.Client +} + +// New creates a new api client. +// One client is usually sufficient for the complete runtime of the API. +func New(nomadURL *url.URL) (ExecutorApi, error) { + client := &ApiClient{} + err := client.init(nomadURL) + return client, err +} + +// init prepares an apiClient to be able to communicate to a provided Nomad API. +func (apiClient *ApiClient) init(nomadURL *url.URL) (err error) { + apiClient.client, err = nomadApi.NewClient(&nomadApi.Config{ + Address: nomadURL.String(), + TLSConfig: &nomadApi.TLSConfig{}, + }) + return err +} + +// LoadJobList loads the list of jobs from the Nomad api. +func (apiClient *ApiClient) LoadJobList() (list []*nomadApi.JobListStub, err error) { + list, _, err = apiClient.client.Jobs().List(nil) + return +} + +// GetJobScale returns the scale of the passed job. +func (apiClient *ApiClient) GetJobScale(jobId string) (jobScale int, err error) { + status, _, err := apiClient.client.Jobs().ScaleStatus(jobId, nil) + if err != nil { + return + } + // ToDo: Consider counting also the placed and desired allocations + jobScale = status.TaskGroups[jobId].Running + return +} + +// SetJobScaling sets the scaling count of the passed job to Nomad. +func (apiClient *ApiClient) SetJobScaling(jobId string, count int, reason string) (err error) { + _, _, err = apiClient.client.Jobs().Scale(jobId, jobId, &count, reason, false, nil, nil) + return +} + +// LoadRunners loads the allocations of the specified job. +func (apiClient *ApiClient) LoadRunners(jobId string) (runnerIds []string, err error) { + list, _, err := apiClient.client.Jobs().Allocations(jobId, true, nil) + if err != nil { + return nil, err + } + for _, stub := range list { + runnerIds = append(runnerIds, stub.ID) + } + return +} diff --git a/runner/runner.go b/runner/runner.go new file mode 100644 index 0000000..f8009f3 --- /dev/null +++ b/runner/runner.go @@ -0,0 +1,71 @@ +package runner + +import ( + "encoding/json" + "sync" +) + +type Status string + +const ( + StatusReady Status = "ready" + StatusRunning Status = "running" + StatusTimeout Status = "timeout" + StatusFinished Status = "finished" +) + +type Runner interface { + SetStatus(Status) + Status() Status + Id() string +} + +// ExerciseRunner is an abstraction to communicate with Nomad allocations +type ExerciseRunner struct { + sync.Mutex + id string + status Status + ch chan bool +} + +// NewExerciseRunner creates a new exercise runner with the provided id +// As default value the status is ready +func NewExerciseRunner(id string) *ExerciseRunner { + return &ExerciseRunner{ + id: id, + status: StatusReady, + Mutex: sync.Mutex{}, + ch: make(chan bool), + } +} + +// MarshalJSON implements json.Marshaler interface +// This exports also private attributes like the id +func (r *ExerciseRunner) MarshalJSON() ([]byte, error) { + return json.Marshal(struct { + Id string `json:"runnerId"` + Status Status `json:"status"` + }{ + Id: r.Id(), + Status: r.Status(), + }) +} + +// SetStatus sets the status thread-safe +func (r *ExerciseRunner) SetStatus(status Status) { + r.Lock() + defer r.Unlock() + r.status = status +} + +// Status returns the status thread-safe +func (r *ExerciseRunner) Status() Status { + r.Lock() + defer r.Unlock() + return r.status +} + +// Id returns the id of the runner +func (r *ExerciseRunner) Id() string { + return r.id +} diff --git a/runner/runner_test.go b/runner/runner_test.go new file mode 100644 index 0000000..4433a28 --- /dev/null +++ b/runner/runner_test.go @@ -0,0 +1,32 @@ +package runner + +import ( + "encoding/json" + "github.com/stretchr/testify/assert" + "testing" +) + +func TestIdIsStored(t *testing.T) { + runner := NewExerciseRunner("42") + assert.Equal(t, "42", runner.Id()) +} + +func TestStatusIsStored(t *testing.T) { + runner := NewExerciseRunner("42") + for _, status := range []Status{StatusReady, StatusRunning, StatusTimeout, StatusFinished} { + runner.SetStatus(status) + assert.Equal(t, status, runner.Status(), "The status is returned as it is stored") + } +} + +func TestDefaultStatus(t *testing.T) { + runner := NewExerciseRunner("42") + assert.Equal(t, StatusReady, runner.status) +} + +func TestMarshalRunner(t *testing.T) { + runner := NewExerciseRunner("42") + marshal, err := json.Marshal(runner) + assert.NoError(t, err) + assert.Equal(t, "{\"runnerId\":\"42\",\"status\":\"ready\"}", string(marshal)) +}