From 1445d5ed23b7f00afd12c1c3d182fcc062886c71 Mon Sep 17 00:00:00 2001 From: borismattijssen Date: Fri, 26 May 2017 12:31:27 +0200 Subject: [PATCH 1/2] Add input ds field --- command/worker_start.go | 5 +++-- nerd/client/batch/v1/payload/worker.go | 9 +++++---- nerd/client/batch/v1/worker.go | 13 +++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/command/worker_start.go b/command/worker_start.go index 724e822d8..c97c22d67 100644 --- a/command/worker_start.go +++ b/command/worker_start.go @@ -16,7 +16,8 @@ import ( //WorkerStartOpts describes command options type WorkerStartOpts struct { - Env []string `long:"env" short:"e" description:"environment variables"` + Env []string `long:"env" short:"e" description:"environment variables"` + InputDataset string `long:"input-dataset" short:"i" description:"input dataset ID, will be available in /input in your container"` } //WorkerStart command @@ -97,7 +98,7 @@ func (cmd *WorkerStart) DoRun(args []string) (err error) { wenv[EnvConfigJSON] = string(configJSON) wenv[EnvNerdProject] = ss.Project.Name - worker, err := bclient.StartWorker(ss.Project.Name, args[0], args[1], wenv) + worker, err := bclient.StartWorker(ss.Project.Name, args[0], args[1], wenv, cmd.opts.InputDataset) if err != nil { HandleError(err) } diff --git a/nerd/client/batch/v1/payload/worker.go b/nerd/client/batch/v1/payload/worker.go index 4c110f385..6706997bb 100644 --- a/nerd/client/batch/v1/payload/worker.go +++ b/nerd/client/batch/v1/payload/worker.go @@ -2,10 +2,11 @@ package v1payload //StartWorkerInput is input for queue creation type StartWorkerInput struct { - ProjectID string `json:"project_id" valid:"required"` - Image string `json:"image" valid:"required"` - QueueID string `json:"queue_id" valid:"required"` - Env map[string]string `json:"env"` + ProjectID string `json:"project_id" valid:"required"` + Image string `json:"image" valid:"required"` + QueueID string `json:"queue_id" valid:"required"` + InputDatasetID string `json:"input_dataset_id"` + Env map[string]string `json:"env"` } //StartWorkerOutput is output for queue creation diff --git a/nerd/client/batch/v1/worker.go b/nerd/client/batch/v1/worker.go index abcc854fb..1996c9de2 100644 --- a/nerd/client/batch/v1/worker.go +++ b/nerd/client/batch/v1/worker.go @@ -8,19 +8,20 @@ import ( //ClientWorkerInterface is an interface for placement of project type ClientWorkerInterface interface { - StartWorker(projectID, image, queueID string, env map[string]string) (output *v1payload.StartWorkerOutput, err error) + StartWorker(projectID, image, queueID string, env map[string]string, inputDatasetID string) (output *v1payload.StartWorkerOutput, err error) StopWorker(projectID, workerID string) (output *v1payload.StopWorkerOutput, err error) ListWorkers(projectID string) (output *v1payload.ListWorkersOutput, err error) } //StartWorker will create worker -func (c *Client) StartWorker(projectID, image, queueID string, env map[string]string) (output *v1payload.StartWorkerOutput, err error) { +func (c *Client) StartWorker(projectID, image, queueID string, env map[string]string, inputDatasetID string) (output *v1payload.StartWorkerOutput, err error) { output = &v1payload.StartWorkerOutput{} input := &v1payload.StartWorkerInput{ - ProjectID: projectID, - Image: image, - QueueID: queueID, - Env: env, + ProjectID: projectID, + Image: image, + QueueID: queueID, + InputDatasetID: inputDatasetID, + Env: env, } return output, c.doRequest(http.MethodPost, createPath(projectID, workersEndpoint), input, output) From 55d68d0d720225516bf05d15160ba75aecf42b91 Mon Sep 17 00:00:00 2001 From: borismattijssen Date: Fri, 26 May 2017 15:10:50 +0200 Subject: [PATCH 2/2] Bump version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5f749c136..75274d832 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.11 +0.4.12