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

cloudapi/test: add option to enable JWT

Browse source 
Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2022-03-07 11:10:52 +01:00 • committed by Ondřej Budai
parent 4a9812be2e
commit bafb613a43
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-")
require.NoError(t, err)
defer os.RemoveAll(dir)
kojiServer, workerServer, cancel := newV2Server(t, dir, []string{""})
kojiServer, workerServer, cancel := newV2Server(t, dir, []string{""}, false)
handler := kojiServer.Handler("/api/image-builder-composer/v2")
workerHandler := workerServer.Handler()
defer cancel()
@ -464,7 +464,7 @@ func TestKojiRequest(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err)
defer os.RemoveAll(dir)
server, _, cancel := newV2Server(t, dir, []string{""})
server, _, cancel := newV2Server(t, dir, []string{""}, false)
handler := server.Handler("/api/image-builder-composer/v2")
defer cancel()
@ -496,7 +496,7 @@ func TestKojiJobTypeValidation(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err)
defer os.RemoveAll(dir)
server, workers, cancel := newV2Server(t, dir, []string{""})
server, workers, cancel := newV2Server(t, dir, []string{""}, false)
handler := server.Handler("/api/image-builder-composer/v2")
defer cancel()

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

@ -22,10 +22,10 @@ import (
"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
)
func newV2Server(t *testing.T, dir string, depsolveChannels []string) (*v2.Server, *worker.Server, context.CancelFunc) {
func newV2Server(t *testing.T, dir string, depsolveChannels []string, enableJWT bool) (*v2.Server, *worker.Server, context.CancelFunc) {
q, err := fsjobqueue.New(dir)
require.NoError(t, err)
workerServer := worker.NewServer(nil, q, worker.Config{BasePath: "/api/worker/v1", TenantProviderFields: []string{"rh-org-id"}})
workerServer := worker.NewServer(nil, q, worker.Config{BasePath: "/api/worker/v1", JWTEnabled: enableJWT, TenantProviderFields: []string{"rh-org-id"}})
distros, err := distro_mock.NewDefaultRegistry()
require.NoError(t, err)
@ -33,6 +33,7 @@ func newV2Server(t *testing.T, dir string, depsolveChannels []string) (*v2.Serve
config := v2.ServerConfig{
AWSBucket: "image-builder.service",
JWTEnabled: enableJWT,
TenantProviderFields: []string{"rh-org-id"},
}
v2Server := v2.NewServer(workerServer, distros, config)
@ -69,7 +70,7 @@ func TestUnknownRoute(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err)
defer os.RemoveAll(dir)
srv, _, cancel := newV2Server(t, dir, []string{""})
srv, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", "/api/image-builder-composer/v2/badroute", ``, http.StatusNotFound, `
@ -86,7 +87,7 @@ func TestGetError(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err)
defer os.RemoveAll(dir)
srv, _, cancel := newV2Server(t, dir, []string{""})
srv, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", "/api/image-builder-composer/v2/errors/4", ``, http.StatusOK, `
@ -112,7 +113,7 @@ func TestGetErrorList(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err)
defer os.RemoveAll(dir)
srv, _, cancel := newV2Server(t, dir, []string{""})
srv, _, cancel := newV2Server(t, dir, []string{""}, false)
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, `
@ -134,7 +135,7 @@ func TestCompose(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err)
defer os.RemoveAll(dir)
srv, _, cancel := newV2Server(t, dir, []string{""})
srv, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel()
// create two ostree repos, one to serve the default test_distro ref (for fallback tests) and one to serve a custom ref
@ -555,7 +556,7 @@ func TestComposeStatusSuccess(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err)
defer os.RemoveAll(dir)
srv, wrksrv, cancel := newV2Server(t, dir, []string{""})
srv, wrksrv, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`
@ -627,7 +628,7 @@ func TestComposeStatusFailure(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err)
defer os.RemoveAll(dir)
srv, wrksrv, cancel := newV2Server(t, dir, []string{""})
srv, wrksrv, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`
@ -679,7 +680,7 @@ func TestComposeLegacyError(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err)
defer os.RemoveAll(dir)
srv, wrksrv, cancel := newV2Server(t, dir, []string{""})
srv, wrksrv, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`
@ -734,7 +735,7 @@ func TestComposeJobError(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err)
defer os.RemoveAll(dir)
srv, wrksrv, cancel := newV2Server(t, dir, []string{""})
srv, wrksrv, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`
@ -792,7 +793,7 @@ func TestComposeCustomizations(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err)
defer os.RemoveAll(dir)
srv, _, cancel := newV2Server(t, dir, []string{""})
srv, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`
@ -841,7 +842,7 @@ func TestImageTypes(t *testing.T) {
dir, err := ioutil.TempDir("", "osbuild-composer-test-api-v2-")
require.NoError(t, err)
defer os.RemoveAll(dir)
srv, _, cancel := newV2Server(t, dir, []string{""})
srv, _, cancel := newV2Server(t, dir, []string{""}, false)
defer cancel()
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "POST", "/api/image-builder-composer/v2/compose", fmt.Sprintf(`