refactor: meta.New - variadic function
This commit is contained in:
parent
ff82ab89a9
commit
ea2979f06f
|
@ -90,7 +90,7 @@ func newServer(logger *zap.Logger, db *bun.DB) (*http.Server, error) {
|
||||||
// router
|
// router
|
||||||
r := chi.NewRouter()
|
r := chi.NewRouter()
|
||||||
r.Use(getMiddlewares(logger)...)
|
r.Use(getMiddlewares(logger)...)
|
||||||
r.Mount(metaEndpointsPrefix, meta.New([]meta.Checker{bundb.NewChecker(db)}))
|
r.Mount(metaEndpointsPrefix, meta.New(bundb.NewChecker(db)))
|
||||||
r.Mount("/api", rest.New(
|
r.Mount("/api", rest.New(
|
||||||
apiKeySvc,
|
apiKeySvc,
|
||||||
sessionSvc,
|
sessionSvc,
|
||||||
|
|
|
@ -21,7 +21,7 @@ type Checker interface {
|
||||||
Check(ctx context.Context) error
|
Check(ctx context.Context) error
|
||||||
}
|
}
|
||||||
|
|
||||||
func New(checkers []Checker) *chi.Mux {
|
func New(checkers ...Checker) *chi.Mux {
|
||||||
router := chi.NewRouter()
|
router := chi.NewRouter()
|
||||||
|
|
||||||
router.Get("/livez", func(w http.ResponseWriter, r *http.Request) {
|
router.Get("/livez", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|
|
@ -99,7 +99,7 @@ func TestReadyz(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
rr := httptest.NewRecorder()
|
rr := httptest.NewRecorder()
|
||||||
meta.New(tt.checkers).ServeHTTP(rr, httptest.NewRequest(http.MethodGet, "/readyz", nil))
|
meta.New(tt.checkers...).ServeHTTP(rr, httptest.NewRequest(http.MethodGet, "/readyz", nil))
|
||||||
|
|
||||||
assert.Equal(t, tt.expectedStatus, rr.Code)
|
assert.Equal(t, tt.expectedStatus, rr.Code)
|
||||||
assert.Equal(t, "application/json", rr.Header().Get("Content-Type"))
|
assert.Equal(t, "application/json", rr.Header().Get("Content-Type"))
|
||||||
|
|
Loading…
Reference in New Issue