Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 12 deletions

diff --git a/workhorse/internal/api/api.go b/workhorse/internal/api/api.go
index d3c19af030d..417ee71dbdc 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"
@@ -40,8 +39,6 @@ type API struct {
 	Version string
 }
 
-var ErrNotGeoSecondary = errors.New("this is not a Geo secondary site")
-
 var (
 	requestsCounter = promauto.NewCounterVec(
 		prometheus.CounterOpts{
@@ -399,7 +396,6 @@ func validResponseContentType(resp *http.Response) bool {
 	return helper.IsContentType(ResponseContentType, resp.Header.Get("Content-Type"))
 }
 
-// TODO: Cache the result of the API requests https://gitlab.com/gitlab-org/gitlab/-/issues/329671
 func (api *API) GetGeoProxyURL() (*url.URL, error) {
 	geoProxyApiUrl := *api.URL
 	geoProxyApiUrl.Path, geoProxyApiUrl.RawPath = joinURLPath(api.URL, geoProxyEndpointPath)
@@ -424,10 +420,6 @@ func (api *API) GetGeoProxyURL() (*url.URL, error) {
 		return nil, fmt.Errorf("GetGeoProxyURL: decode response: %v", err)
 	}
 
-	if response.GeoProxyURL == "" {
-		return nil, ErrNotGeoSecondary
-	}
-
 	geoProxyURL, err := url.Parse(response.GeoProxyURL)
 	if err != nil {
 		return nil, fmt.Errorf("GetGeoProxyURL: Could not parse Geo proxy URL: %v, err: %v", response.GeoProxyURL, err)
diff --git a/workhorse/internal/api/api_test.go b/workhorse/internal/api/api_test.go
index 4267a184a19..43e3604cc9c 100644
--- a/workhorse/internal/api/api_test.go
+++ b/workhorse/internal/api/api_test.go
@@ -22,16 +22,14 @@ func TestGetGeoProxyURLWhenGeoSecondary(t *testing.T) {
 	geoProxyURL, err := getGeoProxyURLGivenResponse(t, `{"geo_proxy_url":"http://primary"}`)
 
 	require.NoError(t, err)
-	require.NotNil(t, geoProxyURL)
 	require.Equal(t, "http://primary", geoProxyURL.String())
 }
 
 func TestGetGeoProxyURLWhenGeoPrimaryOrNonGeo(t *testing.T) {
 	geoProxyURL, err := getGeoProxyURLGivenResponse(t, "{}")
 
-	require.Error(t, err)
-	require.Equal(t, ErrNotGeoSecondary, err)
-	require.Nil(t, geoProxyURL)
+	require.NoError(t, err)
+	require.Equal(t, "", geoProxyURL.String())
 }
 
 func getGeoProxyURLGivenResponse(t *testing.T, givenInternalApiResponse string) (*url.URL, error) {