Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 5 deletions

diff --git a/workhorse/internal/api/api.go b/workhorse/internal/api/api.go
index a00cff34b89..3abc735dc90 100644
--- a/workhorse/internal/api/api.go
+++ b/workhorse/internal/api/api.go
@@ -3,7 +3,6 @@ package api
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -310,18 +309,18 @@ func (api *API) PreAuthorizeFixedPath(r *http.Request, method string, path strin
 	}
 	authReq.Header = helper.HeaderClone(r.Header)
 
-	ignoredResponse, apiResponse, err := api.PreAuthorize(path, authReq)
+	failureResponse, apiResponse, err := api.PreAuthorize(path, authReq)
 	if err != nil {
 		return nil, fmt.Errorf("PreAuthorize: %w", err)
 	}
 
-	// We don't need the contents of ignoredResponse but we are responsible
+	// We don't need the contents of failureResponse but we are responsible
 	// for closing it. Part of the reason PreAuthorizeFixedPath exists is to
 	// hide this awkwardness.
-	ignoredResponse.Body.Close()
+	failureResponse.Body.Close()
 
 	if apiResponse == nil {
-		return nil, errors.New("no api response on fixed path")
+		return nil, fmt.Errorf("no api response: status %d", failureResponse.StatusCode)
 	}
 
 	return apiResponse, nil