Merge branch 'sh-fix-gofmt' into 'main'

Make gofmt check fail if there are any matching files

See merge request gitlab-org/gitlab-shell!500

10 files changed, 26 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index 88daed3..632c324 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,10 @@ validate: verify test
 verify: verify_golang
 
 verify_golang:
-	gofmt -s -l $(GO_SOURCES)
+	gofmt -s -l $(GO_SOURCES) | awk '{ print } END { if (NR > 0) { print "Please run make fmt"; exit 1 } }'
+
+fmt:
+	gofmt -w -s $(GO_SOURCES)
 
 test: test_ruby test_golang
 
diff --git a/client/gitlabnet.go b/client/gitlabnet.go
index a262d93..f71c110 100644
--- a/client/gitlabnet.go
+++ b/client/gitlabnet.go
@@ -132,9 +132,9 @@ func (c *GitlabNetClient) DoRequest(ctx context.Context, method, path string, da
 	start := time.Now()
 	response, err := c.httpClient.Do(request)
 	fields := log.Fields{
-		"method":         method,
-		"url":            request.URL.String(),
-		"duration_ms":    time.Since(start) / time.Millisecond,
+		"method":      method,
+		"url":         request.URL.String(),
+		"duration_ms": time.Since(start) / time.Millisecond,
 	}
 	logger := log.WithContextFields(ctx, fields)
 
diff --git a/client/httpclient.go b/client/httpclient.go
index bcf81dd..f2e82e5 100644
--- a/client/httpclient.go
+++ b/client/httpclient.go
@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"gitlab.com/gitlab-org/labkit/correlation"
-	"gitlab.com/gitlab-org/labkit/tracing"
 	"gitlab.com/gitlab-org/labkit/log"
+	"gitlab.com/gitlab-org/labkit/tracing"
 )
 
 const (
diff --git a/cmd/gitlab-sshd/main.go b/cmd/gitlab-sshd/main.go
index 4cc5f69..d1cc84e 100644
--- a/cmd/gitlab-sshd/main.go
+++ b/cmd/gitlab-sshd/main.go
@@ -1,10 +1,10 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"os"
 	"os/signal"
-	"context"
 	"syscall"
 	"time"
 
@@ -13,8 +13,8 @@ import (
 	"gitlab.com/gitlab-org/gitlab-shell/internal/logger"
 	"gitlab.com/gitlab-org/gitlab-shell/internal/sshd"
 
-	"gitlab.com/gitlab-org/labkit/monitoring"
 	"gitlab.com/gitlab-org/labkit/log"
+	"gitlab.com/gitlab-org/labkit/monitoring"
 )
 
 var (
diff --git a/internal/config/config.go b/internal/config/config.go
index ba21219..5aa99de 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -109,7 +109,6 @@ func (c *Config) HttpClient() *client.HttpClient {
 		tr := client.Transport
 		client.Transport = promhttp.InstrumentRoundTripperDuration(metrics.HttpRequestDuration, tr)
 
-
 		c.httpClient = client
 	})
 
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index 521dd35..5fa8e66 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -4,11 +4,11 @@ import (
 	"os"
 	"testing"
 
-	"github.com/stretchr/testify/require"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/stretchr/testify/require"
 
-	"gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
 	"gitlab.com/gitlab-org/gitlab-shell/client/testserver"
+	"gitlab.com/gitlab-org/gitlab-shell/internal/testhelper"
 )
 
 func TestConfigApplyGlobalState(t *testing.T) {
diff --git a/internal/handler/exec.go b/internal/handler/exec.go
index 89856f7..27031b1 100644
--- a/internal/handler/exec.go
+++ b/internal/handler/exec.go
@@ -18,10 +18,10 @@ import (
 	gitalyauth "gitlab.com/gitlab-org/gitaly/v14/auth"
 	"gitlab.com/gitlab-org/gitaly/v14/client"
 	pb "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
-	grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc"
-	grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc"
 	"gitlab.com/gitlab-org/labkit/correlation"
+	grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc"
 	"gitlab.com/gitlab-org/labkit/log"
+	grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc"
 )
 
 // GitalyHandlerFunc implementations are responsible for making
diff --git a/internal/sshd/sshd.go b/internal/sshd/sshd.go
index d3b5ec1..7f96bef 100644
--- a/internal/sshd/sshd.go
+++ b/internal/sshd/sshd.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net"
+	"net/http"
 	"strconv"
-	"time"
 	"sync"
-	"net/http"
+	"time"
 
 	"github.com/pires/go-proxyproto"
 	"golang.org/x/crypto/ssh"
@@ -18,13 +18,13 @@ import (
 	"gitlab.com/gitlab-org/gitlab-shell/internal/config"
 	"gitlab.com/gitlab-org/gitlab-shell/internal/gitlabnet/authorizedkeys"
 
-	"gitlab.com/gitlab-org/labkit/log"
 	"gitlab.com/gitlab-org/labkit/correlation"
+	"gitlab.com/gitlab-org/labkit/log"
 )
 
 type status int
 
-const(
+const (
 	StatusStarting status = iota
 	StatusReady
 	StatusOnShutdown
@@ -34,9 +34,9 @@ const(
 type Server struct {
 	Config *config.Config
 
-	status status
+	status   status
 	statusMu sync.Mutex
-	wg sync.WaitGroup
+	wg       sync.WaitGroup
 	listener net.Listener
 }
 
@@ -71,7 +71,7 @@ func (s *Server) MonitoringServeMux() *http.ServeMux {
 	})
 
 	mux.HandleFunc(s.Config.Server.LivenessProbe, func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusOK)
+		w.WriteHeader(http.StatusOK)
 	})
 
 	return mux
@@ -191,7 +191,6 @@ func (s *Server) initConfig(ctx context.Context) (*ssh.ServerConfig, error) {
 	return sshCfg, nil
 }
 
-
 func (s *Server) handleConn(ctx context.Context, sshCfg *ssh.ServerConfig, nconn net.Conn) {
 	remoteAddr := nconn.RemoteAddr().String()
 
diff --git a/internal/sshd/sshd_test.go b/internal/sshd/sshd_test.go
index 9187140..e5f6111 100644
--- a/internal/sshd/sshd_test.go
+++ b/internal/sshd/sshd_test.go
@@ -1,10 +1,10 @@
 package sshd
 
 import (
-	"testing"
 	"context"
-	"path"
 	"net/http/httptest"
+	"path"
+	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
@@ -75,7 +75,7 @@ func setupServer(t *testing.T) *Server {
 
 	url := testserver.StartSocketHttpServer(t, []testserver.TestRequestHandler{})
 	srvCfg := config.ServerConfig{
-		Listen: serverUrl,
+		Listen:       serverUrl,
 		HostKeyFiles: []string{path.Join(testhelper.TestRoot, "certs/valid/server.key")},
 	}
 
@@ -85,7 +85,7 @@ func setupServer(t *testing.T) *Server {
 }
 
 func verifyStatus(t *testing.T, s *Server, st status) {
-	for i := 5; i < 500; i+=50 {
+	for i := 5; i < 500; i += 50 {
 		if s.getStatus() == st {
 			break
 		}
diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go
index c2c7826..933da00 100644
--- a/internal/testhelper/testhelper.go
+++ b/internal/testhelper/testhelper.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"path"
 	"runtime"
-	"time"
 	"testing"
+	"time"
 
 	"github.com/otiai10/copy"
 	"github.com/sirupsen/logrus"