From ac40b0e73b6e336ef935e630fedfef7b1697beb1 Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Wed, 15 Apr 2020 23:12:49 +0200 Subject: [PATCH] jobqueue: rename to worker This package does not contain an actual queue, but a server and client implementation for osbuild's worker API. Name it accordingly. The queue is in package `store` right now, but about to be split off. This rename makes the `jobqueue` name free for that effort. --- cmd/osbuild-composer/main.go | 4 ++-- cmd/osbuild-worker/main.go | 10 +++++----- internal/{jobqueue => worker}/api.go | 2 +- internal/{jobqueue => worker}/api_test.go | 10 +++++----- internal/{jobqueue => worker}/client.go | 2 +- internal/{jobqueue => worker}/json.go | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) rename internal/{jobqueue => worker}/api.go (99%) rename internal/{jobqueue => worker}/api_test.go (95%) rename internal/{jobqueue => worker}/client.go (99%) rename internal/{jobqueue => worker}/json.go (97%) diff --git a/cmd/osbuild-composer/main.go b/cmd/osbuild-composer/main.go index 9947a9983..c1ff08904 100644 --- a/cmd/osbuild-composer/main.go +++ b/cmd/osbuild-composer/main.go @@ -18,10 +18,10 @@ import ( "github.com/osbuild/osbuild-composer/internal/common" "github.com/osbuild/osbuild-composer/internal/distro" - "github.com/osbuild/osbuild-composer/internal/jobqueue" "github.com/osbuild/osbuild-composer/internal/rpmmd" "github.com/osbuild/osbuild-composer/internal/store" "github.com/osbuild/osbuild-composer/internal/weldr" + "github.com/osbuild/osbuild-composer/internal/worker" "github.com/coreos/go-systemd/activation" ) @@ -117,7 +117,7 @@ func main() { store := store.New(&stateDir) - jobAPI := jobqueue.New(logger, store) + jobAPI := worker.New(logger, store) weldrAPI := weldr.New(rpm, arch, distribution, repoMap[common.CurrentArch()], logger, store) go func() { diff --git a/cmd/osbuild-worker/main.go b/cmd/osbuild-worker/main.go index dd8ddf93f..af367a925 100644 --- a/cmd/osbuild-worker/main.go +++ b/cmd/osbuild-worker/main.go @@ -13,9 +13,9 @@ import ( "path" "github.com/osbuild/osbuild-composer/internal/common" - "github.com/osbuild/osbuild-composer/internal/jobqueue" "github.com/osbuild/osbuild-composer/internal/target" "github.com/osbuild/osbuild-composer/internal/upload/awsupload" + "github.com/osbuild/osbuild-composer/internal/worker" ) type connectionConfig struct { @@ -61,7 +61,7 @@ func (e *TargetsError) Error() string { return errString } -func RunJob(job *jobqueue.Job, uploadFunc func(*jobqueue.Job, io.Reader) error) (*common.ComposeResult, error) { +func RunJob(job *worker.Job, uploadFunc func(*worker.Job, io.Reader) error) (*common.ComposeResult, error) { tmpStore, err := ioutil.TempDir("/var/tmp", "osbuild-store") if err != nil { return nil, fmt.Errorf("error setting up osbuild store: %v", err) @@ -145,9 +145,9 @@ func main() { flag.Usage() } - var client *jobqueue.Client + var client *worker.Client if unix { - client = jobqueue.NewClientUnix(address) + client = worker.NewClientUnix(address) } else { conf, err := createTLSConfig(&connectionConfig{ CACertFile: "/etc/osbuild-composer/ca-crt.pem", @@ -158,7 +158,7 @@ func main() { log.Fatalf("Error creating TLS config: %v", err) } - client = jobqueue.NewClient(address, conf) + client = worker.NewClient(address, conf) } for { diff --git a/internal/jobqueue/api.go b/internal/worker/api.go similarity index 99% rename from internal/jobqueue/api.go rename to internal/worker/api.go index ed71e152d..eb1f8e510 100644 --- a/internal/jobqueue/api.go +++ b/internal/worker/api.go @@ -1,4 +1,4 @@ -package jobqueue +package worker import ( "encoding/json" diff --git a/internal/jobqueue/api_test.go b/internal/worker/api_test.go similarity index 95% rename from internal/jobqueue/api_test.go rename to internal/worker/api_test.go index 37d25d818..e5acac811 100644 --- a/internal/jobqueue/api_test.go +++ b/internal/worker/api_test.go @@ -1,4 +1,4 @@ -package jobqueue_test +package worker_test import ( "net/http" @@ -8,9 +8,9 @@ import ( "github.com/osbuild/osbuild-composer/internal/blueprint" "github.com/osbuild/osbuild-composer/internal/distro/fedoratest" - "github.com/osbuild/osbuild-composer/internal/jobqueue" "github.com/osbuild/osbuild-composer/internal/store" "github.com/osbuild/osbuild-composer/internal/test" + "github.com/osbuild/osbuild-composer/internal/worker" ) func TestErrors(t *testing.T) { @@ -35,7 +35,7 @@ func TestErrors(t *testing.T) { } for _, c := range cases { - api := jobqueue.New(nil, store.New(nil)) + api := worker.New(nil, store.New(nil)) test.TestRoute(t, api, false, c.Method, c.Path, c.Body, c.ExpectedStatus, "{}", "message") } } @@ -51,7 +51,7 @@ func TestCreate(t *testing.T) { t.Fatalf("error getting image type from arch") } store := store.New(nil) - api := jobqueue.New(nil, store) + api := worker.New(nil, store) id, err := store.PushCompose(imageType, &blueprint.Blueprint{}, nil, nil, nil, 0, nil) if err != nil { @@ -73,7 +73,7 @@ func testUpdateTransition(t *testing.T, from, to string, expectedStatus int) { t.Fatalf("error getting image type from arch") } store := store.New(nil) - api := jobqueue.New(nil, store) + api := worker.New(nil, store) id := uuid.Nil if from != "VOID" { diff --git a/internal/jobqueue/client.go b/internal/worker/client.go similarity index 99% rename from internal/jobqueue/client.go rename to internal/worker/client.go index 96fa7965f..cb46e46d0 100644 --- a/internal/jobqueue/client.go +++ b/internal/worker/client.go @@ -1,4 +1,4 @@ -package jobqueue +package worker import ( "bytes" diff --git a/internal/jobqueue/json.go b/internal/worker/json.go similarity index 97% rename from internal/jobqueue/json.go rename to internal/worker/json.go index c6a8f2df9..561910221 100644 --- a/internal/jobqueue/json.go +++ b/internal/worker/json.go @@ -1,4 +1,4 @@ -package jobqueue +package worker import ( "github.com/google/uuid"