Commit ed934d46 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Stop using GitalySocketPath

parent d8b8e6f4
......@@ -89,8 +89,6 @@ type Response struct {
Entry string `json:"entry"`
// Used to communicate terminal session details
Terminal *TerminalSettings
// Path to Gitaly Socket (deprecated in favor of GitalyAddress)
GitalySocketPath string
// GitalyAddress is a unix:// or tcp:// address to reach a Gitaly service on
GitalyAddress string
// Repository object for making gRPC requests to Gitaly. This will
......@@ -222,12 +220,6 @@ func (api *API) PreAuthorize(suffix string, r *http.Request) (httpResponse *http
authResponse.Repository.Path = authResponse.RepoPath
}
if socketPath := authResponse.GitalySocketPath; socketPath != "" && authResponse.GitalyAddress == "" {
// We are transitioning away from the GitalySocketPath response field.
// Until all the new code is in place, keep backwards compatibility.
authResponse.GitalyAddress = "unix://" + socketPath
}
return httpResponse, authResponse, nil
}
......
......@@ -145,7 +145,7 @@ func TestFailedCloneNoGitaly(t *testing.T) {
GL_ID: "user-123",
RepoPath: repoPath(t),
// This will create a failure to connect to Gitaly
GitalySocketPath: "/nonexistent",
GitalyAddress: "unix:/nonexistent",
}
// Prepare test server and backend
......@@ -603,19 +603,7 @@ func TestGetInfoRefsProxiedToGitalySuccessfully(t *testing.T) {
defer gitalyServer.Stop()
gitalyAddress := "unix://" + socketPath
addressCases := []struct {
socketPath string
address string
}{
{socketPath: "/nonexistent,/should/be/ignored", address: gitalyAddress},
{socketPath: socketPath},
}
for _, ac := range addressCases {
func() {
apiResponse.GitalySocketPath = ac.socketPath
apiResponse.GitalyAddress = ac.address
apiResponse.GitalyAddress = gitalyAddress
ts := testAuthServer(nil, 200, apiResponse)
defer ts.Close()
......@@ -638,8 +626,7 @@ func TestGetInfoRefsProxiedToGitalySuccessfully(t *testing.T) {
if !bytes.Equal(responseBody, []byte(expectedContent)) {
t.Errorf("GET %q: Expected %q, got %q", resource, expectedContent, responseBody)
}
}()
}
}
func TestPostReceivePackProxiedToGitalySuccessfully(t *testing.T) {
......@@ -733,7 +720,7 @@ func TestGetInfoRefsHandledLocallyDueToEmptyGitalySocketPath(t *testing.T) {
defer gitalyServer.Stop()
apiResponse := gitOkBody(t)
apiResponse.GitalySocketPath = ""
apiResponse.GitalyAddress = ""
ts := testAuthServer(nil, 200, apiResponse)
defer ts.Close()
......@@ -766,7 +753,7 @@ func TestPostReceivePackHandledLocallyDueToEmptyGitalySocketPath(t *testing.T) {
defer gitalyServer.Stop()
apiResponse := gitOkBody(t)
apiResponse.GitalySocketPath = ""
apiResponse.GitalyAddress = ""
ts := testAuthServer(nil, 200, apiResponse)
defer ts.Close()
......@@ -797,7 +784,7 @@ func TestPostUploadPackHandledLocallyDueToEmptyGitalySocketPath(t *testing.T) {
defer gitalyServer.Stop()
apiResponse := gitOkBody(t)
apiResponse.GitalySocketPath = ""
apiResponse.GitalyAddress = ""
ts := testAuthServer(nil, 200, apiResponse)
defer ts.Close()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment