Commit bff14ced authored by Robert Schilling's avatar Robert Schilling

Simplyfy variables validation in triggers API

parent c5b29ed6
...@@ -21,16 +21,11 @@ module API ...@@ -21,16 +21,11 @@ module API
unauthorized! unless trigger.project == project unauthorized! unless trigger.project == project
# validate variables # validate variables
variables = params[:variables] variables = params[:variables].to_h
if variables
unless variables.all? { |key, value| key.is_a?(String) && value.is_a?(String) } unless variables.all? { |key, value| key.is_a?(String) && value.is_a?(String) }
render_api_error!('variables needs to be a map of key-valued strings', 400) render_api_error!('variables needs to be a map of key-valued strings', 400)
end end
# convert variables from Mash to Hash
variables = variables.to_h
end
# create request and trigger builds # create request and trigger builds
trigger_request = Ci::CreateTriggerRequestService.new.execute(project, trigger, params[:ref].to_s, variables) trigger_request = Ci::CreateTriggerRequestService.new.execute(project, trigger, params[:ref].to_s, variables)
if trigger_request if trigger_request
......
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