Separate imports

authorization_test.go

@@ -2,13 +2,14 @@ package main
 
 import (
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 	"net/http"
 	"net/http/httptest"
 	"regexp"
 	"testing"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 )
 
 func okHandler(w http.ResponseWriter, _ *http.Request, _ *api.Response) {

cmd/gitlab-zip-cat/main.go

@@ -4,9 +4,10 @@ import (
 	"archive/zip"
 	"flag"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/zipartifacts"
 	"io"
 	"os"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/zipartifacts"
 )
 
 const progName = "gitlab-zip-cat"

cmd/gitlab-zip-metadata/main.go

@@ -3,8 +3,9 @@ package main
 import (
 	"flag"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/zipartifacts"
 	"os"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/zipartifacts"
 )
 
 const progName = "gitlab-zip-metadata"

internal/api/api.go

@@ -3,13 +3,14 @@ package api
 import (
 	"encoding/json"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/badgateway"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/badgateway"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 )
 
 type API struct {

internal/artifacts/artifact_download.go

@@ -4,9 +4,6 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/zipartifacts"
 	"io"
 	"mime"
 	"net/http"
@@ -15,6 +12,10 @@ import (
 	"path/filepath"
 	"strings"
 	"syscall"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/zipartifacts"
 )
 
 func detectFileContentType(fileName string) string {

internal/artifacts/artifact_download_test.go

@@ -5,14 +5,15 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"testing"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 )
 
 func testArtifactDownloadServer(t *testing.T, archive string, entry string) *httptest.Server {

internal/artifacts/artifacts_upload.go

@@ -3,16 +3,17 @@ package artifacts
 import (
 	"errors"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/upload"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/zipartifacts"
 	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	"os"
 	"os/exec"
 	"syscall"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/upload"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/zipartifacts"
 )
 
 type artifactsUploadProcessor struct {

internal/artifacts/artifacts_upload_test.go

@@ -6,11 +6,6 @@ import (
 	"compress/gzip"
 	"encoding/json"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/proxy"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/zipartifacts"
 	"io"
 	"io/ioutil"
 	"mime/multipart"
@@ -18,6 +13,12 @@ import (
 	"net/http/httptest"
 	"os"
 	"testing"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/proxy"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/zipartifacts"
 )
 
 func testArtifactsUploadServer(t *testing.T, tempPath string) *httptest.Server {

internal/badgateway/roundtripper.go

@@ -3,11 +3,12 @@ package badgateway
 import (
 	"bytes"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 	"io/ioutil"
 	"net"
 	"net/http"
 	"time"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 )
 
 // Values from http.DefaultTransport

internal/git/archive.go

@@ -6,8 +6,6 @@ package git
 
 import (
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/senddata"
 	"io"
 	"io/ioutil"
 	"log"
@@ -18,6 +16,9 @@ import (
 	"path/filepath"
 	"syscall"
 	"time"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/senddata"
 )
 
 type archive struct{ senddata.Prefix }

internal/git/blob.go

@@ -2,12 +2,13 @@ package git
 
 import (
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/senddata"
 	"io"
 	"log"
 	"net/http"
 	"strings"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/senddata"
 )
 
 type blob struct{ senddata.Prefix }

internal/git/git-http.go

@@ -7,9 +7,6 @@ package git
 import (
 	"errors"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/delay"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 	"io"
 	"log"
 	"net/http"
@@ -17,6 +14,10 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/delay"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 )
 
 func GetInfoRefs(a *api.API) http.Handler {

internal/lfs/lfs.go

@@ -10,13 +10,14 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 )
 
 func PutStore(a *api.API, h http.Handler) http.Handler {

internal/proxy/proxy.go

 package proxy
 
 import (
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/badgateway"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 	"net/http"
 	"net/http/httputil"
 	"net/url"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/badgateway"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 )
 
 type Proxy struct {

internal/sendfile/sendfile.go

@@ -7,9 +7,10 @@ via the X-Sendfile mechanism. All that is needed in the Rails code is the
 package sendfile
 
 import (
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 	"log"
 	"net/http"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 )
 
 const sendFileResponseHeader = "X-Sendfile"

internal/staticpages/deploy_page.go

 package staticpages
 
 import (
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 	"io/ioutil"
 	"net/http"
 	"path/filepath"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 )
 
 func (s *Static) DeployPage(handler http.Handler) http.Handler {

internal/staticpages/error_pages_test.go

@@ -2,13 +2,14 @@ package staticpages
 
 import (
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"testing"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 )
 
 func TestIfErrorPageIsPresented(t *testing.T) {

internal/staticpages/servefile.go

 package staticpages
 
 import (
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/urlprefix"
 	"log"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/urlprefix"
 )
 
 type CacheMode int

internal/staticpages/servefile_test.go

@@ -3,13 +3,14 @@ package staticpages
 import (
 	"bytes"
 	"compress/gzip"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"testing"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 )
 
 func TestServingNonExistingFile(t *testing.T) {

internal/upload/uploads.go

@@ -3,12 +3,13 @@ package upload
 import (
 	"bytes"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 	"io"
 	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	"os"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 )
 
 type MultipartFormProcessor interface {

internal/upload/uploads_test.go

@@ -4,9 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/proxy"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 	"io"
 	"io/ioutil"
 	"mime/multipart"
@@ -16,6 +13,10 @@ import (
 	"regexp"
 	"strings"
 	"testing"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/proxy"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 )
 
 var nilHandler = http.HandlerFunc(func(http.ResponseWriter, *http.Request) {})

internal/upstream/development_test.go

 package upstream
 
 import (
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 )
 
 func TestDevelopmentModeEnabled(t *testing.T) {

internal/upstream/handlers.go

@@ -3,9 +3,10 @@ package upstream
 import (
 	"compress/gzip"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 	"io"
 	"net/http"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
 )
 
 func contentEncodingHandler(h http.Handler) http.Handler {

internal/upstream/handlers_test.go

@@ -4,12 +4,13 @@ import (
 	"bytes"
 	"compress/gzip"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"reflect"
 	"testing"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 )
 
 func TestGzipEncoding(t *testing.T) {

internal/upstream/routes.go

 package upstream
 
 import (
+	"net/http"
+	"regexp"
+
 	apipkg "gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
 	"gitlab.com/gitlab-org/gitlab-workhorse/internal/artifacts"
 	"gitlab.com/gitlab-org/gitlab-workhorse/internal/git"
@@ -9,8 +12,6 @@ import (
 	"gitlab.com/gitlab-org/gitlab-workhorse/internal/senddata"
 	"gitlab.com/gitlab-org/gitlab-workhorse/internal/sendfile"
 	"gitlab.com/gitlab-org/gitlab-workhorse/internal/staticpages"
-	"net/http"
-	"regexp"
 )
 
 type route struct {

internal/upstream/upstream.go

@@ -8,13 +8,14 @@ package upstream
 
 import (
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/badgateway"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/urlprefix"
 	"net/http"
 	"net/url"
 	"strings"
 	"time"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/badgateway"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/urlprefix"
 )
 
 var DefaultBackend = helper.URLMustParse("http://localhost:8080")

main.go

@@ -16,7 +16,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/upstream"
 	"log"
 	"net"
 	"net/http"
@@ -24,6 +23,8 @@ import (
 	"os"
 	"syscall"
 	"time"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/upstream"
 )
 
 // Current version of GitLab Workhorse

main_test.go

@@ -5,10 +5,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/upstream"
 	"io"
 	"io/ioutil"
 	"log"
@@ -22,6 +18,11 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/api"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/upstream"
 )
 
 const scratchDir = "testdata/scratch"

proxy_test.go

@@ -3,10 +3,6 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/badgateway"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/proxy"
-	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 	"io"
 	"net"
 	"net/http"
@@ -14,6 +10,11 @@ import (
 	"regexp"
 	"testing"
 	"time"
+
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/badgateway"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/helper"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/proxy"
+	"gitlab.com/gitlab-org/gitlab-workhorse/internal/testhelper"
 )
 
 func newProxy(url string, rt *badgateway.RoundTripper) *proxy.Proxy {