26b36ba704
Don't give out job ids to workers, but `tokens`, which serve as an indirection. This way, restarting composer won't confuse it when a stray worker returns a result for a job that was still running. Also, artifacts are only moved to the final location once a job finishes. This change breaks backwards compatibility, but we're not yet promising a stable worker API to anyone. This drops the transition tests in server_test.go. These don't make much sense anymore, because there's only one allowed transition, from running to finished. They heavily relied on job slot ids, which are not easily accessible with the `TestRoute` API. Overall, adjusting this seemed like too much work for their benefit.
121 lines
2.7 KiB
Go
121 lines
2.7 KiB
Go
package worker
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net"
|
|
"net/http"
|
|
|
|
"github.com/google/uuid"
|
|
|
|
"github.com/osbuild/osbuild-composer/internal/common"
|
|
"github.com/osbuild/osbuild-composer/internal/distro"
|
|
"github.com/osbuild/osbuild-composer/internal/osbuild"
|
|
"github.com/osbuild/osbuild-composer/internal/target"
|
|
"github.com/osbuild/osbuild-composer/internal/worker/api"
|
|
)
|
|
|
|
type Client struct {
|
|
api *api.Client
|
|
}
|
|
|
|
func NewClient(baseURL string, conf *tls.Config) (*Client, error) {
|
|
httpClient := http.Client{
|
|
Transport: &http.Transport{
|
|
TLSClientConfig: conf,
|
|
},
|
|
}
|
|
|
|
c, err := api.NewClient(baseURL, api.WithHTTPClient(&httpClient))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &Client{c}, nil
|
|
}
|
|
|
|
func NewClientUnix(path string) *Client {
|
|
httpClient := http.Client{
|
|
Transport: &http.Transport{
|
|
DialContext: func(context context.Context, network, addr string) (net.Conn, error) {
|
|
return net.Dial("unix", path)
|
|
},
|
|
},
|
|
}
|
|
|
|
c, err := api.NewClient("http://localhost", api.WithHTTPClient(&httpClient))
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
return &Client{c}
|
|
}
|
|
|
|
func (c *Client) RequestJob() (uuid.UUID, distro.Manifest, []*target.Target, error) {
|
|
response, err := c.api.RequestJob(context.Background(), api.RequestJobJSONRequestBody{})
|
|
if err != nil {
|
|
return uuid.Nil, nil, nil, err
|
|
}
|
|
defer response.Body.Close()
|
|
|
|
if response.StatusCode != http.StatusCreated {
|
|
var er errorResponse
|
|
_ = json.NewDecoder(response.Body).Decode(&er)
|
|
return uuid.Nil, nil, nil, fmt.Errorf("couldn't create job, got %d: %s", response.StatusCode, er.Message)
|
|
}
|
|
|
|
var jr requestJobResponse
|
|
err = json.NewDecoder(response.Body).Decode(&jr)
|
|
if err != nil {
|
|
return uuid.Nil, nil, nil, err
|
|
}
|
|
|
|
return jr.Token, jr.Manifest, jr.Targets, nil
|
|
}
|
|
|
|
func (c *Client) JobCanceled(token uuid.UUID) bool {
|
|
response, err := c.api.GetJob(context.Background(), token.String())
|
|
if err != nil {
|
|
return true
|
|
}
|
|
defer response.Body.Close()
|
|
|
|
if response.StatusCode != http.StatusOK {
|
|
return true
|
|
}
|
|
|
|
var jr getJobResponse
|
|
err = json.NewDecoder(response.Body).Decode(&jr)
|
|
if err != nil {
|
|
return true
|
|
}
|
|
|
|
return jr.Canceled
|
|
}
|
|
|
|
func (c *Client) UpdateJob(token uuid.UUID, status common.ImageBuildState, result *osbuild.Result) error {
|
|
response, err := c.api.UpdateJob(context.Background(), token.String(), api.UpdateJobJSONRequestBody{
|
|
Result: result,
|
|
Status: status.ToString(),
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if response.StatusCode != http.StatusOK {
|
|
return errors.New("error setting job status")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (c *Client) UploadImage(token uuid.UUID, name string, reader io.Reader) error {
|
|
_, err := c.api.UploadJobArtifactWithBody(context.Background(),
|
|
token.String(), name, "application/octet-stream", reader)
|
|
|
|
return err
|
|
}
|