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

cloudapi/test: make newV2Server return also the queue

Browse source 
We will need this for the multi-tenancy test.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2022-03-01 23:46:41 +01:00 • committed by Ondřej Budai
parent bafb613a43
commit ffbbd022e3
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/cloudapi/v2/v2_koji_test.go
View file

@ -31,7 +31,7 @@ func TestKojiCompose(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
kojiServer, workerServer, cancel := newV2Server(t, dir, []string{""}, false) kojiServer, workerServer, _, cancel := newV2Server(t, dir, []string{""}, false)
handler := kojiServer.Handler("/api/image-builder-composer/v2") handler := kojiServer.Handler("/api/image-builder-composer/v2")
workerHandler := workerServer.Handler() workerHandler := workerServer.Handler()
defer cancel() defer cancel()
@ -464,7 +464,7 @@ func TestKojiRequest(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
server, _, cancel := newV2Server(t, dir, []string{""}, false) server, _, _, cancel := newV2Server(t, dir, []string{""}, false)
handler := server.Handler("/api/image-builder-composer/v2") handler := server.Handler("/api/image-builder-composer/v2")
defer cancel() defer cancel()
@ -496,7 +496,7 @@ func TestKojiJobTypeValidation(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
server, workers, cancel := newV2Server(t, dir, []string{""}, false) server, workers, _, cancel := newV2Server(t, dir, []string{""}, false)
handler := server.Handler("/api/image-builder-composer/v2") handler := server.Handler("/api/image-builder-composer/v2")
defer cancel() defer cancel()

25
internal/cloudapi/v2/v2_test.go
View file

@ -13,6 +13,7 @@ import (
v2 "github.com/osbuild/osbuild-composer/internal/cloudapi/v2" v2 "github.com/osbuild/osbuild-composer/internal/cloudapi/v2"
"github.com/osbuild/osbuild-composer/internal/distro/test_distro" "github.com/osbuild/osbuild-composer/internal/distro/test_distro"
"github.com/osbuild/osbuild-composer/internal/jobqueue"
"github.com/osbuild/osbuild-composer/internal/jobqueue/fsjobqueue" "github.com/osbuild/osbuild-composer/internal/jobqueue/fsjobqueue"
distro_mock "github.com/osbuild/osbuild-composer/internal/mocks/distro" distro_mock "github.com/osbuild/osbuild-composer/internal/mocks/distro"
"github.com/osbuild/osbuild-composer/internal/ostree/mock_ostree_repo" "github.com/osbuild/osbuild-composer/internal/ostree/mock_ostree_repo"
@ -22,7 +23,7 @@ import (
"github.com/osbuild/osbuild-composer/internal/worker/clienterrors" "github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
) )
func newV2Server(t *testing.T, dir string, depsolveChannels []string, enableJWT bool) (*v2.Server, *worker.Server, context.CancelFunc) { func newV2Server(t *testing.T, dir string, depsolveChannels []string, enableJWT bool) (*v2.Server, *worker.Server, jobqueue.JobQueue, context.CancelFunc) {
q, err := fsjobqueue.New(dir) q, err := fsjobqueue.New(dir)
require.NoError(t, err) require.NoError(t, err)
workerServer := worker.NewServer(nil, q, worker.Config{BasePath: "/api/worker/v1", JWTEnabled: enableJWT, TenantProviderFields: []string{"rh-org-id"}}) workerServer := worker.NewServer(nil, q, worker.Config{BasePath: "/api/worker/v1", JWTEnabled: enableJWT, TenantProviderFields: []string{"rh-org-id"}})
@ -63,14 +64,14 @@ func newV2Server(t *testing.T, dir string, depsolveChannels []string, enableJWT
} }
}() }()
return v2Server, workerServer, cancel return v2Server, workerServer, q, cancel
} }
func TestUnknownRoute(t *testing.T) { func TestUnknownRoute(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
srv, _, cancel := newV2Server(t, dir, []string{""}, false) srv, _, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel() defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", "/api/image-builder-composer/v2/badroute", ``, http.StatusNotFound, ` test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", "/api/image-builder-composer/v2/badroute", ``, http.StatusNotFound, `
@ -87,7 +88,7 @@ func TestGetError(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
srv, _, cancel := newV2Server(t, dir, []string{""}, false) srv, _, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel() defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", "/api/image-builder-composer/v2/errors/4", ``, http.StatusOK, ` test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", "/api/image-builder-composer/v2/errors/4", ``, http.StatusOK, `
@ -113,7 +114,7 @@ func TestGetErrorList(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
srv, _, cancel := newV2Server(t, dir, []string{""}, false) srv, _, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel() defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", "/api/image-builder-composer/v2/errors?page=3&size=1", ``, http.StatusOK, ` test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", "/api/image-builder-composer/v2/errors?page=3&size=1", ``, http.StatusOK, `
@ -135,7 +136,7 @@ func TestCompose(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
srv, _, cancel := newV2Server(t, dir, []string{""}, false) srv, _, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel() defer cancel()
// create two ostree repos, one to serve the default test_distro ref (for fallback tests) and one to serve a custom ref // create two ostree repos, one to serve the default test_distro ref (for fallback tests) and one to serve a custom ref
@ -556,7 +557,7 @@ func TestComposeStatusSuccess(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
srv, wrksrv, cancel := newV2Server(t, dir, []string{""}, false) srv, wrksrv, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel() defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`
@ -628,7 +629,7 @@ func TestComposeStatusFailure(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
srv, wrksrv, cancel := newV2Server(t, dir, []string{""}, false) srv, wrksrv, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel() defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`
@ -680,7 +681,7 @@ func TestComposeLegacyError(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
srv, wrksrv, cancel := newV2Server(t, dir, []string{""}, false) srv, wrksrv, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel() defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`
@ -735,7 +736,7 @@ func TestComposeJobError(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
srv, wrksrv, cancel := newV2Server(t, dir, []string{""}, false) srv, wrksrv, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel() defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`
@ -793,7 +794,7 @@ func TestComposeCustomizations(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
srv, _, cancel := newV2Server(t, dir, []string{""}, false) srv, _, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel() defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`
@ -842,7 +843,7 @@ func TestImageTypes(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-") dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
srv, _, cancel := newV2Server(t, dir, []string{""}, false) srv, _, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel() defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(` test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`