Merge branch '83-follow-up-from-handle-gl_repository-env-variable-and-use-it-in-api-calls' into 'master'

Use gl_repository if present when enqueing Sidekiq PostReceive jobs Closes #83 See merge request !132

Author: smcgivern

CHANGELOG

@@ -1,3 +1,6 @@
+v5.0.5
+ - Use gl_repository if present when enqueing Sidekiq PostReceive jobs
+
 v5.0.4
  - Handle GL_REPOSITORY env variable and use it in API calls and Sidekiq enqueuing
 

lib/gitlab_post_receive.rb

@@ -107,9 +107,9 @@ def print_broadcast_message(message)
  def update_redis
  # Encode changes as base64 so we don't run into trouble with non-UTF-8 input.
  changes = Base64.encode64(@changes)
- # TODO: Change to `@gl_repository || @repo_path` in next release.
+ # TODO: Change to `@gl_repository` in next release.
  # See https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/130#note_28747613
- project_identifier = @repo_path
+ project_identifier = @gl_repository || @repo_path
 
  queue = "#{config.redis_namespace}:queue:post_receive"
  msg = JSON.dump({

spec/gitlab_post_receive_spec.rb

@@ -137,13 +137,28 @@
  end
  end
 
- it "pushes a Sidekiq job onto the queue" do
- expect(redis_client).to receive(:rpush).with(
- 'resque:gitlab:queue:post_receive',
- %Q/{"class":"PostReceive","args":["#{repo_path}","#{actor}",#{base64_changes.inspect}],"jid":"#{gitlab_post_receive.jid}","enqueued_at":#{enqueued_at.to_f}}/
- ).and_return(true)
+ context 'Sidekiq jobs' do
+ it "pushes a Sidekiq job onto the queue" do
+ expect(redis_client).to receive(:rpush).with(
+ 'resque:gitlab:queue:post_receive',
+ %Q/{"class":"PostReceive","args":["#{gl_repository}","#{actor}",#{base64_changes.inspect}],"jid":"#{gitlab_post_receive.jid}","enqueued_at":#{enqueued_at.to_f}}/
+ ).and_return(true)
 
- gitlab_post_receive.exec
+ gitlab_post_receive.exec
+ end
+
+ context 'when gl_repository is nil' do
+ let(:gl_repository) { nil }
+
+ it "pushes a Sidekiq job with the repository path" do
+ expect(redis_client).to receive(:rpush).with(
+ 'resque:gitlab:queue:post_receive',
+ %Q/{"class":"PostReceive","args":["#{repo_path}","#{actor}",#{base64_changes.inspect}],"jid":"#{gitlab_post_receive.jid}","enqueued_at":#{enqueued_at.to_f}}/
+ ).and_return(true)
+
+ gitlab_post_receive.exec
+ end
+ end
  end
 
  context 'reference counter' do