arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

api: fix /v1 router and some status codes

Browse Source
This commit is contained in:
Quentin Machu 2016-01-28 15:13:11 -05:00 committed by Jimmy Zelinskie
parent be9423b489
commit 6b3f95dc03
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/api.go
View File

@ -23,16 +23,18 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/prometheus/common/log"
"github.com/tylerb/graceful" "github.com/tylerb/graceful"
"github.com/coreos/clair/api/context" "github.com/coreos/clair/api/context"
"github.com/coreos/clair/config" "github.com/coreos/clair/config"
"github.com/coreos/clair/utils" "github.com/coreos/clair/utils"
"github.com/coreos/pkg/capnslog"
) )
const timeoutResponse = `{"Error":{"Message":"Clair failed to respond within the configured timeout window.","Type":"Timeout"}}` const timeoutResponse = `{"Error":{"Message":"Clair failed to respond within the configured timeout window.","Type":"Timeout"}}`
var log = capnslog.NewPackageLogger("github.com/coreos/clair", "api")
func Run(config *config.APIConfig, ctx *context.RouteContext, st *utils.Stopper) { func Run(config *config.APIConfig, ctx *context.RouteContext, st *utils.Stopper) {
defer st.End() defer st.End()

3
api/router.go
View File

@ -33,7 +33,7 @@ const apiVersionLength = len("v99")
func newAPIHandler(ctx *context.RouteContext) http.Handler { func newAPIHandler(ctx *context.RouteContext) http.Handler {
router := make(router) router := make(router)
router["v1"] = v1.NewRouter(ctx) router["/v1"] = v1.NewRouter(ctx)
return router return router
} }
@ -52,6 +52,7 @@ func (rtr router) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
log.Infof("%s %d %s %s", http.StatusNotFound, r.Method, r.RequestURI, r.RemoteAddr)
http.NotFound(w, r) http.NotFound(w, r)
} }

2
api/v1/router.go
View File

@ -41,7 +41,7 @@ func NewRouter(ctx *context.RouteContext) *httprouter.Router {
// Fixes // Fixes
router.POST("/namespaces/:namespaceName/vulnerabilities/:vulnerabilityName/fixes", context.HTTPHandler(postFix, ctx)) router.POST("/namespaces/:namespaceName/vulnerabilities/:vulnerabilityName/fixes", context.HTTPHandler(postFix, ctx))
router.GET("/namespaces/:namespaceName/vulnerabilities/:vulernabilityName/fixes", context.HTTPHandler(getFixes, ctx)) router.GET("/namespaces/:namespaceName/vulnerabilities/:vulnerabilityName/fixes", context.HTTPHandler(getFixes, ctx))
router.PUT("/namespaces/:namespaceName/vulnerabilities/:vulnerabilityName/fixes/:fixName", context.HTTPHandler(putFix, ctx)) router.PUT("/namespaces/:namespaceName/vulnerabilities/:vulnerabilityName/fixes/:fixName", context.HTTPHandler(putFix, ctx))
router.DELETE("/namespaces/:namespaceName/vulnerabilities/:vulnerabilityName/fixes/:fixName", context.HTTPHandler(deleteFix, ctx)) router.DELETE("/namespaces/:namespaceName/vulnerabilities/:vulnerabilityName/fixes/:fixName", context.HTTPHandler(deleteFix, ctx))

2
api/v1/routes.go
View File

@ -56,9 +56,11 @@ func postLayer(w http.ResponseWriter, r *http.Request, p httprouter.Params, ctx
if _, ok := err.(*cerrors.ErrBadRequest); ok { if _, ok := err.(*cerrors.ErrBadRequest); ok {
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
writeError(w, err, "BadRequest") writeError(w, err, "BadRequest")
return http.StatusBadRequest
} }
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
writeError(w, err, "InternalServerError") writeError(w, err, "InternalServerError")
return http.StatusInternalServerError
} }
w.WriteHeader(http.StatusCreated) w.WriteHeader(http.StatusCreated)