Add permission methods to enqueue_build
This commit is contained in:
parent
9bd145856b
commit
2b37d90ffb
|
@ -50,21 +50,29 @@ class Travis::Api::App
|
||||||
post '/:id/restart' do
|
post '/:id/restart' do
|
||||||
Metriks.meter("api.request.restart_build").mark
|
Metriks.meter("api.request.restart_build").mark
|
||||||
|
|
||||||
service = self.service(:reset_model, build_id: params[:id])
|
if Travis::Features.owner_active?(:enqueue_to_hub, current_user)
|
||||||
if !service.accept?
|
service = Travis::Enqueue::Services::EnqueueBuild.new(current_user, params[:id])
|
||||||
status 400
|
if !service.accept?
|
||||||
result = false
|
status 400
|
||||||
else
|
result = false
|
||||||
if Travis::Features.owner_active?(:enqueue_to_hub, current_user)
|
else
|
||||||
payload = {id: params[:id], user_id: current_user.id}
|
payload = {id: params[:id], user_id: current_user.id}
|
||||||
Travis::Enqueue::Services::EnqueueBuild.push("build:restart", payload)
|
service.push("build:restart", payload)
|
||||||
|
status 202
|
||||||
|
result = true
|
||||||
|
end
|
||||||
|
else
|
||||||
|
service = self.service(:reset_model, build_id: params[:id])
|
||||||
|
if !service.accept?
|
||||||
|
status 400
|
||||||
|
result = false
|
||||||
else
|
else
|
||||||
Travis::Sidekiq::BuildRestart.perform_async(id: params[:id], user_id: current_user.id)
|
Travis::Sidekiq::BuildRestart.perform_async(id: params[:id], user_id: current_user.id)
|
||||||
|
status 202
|
||||||
|
result = true
|
||||||
end
|
end
|
||||||
|
|
||||||
status 202
|
|
||||||
result = true
|
|
||||||
end
|
end
|
||||||
|
|
||||||
respond_with(result: result, flash: service.messages)
|
respond_with(result: result, flash: service.messages)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,16 +3,47 @@ module Travis
|
||||||
module Services
|
module Services
|
||||||
|
|
||||||
class EnqueueBuild
|
class EnqueueBuild
|
||||||
|
attr_reader :current_user, :build
|
||||||
|
|
||||||
def self.push(event, payload)
|
def initialize(current_user, build_id)
|
||||||
|
@current_user = current_user
|
||||||
|
@build = Build.find(build_id)
|
||||||
|
end
|
||||||
|
|
||||||
|
def push(event, payload)
|
||||||
::Sidekiq::Client.push(
|
::Sidekiq::Client.push(
|
||||||
'queue' => 'hub',
|
'queue' => 'hub',
|
||||||
'class' => 'Travis::Hub::Sidekiq::Worker',
|
'class' => 'Travis::Hub::Sidekiq::Worker',
|
||||||
'args' => [event, payload]
|
'args' => [event, payload]
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
|
def accept?
|
||||||
|
current_user && permission? && resetable?
|
||||||
|
end
|
||||||
|
|
||||||
|
def messages
|
||||||
|
messages = []
|
||||||
|
messages << { notice: "The build was successfully restarted." } if accept?
|
||||||
|
messages << { error: 'You do not seem to have sufficient permissions.' } unless permission?
|
||||||
|
messages << { error: "This build currently can not be restarted." } unless resetable?
|
||||||
|
messages
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def permission?
|
||||||
|
current_user.permission?(required_role, repository_id: build.repository_id)
|
||||||
|
end
|
||||||
|
|
||||||
|
def resetable?
|
||||||
|
build.resetable?
|
||||||
|
end
|
||||||
|
|
||||||
|
def required_role
|
||||||
|
Travis.config.roles.reset_model
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -122,13 +122,13 @@ describe 'Builds' do
|
||||||
before { Travis::Features.activate_owner(:enqueue_to_hub, repo.owner) }
|
before { Travis::Features.activate_owner(:enqueue_to_hub, repo.owner) }
|
||||||
|
|
||||||
it 'restarts the build' do
|
it 'restarts the build' do
|
||||||
Travis::Enqueue::Services::EnqueueBuild.expects(:push).with("build:restart", {id: build.id.to_s, user_id: user.id})
|
::Sidekiq::Client.expects(:push)
|
||||||
response = post "/builds/#{build.id}/restart", {}, headers
|
response = post "/builds/#{build.id}/restart", {}, headers
|
||||||
response.status.should == 202
|
response.status.should == 202
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'sends the correct response body' do
|
it 'sends the correct response body' do
|
||||||
Travis::Enqueue::Services::EnqueueBuild.expects(:push).with("build:restart", {id: build.id.to_s, user_id: user.id})
|
::Sidekiq::Client.expects(:push)
|
||||||
response = post "/builds/#{build.id}/restart", {}, headers
|
response = post "/builds/#{build.id}/restart", {}, headers
|
||||||
body = JSON.parse(response.body)
|
body = JSON.parse(response.body)
|
||||||
body.should == {"result"=>true, "flash"=>[{"notice"=>"The build was successfully restarted."}]}
|
body.should == {"result"=>true, "flash"=>[{"notice"=>"The build was successfully restarted."}]}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user