Merge branch 'gitaly-redis-refactor' into 'master'

Support new /internal/post-receive API endpoint

Closes gitaly#522

See merge request !163

CHANGELOG

+v5.9.0
+  - Support new /internal/post-receive API endpoint for post-receive operations
+
 v5.8.1
   - Support old versions of ruby without monotonic clock
 

lib/gitlab_net.rb

@@ -11,6 +11,7 @@ require_relative 'httpunix'
 
 class GitlabNet
   class ApiUnreachableError < StandardError; end
+  class NotFound < StandardError; end
 
   CHECK_TIMEOUT = 5
   READ_TIMEOUT = 300
@@ -112,6 +113,19 @@ class GitlabNet
     false
   end
 
+  def post_receive(gl_repository, identifier, changes)
+    params = {
+      gl_repository: gl_repository,
+      identifier: identifier,
+      changes: changes
+    }
+    resp = post("#{host}/post_receive", params)
+
+    raise NotFound if resp.code == '404'
+
+    JSON.parse(resp.body) if resp.code == '200'
+  end
+
   def redis_client
     redis_config = config.redis
     database = redis_config['database'] || 0

lib/gitlab_post_receive.rb

@@ -20,29 +20,20 @@ class GitlabPostReceive
   end
 
   def exec
-    result = update_redis
+    response = GitlabMetrics.measure("post-receive") do
+      api.post_receive(gl_repository, @actor, changes)
+    end
 
-    begin
-      broadcast_message = GitlabMetrics.measure("broadcast-message") do
-        api.broadcast_message
-      end
+    return false unless response
 
-      if broadcast_message.has_key?("message")
-        puts
-        print_broadcast_message(broadcast_message["message"])
-      end
+    print_broadcast_message(response['broadcast_message']) if response['broadcast_message']
+    print_merge_request_links(response['merge_request_urls']) if response['merge_request_urls']
 
-      merge_request_urls = GitlabMetrics.measure("merge-request-urls") do
-        api.merge_request_urls(@gl_repository, @repo_path, @changes)
-      end
-      print_merge_request_links(merge_request_urls)
-
-      api.notify_post_receive(gl_repository, repo_path)
-    rescue GitlabNet::ApiUnreachableError
-      nil
-    end
-
-    result && GitlabReferenceCounter.new(repo_path).decrease
+    response['reference_counter_decreased']
+  rescue GitlabNet::ApiUnreachableError
+    false
+  rescue GitlabNet::NotFound
+    fallback_post_receive
   end
 
   protected
@@ -89,6 +80,7 @@ class GitlabPostReceive
     # message.scan returns a nested array of capture groups, so flatten.
     lines = message.scan(/(.{,#{text_width}})(?:\s|$)/)[0...-1].flatten
 
+    puts
     puts "=" * total_width
     puts
 
@@ -127,4 +119,31 @@ class GitlabPostReceive
       false
     end
   end
+
+  private
+
+  def fallback_post_receive
+    result = update_redis
+
+    begin
+      broadcast_message = GitlabMetrics.measure("broadcast-message") do
+        api.broadcast_message
+      end
+
+      if broadcast_message.has_key?("message")
+        print_broadcast_message(broadcast_message["message"])
+      end
+
+      merge_request_urls = GitlabMetrics.measure("merge-request-urls") do
+        api.merge_request_urls(@gl_repository, @repo_path, @changes)
+      end
+      print_merge_request_links(merge_request_urls)
+
+      api.notify_post_receive(gl_repository, repo_path)
+    rescue GitlabNet::ApiUnreachableError
+      nil
+    end
+
+    result && GitlabReferenceCounter.new(repo_path).decrease
+  end
 end

spec/gitlab_net_spec.rb

@@ -126,6 +126,46 @@ describe GitlabNet, vcr: true do
     end
   end
 
+  describe :post_receive do
+    let(:gl_repository) { "project-1" }
+    let(:changes) { "123456 789012 refs/heads/test\n654321 210987 refs/tags/tag" }
+    let(:params) do
+      { gl_repository: gl_repository, identifier: key, changes: changes }
+    end
+    let(:merge_request_urls) do
+      [{
+        "branch_name" => "test",
+        "url" => "http://localhost:3000/gitlab-org/gitlab-test/merge_requests/7",
+        "new_merge_request" => false
+      }]
+    end
+
+    subject { gitlab_net.post_receive(gl_repository, key, changes) }
+
+    it 'sends the correct parameters' do
+      Net::HTTP::Post.any_instance.should_receive(:set_form_data).with(hash_including(params))
+
+
+      VCR.use_cassette("post-receive") do
+        subject
+      end
+    end
+
+    it 'calls /internal/post-receive' do
+      VCR.use_cassette("post-receive") do
+        expect(subject['merge_request_urls']).to eq(merge_request_urls)
+        expect(subject['broadcast_message']).to eq('Message')
+        expect(subject['reference_counter_decreased']).to eq(true)
+      end
+    end
+
+    it 'throws a NotFound error when post-receive is not available' do
+      VCR.use_cassette("post-receive-not-found") do
+        expect { subject }.to raise_error(GitlabNet::NotFound)
+      end
+    end
+  end
+
   describe :authorized_key do
     let (:ssh_key) { "rsa-key" }
 

spec/vcr_cassettes/post-receive-not-found.yml

+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:3000/api/v4/internal/post_receive
+    body:
+      encoding: US-ASCII
+      string: gl_repository=project-1&identifier=key-1&changes=123456+789012+refs%2Fheads%2Ftest%0A654321+210987+refs%2Ftags%2Ftag&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/x-www-form-urlencoded
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Length:
+      - '25'
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 30 Aug 2017 22:24:37 GMT
+      Vary:
+      - Origin
+      X-Request-Id:
+      - bbfdb1ed-99dc-4246-a606-3074ffd5d87b
+      X-Runtime:
+      - '0.459681'
+    body:
+      encoding: UTF-8
+      string: '{"error":"404 Not Found"}'
+    http_version:
+  recorded_at: Wed, 30 Aug 2017 22:24:37 GMT
+recorded_with: VCR 2.4.0

spec/vcr_cassettes/post-receive.yml

+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:3000/api/v4/internal/post_receive
+    body:
+      encoding: US-ASCII
+      string: gl_repository=project-1&identifier=key-1&changes=123456+789012+refs%2Fheads%2Ftest%0A654321+210987+refs%2Ftags%2Ftag&secret_token=0a3938d9d95d807e94d937af3a4fbbea%0A
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/x-www-form-urlencoded
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Content-Length:
+      - '208'
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 30 Aug 2017 22:08:28 GMT
+      Etag:
+      - W/"1757d1411091b751684cde10119e0942"
+      Vary:
+      - Origin
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Request-Id:
+      - f7d422a7-c1a3-49d1-9b81-7fc48c954767
+      X-Runtime:
+      - '0.687283'
+    body:
+      encoding: UTF-8
+      string: '{"merge_request_urls":[{"branch_name":"test","url":"http://localhost:3000/gitlab-org/gitlab-test/merge_requests/7","new_merge_request":false}],"broadcast_message":"Message","reference_counter_decreased":true}'
+    http_version:
+  recorded_at: Wed, 30 Aug 2017 22:08:28 GMT
+recorded_with: VCR 2.4.0