Merge branch '656-implement-proxy-fetch-direct-primary-ff' into 'main'

Implement geo_proxy_direct_to_primary feature flag

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



Merged-by: Igor Drozdov <idrozdov@gitlab.com>
Approved-by: Igor Drozdov <idrozdov@gitlab.com>
Co-authored-by: Patrick Cyiza <jpcyiza@gitlab.com>

internal/gitlabnet/accessverifier/client.go

@@ -40,12 +40,13 @@ type Gitaly struct {
 }
 
 type CustomPayloadData struct {
-	ApiEndpoints            []string          `json:"api_endpoints"`
-	Username                string            `json:"gl_username"`
-	PrimaryRepo             string            `json:"primary_repo"`
-	UserId                  string            `json:"gl_id,omitempty"`
-	RequestHeaders          map[string]string `json:"request_headers"`
-	GeoProxyDirectToPrimary bool              `json:"geo_proxy_direct_to_primary"`
+	ApiEndpoints                 []string          `json:"api_endpoints"`
+	Username                     string            `json:"gl_username"`
+	PrimaryRepo                  string            `json:"primary_repo"`
+	UserId                       string            `json:"gl_id,omitempty"`
+	RequestHeaders               map[string]string `json:"request_headers"`
+	GeoProxyDirectToPrimary      bool              `json:"geo_proxy_direct_to_primary"`
+	GeoProxyFetchDirectToPrimary bool              `json:"geo_proxy_fetch_direct_to_primary"`
 }
 
 type CustomPayload struct {

internal/gitlabnet/accessverifier/client_test.go

@@ -136,9 +136,11 @@ func TestGeoPullGetCustomAction(t *testing.T) {
 	response.Payload = CustomPayload{
 		Action: "geo_proxy_to_primary",
 		Data: CustomPayloadData{
-			ApiEndpoints: []string{"geo/proxy_git_ssh/info_refs_upload_pack", "geo/proxy_git_ssh/upload_pack"},
-			Username:     "custom",
-			PrimaryRepo:  "https://repo/path",
+			ApiEndpoints:                 []string{"geo/proxy_git_ssh/info_refs_upload_pack", "geo/proxy_git_ssh/upload_pack"},
+			Username:                     "custom",
+			GeoProxyFetchDirectToPrimary: true,
+			PrimaryRepo:                  "https://repo/path",
+			RequestHeaders:               map[string]string{"Authorization": "Bearer token"},
 		},
 	}
 	response.StatusCode = 300

internal/testhelper/testdata/testroot/responses/allowed_with_pull_payload.json

@@ -29,7 +29,9 @@
         "geo/proxy_git_ssh/upload_pack"
       ],
       "gl_username": "custom",
-      "primary_repo": "https://repo/path"
+      "primary_repo": "https://repo/path",
+      "geo_proxy_fetch_direct_to_primary": true,
+      "request_headers": { "Authorization": "Bearer token" }
     }
   },
   "git_protocol": "protocol",