modern goreturns

handlers/http_test.go

@@ -3,17 +3,18 @@ package handlers
 import (
 	"errors"
 	"fmt"
-	"github.com/Clever/leakybucket"
-	"github.com/Clever/sphinx/common"
-	"github.com/Clever/sphinx/limit"
-	"github.com/Clever/sphinx/ratelimiter"
-	"github.com/stretchr/testify/mock"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/Clever/leakybucket"
+	"github.com/Clever/sphinx/common"
+	"github.com/Clever/sphinx/limit"
+	"github.com/Clever/sphinx/ratelimiter"
+	"github.com/stretchr/testify/mock"
 )
 
 func constructMockRequestWithHeaders(headers map[string][]string) *http.Request {

limitkeys/headerlimitkey.go

@@ -2,10 +2,11 @@ package limitkeys
 
 import (
 	"fmt"
-	"github.com/Clever/sphinx/common"
 	"net/http"
 	"sort"
 	"strings"
+
+	"github.com/Clever/sphinx/common"
 )
 
 type headerLimitKey struct {

limitkeys/headerlimitkey_test.go

@@ -1,8 +1,9 @@
 package limitkeys
 
 import (
-	"github.com/Clever/sphinx/common"
 	"testing"
+
+	"github.com/Clever/sphinx/common"
 )
 
 func getRequest(headers map[string][]string) common.Request {

limitkeys/limitkey.go

@@ -2,6 +2,7 @@ package limitkeys
 
 import (
 	"fmt"
+
 	"github.com/Clever/sphinx/common"
 )
 

matchers/headermatcher.go

@@ -1,9 +1,10 @@
 package matchers
 
 import (
-	"github.com/Clever/sphinx/common"
 	"net/http"
 	"regexp"
+
+	"github.com/Clever/sphinx/common"
 )
 
 // type to deserialize configuration

matchers/matchers.go

@@ -2,6 +2,7 @@ package matchers
 
 import (
 	"fmt"
+
 	"github.com/Clever/sphinx/common"
 )
 

matchers/pathmatcher.go

@@ -1,8 +1,9 @@
 package matchers
 
 import (
-	"github.com/Clever/sphinx/common"
 	"regexp"
+
+	"github.com/Clever/sphinx/common"
 )
 
 type pathMatcherConfig struct {

ratelimiter/ratelimiter_test.go

@@ -2,13 +2,14 @@ package ratelimiter
 
 import (
 	"fmt"
+	"net/http"
+	"testing"
+	"time"
+
 	"github.com/Clever/leakybucket"
 	"github.com/Clever/sphinx/common"
 	"github.com/Clever/sphinx/config"
 	"github.com/Clever/sphinx/limit"
-	"net/http"
-	"testing"
-	"time"
 )
 
 func returnLastAddStatus(rateLimiter RateLimiter, request common.Request, numAdds int) ([]Status, error) {