Skip to content

Commit 4c6e8ca

Browse files
authored
feat(server): Make Trivy Server Multiplexer Exported (#7389)
1 parent 84118d0 commit 4c6e8ca

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pkg/rpc/server/listen.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ func (s Server) ListenAndServe(ctx context.Context, serverCache cache.Cache, ski
7272
}
7373
}()
7474

75-
mux := s.newServeMux(ctx, serverCache, dbUpdateWg, requestWg)
75+
mux := s.NewServeMux(ctx, serverCache, dbUpdateWg, requestWg)
7676
log.Infof("Listening %s...", s.addr)
7777

7878
return http.ListenAndServe(s.addr, mux)
7979
}
8080

81-
func (s Server) newServeMux(ctx context.Context, serverCache cache.Cache, dbUpdateWg, requestWg *sync.WaitGroup) *http.ServeMux {
81+
func (s Server) NewServeMux(ctx context.Context, serverCache cache.Cache, dbUpdateWg, requestWg *sync.WaitGroup) *http.ServeMux {
8282
withWaitGroup := func(base http.Handler) http.Handler {
8383
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
8484
// Stop processing requests during DB update

pkg/rpc/server/listen_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func TestServer_newServeMux(t *testing.T) {
183183
defer func() { _ = c.Close() }()
184184

185185
s := NewServer("", "", "", tt.args.token, tt.args.tokenHeader, "", nil, ftypes.RegistryOptions{})
186-
ts := httptest.NewServer(s.newServeMux(context.Background(), c, dbUpdateWg, requestWg))
186+
ts := httptest.NewServer(s.NewServeMux(context.Background(), c, dbUpdateWg, requestWg))
187187
defer ts.Close()
188188

189189
var resp *http.Response
@@ -214,7 +214,7 @@ func Test_VersionEndpoint(t *testing.T) {
214214
defer func() { _ = c.Close() }()
215215

216216
s := NewServer("", "", "testdata/testcache", "", "", "", nil, ftypes.RegistryOptions{})
217-
ts := httptest.NewServer(s.newServeMux(context.Background(), c, dbUpdateWg, requestWg))
217+
ts := httptest.NewServer(s.NewServeMux(context.Background(), c, dbUpdateWg, requestWg))
218218
defer ts.Close()
219219

220220
resp, err := http.Get(ts.URL + "/version")

0 commit comments

Comments
 (0)