Merge pull request #432 from KeyboardNerd/ancestry_

gRPC API & internals redesign

api/api.go

@@ -26,7 +26,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/tylerb/graceful"
 
-	"github.com/coreos/clair/api/v2"
+	"github.com/coreos/clair/api/v3"
 	"github.com/coreos/clair/database"
 	"github.com/coreos/clair/pkg/stopper"
 )
@@ -35,11 +35,9 @@ const timeoutResponse = `{"Error":{"Message":"Clair failed to respond within the
 
 // Config is the configuration for the API service.
 type Config struct {
-	Port                      int
 	GrpcPort                  int
 	HealthPort                int
 	Timeout                   time.Duration
-	PaginationKey             string
 	CertFile, KeyFile, CAFile string
 }
 
@@ -51,40 +49,7 @@ func RunV2(cfg *Config, store database.Datastore) {
 	if tlsConfig != nil {
 		log.Info("main API configured with client certificate authentication")
 	}
-	v2.Run(cfg.GrpcPort, tlsConfig, cfg.PaginationKey, cfg.CertFile, cfg.KeyFile, store)
-}
-
-func Run(cfg *Config, store database.Datastore, st *stopper.Stopper) {
-	defer st.End()
-
-	// Do not run the API service if there is no config.
-	if cfg == nil {
-		log.Info("main API service is disabled.")
-		return
-	}
-	log.WithField("port", cfg.Port).Info("starting main API")
-
-	tlsConfig, err := tlsClientConfig(cfg.CAFile)
-	if err != nil {
-		log.WithError(err).Fatal("could not initialize client cert authentication")
-	}
-	if tlsConfig != nil {
-		log.Info("main API configured with client certificate authentication")
-	}
-
-	srv := &graceful.Server{
-		Timeout:          0,    // Already handled by our TimeOut middleware
-		NoSignalHandling: true, // We want to use our own Stopper
-		Server: &http.Server{
-			Addr:      ":" + strconv.Itoa(cfg.Port),
-			TLSConfig: tlsConfig,
-			Handler:   http.TimeoutHandler(newAPIHandler(cfg, store), cfg.Timeout, timeoutResponse),
-		},
-	}
-
-	listenAndServeWithStopper(srv, st, cfg.CertFile, cfg.KeyFile)
-
-	log.Info("main API stopped")
+	v3.Run(cfg.GrpcPort, tlsConfig, cfg.CertFile, cfg.KeyFile, store)
 }
 
 func RunHealth(cfg *Config, store database.Datastore, st *stopper.Stopper) {

api/router.go

@@ -16,48 +16,16 @@ package api
 
 import (
 	"net/http"
-	"strings"
 
 	"github.com/julienschmidt/httprouter"
-	log "github.com/sirupsen/logrus"
 
-	"github.com/coreos/clair/api/httputil"
-	"github.com/coreos/clair/api/v1"
 	"github.com/coreos/clair/database"
 )
 
 // router is an HTTP router that forwards requests to the appropriate sub-router
 // depending on the API version specified in the request URI.
 type router map[string]*httprouter.Router
 
-// Let's hope we never have more than 99 API versions.
-const apiVersionLength = len("v99")
-
-func newAPIHandler(cfg *Config, store database.Datastore) http.Handler {
-	router := make(router)
-	router["/v1"] = v1.NewRouter(store, cfg.PaginationKey)
-	return router
-}
-
-func (rtr router) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	urlStr := r.URL.String()
-	var version string
-	if len(urlStr) >= apiVersionLength {
-		version = urlStr[:apiVersionLength]
-	}
-
-	if router, _ := rtr[version]; router != nil {
-		// Remove the version number from the request path to let the router do its
-		// job but do not update the RequestURI
-		r.URL.Path = strings.Replace(r.URL.Path, version, "", 1)
-		router.ServeHTTP(w, r)
-		return
-	}
-
-	log.WithFields(log.Fields{"status": http.StatusNotFound, "method": r.Method, "request uri": r.RequestURI, "remote addr": httputil.GetClientAddr(r)}).Info("Served HTTP request")
-	http.NotFound(w, r)
-}
-
 func newHealthHandler(store database.Datastore) http.Handler {
 	router := httprouter.New()
 	router.GET("/health", healthHandler(store))