Adds check for nil request and adds test

r2/service_routes.go

@@ -21,6 +21,7 @@
 package r2
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
@@ -250,6 +251,9 @@ func fetchRollupRuleHistory(s *service, r *http.Request) (data interface{}, err
 type routeFunc func(s *service, r *http.Request) (data interface{}, err error)
 
 func handleRoute(rf routeFunc, s *service, r *http.Request, namespace string) (interface{}, error) {
+	if r == nil {
+		return nil, errors.New("Nil request passed to handler")
+	}
 	start := s.nowFn()
 	data, err := rf(s, r)
 	s.metrics.recordMetric(r.RequestURI, r.Method, namespace, time.Since(start), err)

r2/service_routes_test.go

@@ -43,6 +43,12 @@ func TestHandleRoute(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, expected, actual)
 }
+
+func TestHandleRouteNilRequest(t *testing.T) {
+	s := newTestService()
+	_, err := handleRoute(fetchNamespaces, s, nil, "ns")
+	require.EqualError(t, err, "Nil request passed to handler")
+}
 func TestFetchNamespacesSuccess(t *testing.T) {
 	expected := newNamespacesJSON(&rules.NamespacesView{})
 	actual, err := fetchNamespaces(newTestService(), nil)