Make go fmt happy

deploy_page_test.go

 package main
 
 import (
-	"testing"
 	"io/ioutil"
-	"os"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"path/filepath"
+	"testing"
 )
 
 func TestIfNoDeployPageExist(t *testing.T) {

error_pages_test.go

 package main
 
 import (
-	"testing"
+	"fmt"
 	"io/ioutil"
-	"path/filepath"
+	"net/http"
 	"net/http/httptest"
 	"os"
-	"net/http"
-	"fmt"
+	"path/filepath"
+	"testing"
 )
 
 func TestIfErrorPageIsPresented(t *testing.T) {
@@ -59,4 +59,3 @@ func TestIfErrorPassedIfNoErrorPageIsFound(t *testing.T) {
 		t.Error("Page should be response error: ", w.Body.String())
 	}
 }
-

main.go

@@ -37,7 +37,7 @@ var authSocket = flag.String("authSocket", "", "Optional: Unix domain socket to
 var pprofListenAddr = flag.String("pprofListenAddr", "", "pprof listening address, e.g. 'localhost:6060'")
 var relativeUrlRoot = flag.String("relativeUrlRoot", "/", "GitLab relative URL root")
 var documentRoot = flag.String("documentRoot", "public", "Path to static files content")
-var proxyTimeout = flag.Duration("proxyTimeout", 5 * time.Minute, "Proxy request timeout")
+var proxyTimeout = flag.Duration("proxyTimeout", 5*time.Minute, "Proxy request timeout")
 
 type httpRoute struct {
 	method     string

main_test.go

@@ -366,4 +366,3 @@ func repoPath(t *testing.T) string {
 	}
 	return path.Join(cwd, testRepoRoot, testRepo)
 }
-

sendfile_test.go

 package main
 
 import (
-	"testing"
+	"bytes"
 	"fmt"
-	"path"
-	"net/http/httptest"
-	"net/http"
+	"io/ioutil"
 	"log"
+	"net/http"
+	"net/http/httptest"
 	"os"
-	"io/ioutil"
 	"os/exec"
-	"bytes"
+	"path"
+	"testing"
 )
 
 func TestDeniedLfsDownload(t *testing.T) {
@@ -98,4 +98,3 @@ func deniedXSendfileDownload(t *testing.T, contentFilename string, filePath stri
 		t.Fatal("Unexpected file contents in download")
 	}
 }
-

servefile.go

@@ -15,9 +15,9 @@ func handleServeFile(documentRoot *string, notFoundHandler serviceHandleFunc) se
 		// The filepath.Join does Clean traversing directories up
 		if !strings.HasPrefix(file, *documentRoot) {
 			fail500(w, &os.PathError{
-				Op: "open",
+				Op:   "open",
 				Path: file,
-				Err: os.ErrInvalid,
+				Err:  os.ErrInvalid,
 			})
 			return
 		}

servefile_test.go

 package main
+
 import (
 	"io/ioutil"
-	"testing"
+	"net/http"
 	"net/http/httptest"
 	"os"
-	"net/http"
 	"path/filepath"
+	"testing"
 )
 
 func TestServingNonExistingFile(t *testing.T) {
@@ -76,7 +77,7 @@ func TestServingTheActualFile(t *testing.T) {
 
 	httpRequest, _ := http.NewRequest("GET", "/file", nil)
 	request := &gitRequest{
-		Request: httpRequest,
+		Request:         httpRequest,
 		relativeUriPath: "/file",
 	}
 

uploads_test.go

@@ -41,7 +41,7 @@ func TestUploadHandlerForwardingRawData(t *testing.T) {
 		fmt.Fprint(w, "RESPONSE")
 	})
 
-	httpRequest, err := http.NewRequest("PATCH", ts.URL + "/url/path", bytes.NewBufferString("REQUEST"))
+	httpRequest, err := http.NewRequest("PATCH", ts.URL+"/url/path", bytes.NewBufferString("REQUEST"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -123,7 +123,7 @@ func TestUploadHandlerRewritingMultiPartData(t *testing.T) {
 	fmt.Fprint(file, "test")
 	writer.Close()
 
-	httpRequest, err := http.NewRequest("PUT", ts.URL + "/url/path", nil)
+	httpRequest, err := http.NewRequest("PUT", ts.URL+"/url/path", nil)
 	if err != nil {
 		t.Fatal(err)
 	}

upstream.go

@@ -27,29 +27,29 @@ type upstream struct {
 type authorizationResponse struct {
 	// GL_ID is an environment variable used by gitlab-shell hooks during 'git
 	// push' and 'git pull'
-	GL_ID         string
+	GL_ID string
 	// RepoPath is the full path on disk to the Git repository the request is
 	// about
-	RepoPath      string
+	RepoPath string
 	// ArchivePath is the full path where we should find/create a cached copy
 	// of a requested archive
-	ArchivePath   string
+	ArchivePath string
 	// ArchivePrefix is used to put extracted archive contents in a
 	// subdirectory
 	ArchivePrefix string
 	// CommitId is used do prevent race conditions between the 'time of check'
 	// in the GitLab Rails app and the 'time of use' in gitlab-workhorse.
-	CommitId      string
+	CommitId string
 	// StoreLFSPath is provided by the GitLab Rails application
 	// to mark where the tmp file should be placed
-	StoreLFSPath  string
+	StoreLFSPath string
 	// LFS object id
-	LfsOid        string
+	LfsOid string
 	// LFS object size
-	LfsSize       int64
+	LfsSize int64
 	// TmpPath is the path where we should store temporary files
 	// This is set by authorization middleware
-	TempPath      string
+	TempPath string
 }
 
 // A gitRequest is an *http.Request decorated with attributes returned by the
@@ -57,7 +57,7 @@ type authorizationResponse struct {
 type gitRequest struct {
 	*http.Request
 	authorizationResponse
-	u               *upstream
+	u *upstream
 
 	// This field contains the URL.Path stripped from RelativeUrlRoot
 	relativeUriPath string
@@ -70,9 +70,9 @@ func newUpstream(authBackend string, authTransport http.RoundTripper) *upstream
 	}
 
 	up := &upstream{
-		authBackend: authBackend,
-		httpClient:  &http.Client{Transport: authTransport},
-		httpProxy:   httputil.NewSingleHostReverseProxy(u),
+		authBackend:     authBackend,
+		httpClient:      &http.Client{Transport: authTransport},
+		httpProxy:       httputil.NewSingleHostReverseProxy(u),
 		relativeUrlRoot: "/",
 	}
 	up.httpProxy.Transport = authTransport