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

jobqueue: rename ID to ComposeID in job structs

Browse source 
It's not an id of the job, but the compose id.
This commit is contained in:
Lars Karlitski 2020-03-31 13:10:01 +02:00 • committed by Tom Gundersen
parent 269988a737
commit 1f06d78362
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/jobqueue/api.go
View file

@ -103,7 +103,7 @@ func (api *API) addJobHandler(writer http.ResponseWriter, request *http.Request,
writer.WriteHeader(http.StatusCreated)
// FIXME: handle or comment this possible error
_ = json.NewEncoder(writer).Encode(addJobResponse{
ID: nextJob.ComposeID,
ComposeID: nextJob.ComposeID,
ImageBuildID: nextJob.ImageBuildID,
Manifest: nextJob.Manifest,
Targets: nextJob.Targets,

2
internal/jobqueue/api_test.go
View file

@ -57,7 +57,7 @@ func TestCreate(t *testing.T) {
}
test.TestRoute(t, api, false, "POST", "/job-queue/v1/jobs", `{}`, http.StatusCreated,
`{"id":"`+id.String()+`","image_build_id":0,"manifest":{"sources":{},"pipeline":{}},"targets":[]}`, "created")
`{"compose_id":"`+id.String()+`","image_build_id":0,"manifest":{"sources":{},"pipeline":{}},"targets":[]}`, "created")
}
func testUpdateTransition(t *testing.T, from, to string, expectedStatus int, expectedResponse string) {

6
internal/jobqueue/client.go
View file

@ -77,7 +77,7 @@ func (c *Client) AddJob() (*Job, error) {
return nil, err
}
return NewJob(jr.ID, jr.ImageBuildID, jr.Manifest, jr.Targets), nil
return NewJob(jr.ComposeID, jr.ImageBuildID, jr.Manifest, jr.Targets), nil
}
func (c *Client) UpdateJob(job *Job, status common.ImageBuildState, result *common.ComposeResult) error {
@ -86,7 +86,7 @@ func (c *Client) UpdateJob(job *Job, status common.ImageBuildState, result *comm
if err != nil {
panic(err)
}
urlPath := fmt.Sprintf("/job-queue/v1/jobs/%s/builds/%d", job.ID.String(), job.ImageBuildID)
urlPath := fmt.Sprintf("/job-queue/v1/jobs/%s/builds/%d", job.ComposeID.String(), job.ImageBuildID)
url := c.createURL(urlPath)
req, err := http.NewRequest("PATCH", url, &b)
if err != nil {
@ -109,7 +109,7 @@ func (c *Client) UpdateJob(job *Job, status common.ImageBuildState, result *comm
func (c *Client) UploadImage(job *Job, reader io.Reader) error {
// content type doesn't really matter
url := c.createURL(fmt.Sprintf("/job-queue/v1/jobs/%s/builds/%d/image", job.ID.String(), job.ImageBuildID))
url := c.createURL(fmt.Sprintf("/job-queue/v1/jobs/%s/builds/%d/image", job.ComposeID.String(), job.ImageBuildID))
_, err := c.client.Post(url, "application/octet-stream", reader)
return err

4
internal/jobqueue/job.go
View file

@ -18,7 +18,7 @@ import (
)
type Job struct {
ID uuid.UUID `json:"id"`
ComposeID uuid.UUID `json:"id"`
ImageBuildID int `json:"image_build_id"`
Manifest *osbuild.Manifest `json:"manifest"`
Targets []*target.Target `json:"targets"`
@ -116,7 +116,7 @@ func (job *Job) Run(uploader LocalTargetUploader) (*common.ComposeResult, error)
}
if options.Key == "" {
options.Key = job.ID.String()
options.Key = job.ComposeID.String()
}
_, err = a.Upload(path.Join(tmpStore, "refs", result.OutputID, options.Filename), options.Bucket, options.Key)

2
internal/jobqueue/json.go
View file

@ -9,7 +9,7 @@ import (
)
type addJobResponse struct {
ID uuid.UUID `json:"id"`
ComposeID uuid.UUID `json:"compose_id"`
ImageBuildID int `json:"image_build_id"`
Manifest *osbuild.Manifest `json:"manifest"`
Targets []*target.Target `json:"targets"`