particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

worker/api: drop /job-queue/v1 from api paths

Browse source 
This kind of common base path is better set in the top-level
`server.url` field, so that it can be adjusted.

For now, drop it completely, as we already broke the consistency when
introducing the `/status` route.

This change breaks backwards compatibility, but we're not yet promising
a stable worker API to anyone.
This commit is contained in:
Lars Karlitski 2020-09-07 10:03:55 +02:00 • committed by Tom Gundersen
parent c07674e1f4
commit bf0dd66382
3 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

24
internal/worker/server_test.go
View file

@ -31,15 +31,15 @@ func TestErrors(t *testing.T) {
// Bogus path
{"GET", "/foo", ``, http.StatusNotFound},
// Create job with invalid body
{"POST", "/job-queue/v1/jobs", ``, http.StatusBadRequest},
{"POST", "/jobs", ``, http.StatusBadRequest},
// Wrong method
{"GET", "/job-queue/v1/jobs", ``, http.StatusMethodNotAllowed},
{"GET", "/jobs", ``, http.StatusMethodNotAllowed},
// Update job with invalid ID
{"PATCH", "/job-queue/v1/jobs/foo", `{"status":"FINISHED"}`, http.StatusBadRequest},
{"PATCH", "/jobs/foo", `{"status":"FINISHED"}`, http.StatusBadRequest},
// Update job that does not exist, with invalid body
{"PATCH", "/job-queue/v1/jobs/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", ``, http.StatusBadRequest},
{"PATCH", "/jobs/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", ``, http.StatusBadRequest},
// Update job that does not exist
{"PATCH", "/job-queue/v1/jobs/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", `{"status":"FINISHED"}`, http.StatusNotFound},
{"PATCH", "/jobs/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", `{"status":"FINISHED"}`, http.StatusNotFound},
}
for _, c := range cases {
@ -67,10 +67,10 @@ func TestCreate(t *testing.T) {
id, err := server.Enqueue(manifest, nil)
require.NoError(t, err)
test.TestRoute(t, server, false, "POST", "/job-queue/v1/jobs", `{}`, http.StatusCreated,
test.TestRoute(t, server, false, "POST", "/jobs", `{}`, http.StatusCreated,
`{"id":"`+id.String()+`","manifest":{"sources":{},"pipeline":{}}}`, "created")
test.TestRoute(t, server, false, "GET", fmt.Sprintf("/job-queue/v1/jobs/%s", id), `{}`, http.StatusOK,
test.TestRoute(t, server, false, "GET", fmt.Sprintf("/jobs/%s", id), `{}`, http.StatusOK,
`{"id":"`+id.String()+`","canceled":false}`)
}
@ -93,13 +93,13 @@ func TestCancel(t *testing.T) {
id, err := server.Enqueue(manifest, nil)
require.NoError(t, err)
test.TestRoute(t, server, false, "POST", "/job-queue/v1/jobs", `{}`, http.StatusCreated,
test.TestRoute(t, server, false, "POST", "/jobs", `{}`, http.StatusCreated,
`{"id":"`+id.String()+`","manifest":{"sources":{},"pipeline":{}}}`, "created")
err = server.Cancel(id)
require.NoError(t, err)
test.TestRoute(t, server, false, "GET", fmt.Sprintf("/job-queue/v1/jobs/%s", id), `{}`, http.StatusOK,
test.TestRoute(t, server, false, "GET", fmt.Sprintf("/jobs/%s", id), `{}`, http.StatusOK,
`{"id":"`+id.String()+`","canceled":true}`)
}
@ -126,14 +126,14 @@ func testUpdateTransition(t *testing.T, from, to string, expectedStatus int) {
require.NoError(t, err)
if from != "WAITING" {
test.SendHTTP(server, false, "POST", "/job-queue/v1/jobs", `{}`)
test.SendHTTP(server, false, "POST", "/jobs", `{}`)
if from != "RUNNING" {
test.SendHTTP(server, false, "PATCH", "/job-queue/v1/jobs/"+id.String(), `{"status":"`+from+`"}`)
test.SendHTTP(server, false, "PATCH", "/jobs/"+id.String(), `{"status":"`+from+`"}`)
}
}
}
test.TestRoute(t, server, false, "PATCH", "/job-queue/v1/jobs/"+id.String(), `{"status":"`+to+`"}`, expectedStatus, "{}", "message")
test.TestRoute(t, server, false, "PATCH", "/jobs/"+id.String(), `{"status":"`+to+`"}`, expectedStatus, "{}", "message")
}
func TestUpdate(t *testing.T) {