Commit 30a06eca authored by Jonathon Reinhart's avatar Jonathon Reinhart

Pass push options to GitLab /internal/post_receive API

push_opts[] is named as such so that it becomes an array in the
GitLab internal Grape::API params hash. If it were named push_opts, only
the final (scalar) push_opts parameter would be present.

Also update specs to include push_opts parameter:
- gitlab_post_receive_spec
- gitlab_net_spec for the internal API change
parent 857e86a6
...@@ -9,9 +9,12 @@ gl_repository = ENV['GL_REPOSITORY'] ...@@ -9,9 +9,12 @@ gl_repository = ENV['GL_REPOSITORY']
repo_path = Dir.pwd repo_path = Dir.pwd
require_relative '../lib/gitlab_custom_hook' require_relative '../lib/gitlab_custom_hook'
require_relative '../lib/hooks_utils'
require_relative '../lib/gitlab_post_receive' require_relative '../lib/gitlab_post_receive'
if GitlabPostReceive.new(gl_repository, repo_path, key_id, refs).exec && push_opts = HooksUtils.get_push_options
if GitlabPostReceive.new(gl_repository, repo_path, key_id, refs, push_opts).exec &&
GitlabCustomHook.new(repo_path, key_id).post_receive(refs) GitlabCustomHook.new(repo_path, key_id).post_receive(refs)
exit 0 exit 0
else else
......
...@@ -119,11 +119,12 @@ class GitlabNet # rubocop:disable Metrics/ClassLength ...@@ -119,11 +119,12 @@ class GitlabNet # rubocop:disable Metrics/ClassLength
false false
end end
def post_receive(gl_repository, identifier, changes) def post_receive(gl_repository, identifier, changes, push_opts)
params = { params = {
gl_repository: gl_repository, gl_repository: gl_repository,
identifier: identifier, identifier: identifier,
changes: changes changes: changes,
:"push_opts[]" => push_opts, # ruby <2.2 syntax
} }
resp = post("#{internal_api_endpoint}/post_receive", params) resp = post("#{internal_api_endpoint}/post_receive", params)
......
...@@ -8,18 +8,19 @@ require 'securerandom' ...@@ -8,18 +8,19 @@ require 'securerandom'
class GitlabPostReceive class GitlabPostReceive
attr_reader :config, :gl_repository, :repo_path, :changes, :jid attr_reader :config, :gl_repository, :repo_path, :changes, :jid
def initialize(gl_repository, repo_path, actor, changes) def initialize(gl_repository, repo_path, actor, changes, push_opts)
@config = GitlabConfig.new @config = GitlabConfig.new
@gl_repository = gl_repository @gl_repository = gl_repository
@repo_path = repo_path.strip @repo_path = repo_path.strip
@actor = actor @actor = actor
@changes = changes @changes = changes
@push_opts = push_opts
@jid = SecureRandom.hex(12) @jid = SecureRandom.hex(12)
end end
def exec def exec
response = GitlabMetrics.measure("post-receive") do response = GitlabMetrics.measure("post-receive") do
api.post_receive(gl_repository, @actor, changes) api.post_receive(gl_repository, @actor, changes, @push_opts)
end end
return false unless response return false unless response
......
...@@ -174,8 +174,9 @@ describe GitlabNet, vcr: true do ...@@ -174,8 +174,9 @@ describe GitlabNet, vcr: true do
describe '#post_receive' do describe '#post_receive' do
let(:gl_repository) { "project-1" } let(:gl_repository) { "project-1" }
let(:changes) { "123456 789012 refs/heads/test\n654321 210987 refs/tags/tag" } let(:changes) { "123456 789012 refs/heads/test\n654321 210987 refs/tags/tag" }
let(:push_opts) { ["ci-skip", "something unexpected"] }
let(:params) do let(:params) do
{ gl_repository: gl_repository, identifier: key, changes: changes } { gl_repository: gl_repository, identifier: key, changes: changes, :"push_opts[]" => push_opts }
end end
let(:merge_request_urls) do let(:merge_request_urls) do
[{ [{
...@@ -185,7 +186,7 @@ describe GitlabNet, vcr: true do ...@@ -185,7 +186,7 @@ describe GitlabNet, vcr: true do
}] }]
end end
subject { gitlab_net.post_receive(gl_repository, key, changes) } subject { gitlab_net.post_receive(gl_repository, key, changes, push_opts) }
it 'sends the correct parameters' do it 'sends the correct parameters' do
expect_any_instance_of(Net::HTTP::Post).to receive(:set_form_data).with(hash_including(params)) expect_any_instance_of(Net::HTTP::Post).to receive(:set_form_data).with(hash_including(params))
......
...@@ -11,7 +11,8 @@ describe GitlabPostReceive do ...@@ -11,7 +11,8 @@ describe GitlabPostReceive do
let(:base64_changes) { Base64.encode64(wrongly_encoded_changes) } let(:base64_changes) { Base64.encode64(wrongly_encoded_changes) }
let(:repo_path) { File.join(repository_path, repo_name) + ".git" } let(:repo_path) { File.join(repository_path, repo_name) + ".git" }
let(:gl_repository) { "project-1" } let(:gl_repository) { "project-1" }
let(:gitlab_post_receive) { GitlabPostReceive.new(gl_repository, repo_path, actor, wrongly_encoded_changes) } let(:push_opts) { [] }
let(:gitlab_post_receive) { GitlabPostReceive.new(gl_repository, repo_path, actor, wrongly_encoded_changes, push_opts) }
let(:broadcast_message) { "test " * 10 + "message " * 10 } let(:broadcast_message) { "test " * 10 + "message " * 10 }
let(:enqueued_at) { Time.new(2016, 6, 23, 6, 59) } let(:enqueued_at) { Time.new(2016, 6, 23, 6, 59) }
let(:new_merge_request_urls) do let(:new_merge_request_urls) do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment