Merge branch 'ash2k/gitaly-not-found' into 'master'

Turn NotFound from Gitaly into 404 for InfoRefs

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/162697



Merged-by: Ash McKenzie <amckenzie@gitlab.com>
Approved-by: Ash McKenzie <amckenzie@gitlab.com>
Reviewed-by: Ash McKenzie <amckenzie@gitlab.com>
Co-authored-by: Mikhail Mazurskiy <mmazurskiy@gitlab.com>

workhorse/internal/git/info-refs.go

@@ -46,10 +46,18 @@ func handleGetInfoRefs(rw http.ResponseWriter, r *http.Request, a *api.Response)
 		status := grpcstatus.Convert(err)
 		err = fmt.Errorf("handleGetInfoRefs: %v", err)
 
-		if status != nil && status.Code() == grpccodes.Unavailable {
+		if status == nil {
+			fail.Request(responseWriter, r, err)
+			return
+		}
+		switch status.Code() {
+		case grpccodes.Unavailable:
 			fail.Request(responseWriter, r, err, fail.WithStatus(http.StatusServiceUnavailable),
 				fail.WithBody("The git server, Gitaly, is not available at this time. Please contact your administrator."))
-		} else {
+		case grpccodes.NotFound:
+			fail.Request(responseWriter, r, err, fail.WithStatus(http.StatusNotFound),
+				fail.WithBody("Not Found."))
+		default:
 			fail.Request(responseWriter, r, err)
 		}
 	}

workhorse/internal/git/info-refs_test.go

 package git
 
 import (
+	"net/http"
 	"net/http/httptest"
 	"testing"
 
@@ -22,7 +23,7 @@ func (srv *smartHTTPServiceServerWithInfoRefs) InfoRefsUploadPack(r *gitalypb.In
 	return srv.InfoRefsUploadPackFunc(r, s)
 }
 
-func TestGetInfoRefsHandler(t *testing.T) {
+func TestGetInfoRefsHandler_Unavailable(t *testing.T) {
 	addr := startSmartHTTPServer(t, &smartHTTPServiceServerWithInfoRefs{
 		InfoRefsUploadPackFunc: func(_ *gitalypb.InfoRefsRequest, _ gitalypb.SmartHTTPService_InfoRefsUploadPackServer) error {
 			return grpcstatus.Error(grpccodes.Unavailable, "error")
@@ -34,8 +35,26 @@ func TestGetInfoRefsHandler(t *testing.T) {
 	a := &api.Response{GitalyServer: api.GitalyServer{Address: addr}}
 
 	handleGetInfoRefs(NewHTTPResponseWriter(w), r, a)
-	require.Equal(t, 503, w.Code)
+	require.Equal(t, http.StatusServiceUnavailable, w.Code)
 
 	msg := "The git server, Gitaly, is not available at this time. Please contact your administrator.\n"
 	require.Equal(t, msg, w.Body.String())
 }
+
+func TestGetInfoRefsHandler_NotFound(t *testing.T) {
+	addr := startSmartHTTPServer(t, &smartHTTPServiceServerWithInfoRefs{
+		InfoRefsUploadPackFunc: func(_ *gitalypb.InfoRefsRequest, _ gitalypb.SmartHTTPService_InfoRefsUploadPackServer) error {
+			return grpcstatus.Error(grpccodes.NotFound, "error")
+		},
+	})
+
+	w := httptest.NewRecorder()
+	r := httptest.NewRequest("GET", "/?service=git-upload-pack", nil)
+	a := &api.Response{GitalyServer: api.GitalyServer{Address: addr}}
+
+	handleGetInfoRefs(NewHTTPResponseWriter(w), r, a)
+	require.Equal(t, http.StatusNotFound, w.Code)
+
+	msg := "Not Found.\n"
+	require.Equal(t, msg, w.Body.String())
+}