Clean up files

go/internal/config/config.go

@@ -51,9 +51,7 @@ func NewFromDir(dir string) (*Config, error) {
 }
 
 func newFromFile(filename string) (*Config, error) {
-	cfg := &Config{
-		RootDir: path.Dir(filename),
-	}
+	cfg := &Config{RootDir: path.Dir(filename)}
 
 	configBytes, err := ioutil.ReadFile(filename)
 	if err != nil {

go/internal/gitlabnet/client_test.go

@@ -57,6 +57,13 @@ func TestClients(t *testing.T) {
 				require.Equal(t, "127.0.0.1", header)
 			},
 		},
+		{
+			Path: "/api/v4/internal/with_empty_ip",
+			Handler: func(w http.ResponseWriter, r *http.Request) {
+				header := r.Header.Get("X-Forwarded-For")
+				require.Equal(t, "", header)
+			},
+		},
 		{
 			Path: "/api/v4/internal/error",
 			Handler: func(w http.ResponseWriter, r *http.Request) {
@@ -107,6 +114,7 @@ func TestClients(t *testing.T) {
 
 			tc.config.GitlabUrl = url
 			tc.config.Secret = "sssh, it's a secret"
+
 			client, err := GetClient(tc.config)
 			require.NoError(t, err)
 
@@ -117,6 +125,7 @@ func TestClients(t *testing.T) {
 			testErrorMessage(t, client)
 			testAuthenticationHeader(t, client)
 			testXForwardedForHeader(t, client)
+			testEmptyForwardedForHeader(t, client)
 		})
 	}
 }
@@ -251,3 +260,22 @@ func testXForwardedForHeader(t *testing.T, client *GitlabClient) {
 		response.Body.Close()
 	})
 }
+
+func testEmptyForwardedForHeader(t *testing.T, client *GitlabClient) {
+	t.Run("X-Forwarded-For empty for GET", func(t *testing.T) {
+		response, err := client.Get("/with_empty_ip")
+
+		require.NoError(t, err)
+		require.NotNil(t, response)
+		response.Body.Close()
+	})
+
+	t.Run("X-Forwarded-For empty for POST", func(t *testing.T) {
+		data := map[string]string{"key": "value"}
+		response, err := client.Post("/with_empty_ip", data)
+
+		require.NoError(t, err)
+		require.NotNil(t, response)
+		response.Body.Close()
+	})
+}

go/internal/sshenv/sshenv_test.go

@@ -12,6 +12,9 @@ func TestLocalAddr(t *testing.T) {
 	require.NoError(t, err)
 	defer cleanup()
 
-	require.Nil(t, err)
 	require.Equal(t, LocalAddr(), "127.0.0.1")
 }
+
+func TestEmptyLocalAddr(t *testing.T) {
+	require.Equal(t, LocalAddr(), "")
+}

support/go-test

@@ -5,7 +5,7 @@ include GoBuild
 
 def main
   ensure_build_dir_exists
-  run!(GO_ENV, %w[go test -v ./...], chdir: GO_DIR)
+  run!(GO_ENV, %w[go test ./...], chdir: GO_DIR)
   puts 'OK'
 end