Fix cert and key file mix up

Signed-off-by: Tamal Saha <tamal@appscode.com>

api/v3/server.go

@@ -76,7 +76,7 @@ func loggingHandler(h http.Handler) http.Handler {
 }
 
 // ListenAndServe serves the Clair v3 API over gRPC and the gRPC Gateway.
-func ListenAndServe(addr, keyFile, certFile, caPath string, store database.Datastore) error {
+func ListenAndServe(addr, certFile, keyFile, caPath string, store database.Datastore) error {
 	srv := grpcutil.MuxedGRPCServer{
 		Addr: addr,
 		ServicesFunc: func(gsrv *grpc.Server) {

pkg/grpcutil/muxed_server.go

@@ -116,8 +116,14 @@ func (srv *MuxedGRPCServer) ListenAndServeTLS(certFile, keyFile, caPath string,
 	if srv.TLSConfig == nil {
 		srv.TLSConfig = &tls.Config{}
 	}
-	configureCA(srv.TLSConfig, caPath)
-	configureCertificate(srv.TLSConfig, certFile, keyFile)
+	err := configureCA(srv.TLSConfig, caPath)
+	if err != nil {
+		return err
+	}
+	err = configureCertificate(srv.TLSConfig, certFile, keyFile)
+	if err != nil {
+		return err
+	}
 
 	listener, err := tls.Listen("tcp", srv.Addr, srv.TLSConfig)
 	if err != nil {