From 85d88d67cca58945aa6d4835bf3a518f12019e3a Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Wed, 28 Aug 2019 16:51:17 +0000
Subject: [PATCH] Support Gitaly feature flags in workhorse

---
 GITLAB_WORKHORSE_VERSION                    |  2 +-
 lib/gitlab/workhorse.rb                     |  6 ++++--
 spec/lib/gitlab/workhorse_spec.rb           | 13 +++++++++++++
 spec/requests/api/project_snapshots_spec.rb |  7 +++++++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 3b6825376ad..e5c15102d9b 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-8.8.0
+8.9.0
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 3b77fe838ae..29087d26007 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -34,7 +34,8 @@ module Gitlab
           GitConfigOptions: [],
           GitalyServer: {
             address: Gitlab::GitalyClient.address(project.repository_storage),
-            token: Gitlab::GitalyClient.token(project.repository_storage)
+            token: Gitlab::GitalyClient.token(project.repository_storage),
+            features: Feature::Gitaly.server_feature_flags
           }
         }
 
@@ -250,7 +251,8 @@ module Gitlab
       def gitaly_server_hash(repository)
         {
           address: Gitlab::GitalyClient.address(repository.project.repository_storage),
-          token: Gitlab::GitalyClient.token(repository.project.repository_storage)
+          token: Gitlab::GitalyClient.token(repository.project.repository_storage),
+          features: Feature::Gitaly.server_feature_flags
         }
       end
 
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index 5c5ff46112f..98421cd12d3 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -14,6 +14,12 @@ describe Gitlab::Workhorse do
     [key, command, params]
   end
 
+  before do
+    allow(Feature::Gitaly).to receive(:server_feature_flags).and_return({
+      'gitaly-feature-foobar' => 'true'
+    })
+  end
+
   describe ".send_git_archive" do
     let(:ref) { 'master' }
     let(:format) { 'zip' }
@@ -41,6 +47,7 @@ describe Gitlab::Workhorse do
         expected_params = metadata.merge(
           'GitalyRepository' => repository.gitaly_repository.to_h,
           'GitalyServer' => {
+            features: { 'gitaly-feature-foobar' => 'true' },
             address: Gitlab::GitalyClient.address(project.repository_storage),
             token: Gitlab::GitalyClient.token(project.repository_storage)
           }
@@ -69,6 +76,7 @@ describe Gitlab::Workhorse do
         expect(command).to eq('git-archive')
         expect(params).to eq({
           'GitalyServer' => {
+            features: { 'gitaly-feature-foobar' => 'true' },
             address: Gitlab::GitalyClient.address(project.repository_storage),
             token: Gitlab::GitalyClient.token(project.repository_storage)
           },
@@ -117,6 +125,7 @@ describe Gitlab::Workhorse do
       expect(command).to eq("git-format-patch")
       expect(params).to eq({
         'GitalyServer' => {
+          features: { 'gitaly-feature-foobar' => 'true' },
           address: Gitlab::GitalyClient.address(project.repository_storage),
           token: Gitlab::GitalyClient.token(project.repository_storage)
         },
@@ -178,6 +187,7 @@ describe Gitlab::Workhorse do
       expect(command).to eq("git-diff")
       expect(params).to eq({
         'GitalyServer' => {
+          features: { 'gitaly-feature-foobar' => 'true' },
           address: Gitlab::GitalyClient.address(project.repository_storage),
           token: Gitlab::GitalyClient.token(project.repository_storage)
         },
@@ -315,6 +325,7 @@ describe Gitlab::Workhorse do
       let(:gitaly_params) do
         {
           GitalyServer: {
+            features: { 'gitaly-feature-foobar' => 'true' },
             address: Gitlab::GitalyClient.address('default'),
             token: Gitlab::GitalyClient.token('default')
           }
@@ -463,6 +474,7 @@ describe Gitlab::Workhorse do
       expect(command).to eq('git-blob')
       expect(params).to eq({
         'GitalyServer' => {
+          features: { 'gitaly-feature-foobar' => 'true' },
           address: Gitlab::GitalyClient.address(project.repository_storage),
           token: Gitlab::GitalyClient.token(project.repository_storage)
         },
@@ -504,6 +516,7 @@ describe Gitlab::Workhorse do
       expect(command).to eq('git-snapshot')
       expect(params).to eq(
         'GitalyServer' => {
+          'features' => { 'gitaly-feature-foobar' => 'true' },
           'address' => Gitlab::GitalyClient.address(project.repository_storage),
           'token' => Gitlab::GitalyClient.token(project.repository_storage)
         },
diff --git a/spec/requests/api/project_snapshots_spec.rb b/spec/requests/api/project_snapshots_spec.rb
index 44b5ee1f130..2857715cdbe 100644
--- a/spec/requests/api/project_snapshots_spec.rb
+++ b/spec/requests/api/project_snapshots_spec.rb
@@ -6,6 +6,12 @@ describe API::ProjectSnapshots do
   let(:project) { create(:project) }
   let(:admin) { create(:admin) }
 
+  before do
+    allow(Feature::Gitaly).to receive(:server_feature_flags).and_return({
+      'gitaly-feature-foobar' => 'true'
+    })
+  end
+
   describe 'GET /projects/:id/snapshot' do
     def expect_snapshot_response_for(repository)
       type, params = workhorse_send_data
@@ -13,6 +19,7 @@ describe API::ProjectSnapshots do
       expect(type).to eq('git-snapshot')
       expect(params).to eq(
         'GitalyServer' => {
+          'features' => { 'gitaly-feature-foobar' => 'true' },
           'address' => Gitlab::GitalyClient.address(repository.project.repository_storage),
           'token' => Gitlab::GitalyClient.token(repository.project.repository_storage)
         },
-- 
GitLab