From bb7260bc9ee7a5712daea06d4af8a21f006cf3e3 Mon Sep 17 00:00:00 2001 From: Ana Rosas Date: Tue, 14 Jun 2016 16:46:29 +0200 Subject: [PATCH] Enqueue restart message on build restart v3 endpoint --- lib/travis/api/v3/queries/build.rb | 10 +- spec/v3/services/build/restart_spec.rb | 128 +++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 2 deletions(-) diff --git a/lib/travis/api/v3/queries/build.rb b/lib/travis/api/v3/queries/build.rb index efa90e6f..f9926f75 100644 --- a/lib/travis/api/v3/queries/build.rb +++ b/lib/travis/api/v3/queries/build.rb @@ -25,8 +25,14 @@ module Travis::API::V3 def restart(user) raise BuildAlreadyRunning if %w(received queued started).include? find.state - payload = { id: id, user_id: user.id, source: 'api' } - perform_async(:build_restart, payload) + if Travis::Features.owner_active?(:enqueue_to_hub, user) + service = Travis::Enqueue::Services::RestartModel.new(user, { build_id: id }) + payload = { id: id, user_id: user.id } + service.push("build:restart", payload) + else + payload = { id: id, user_id: user.id, source: 'api' } + perform_async(:build_restart, payload) + end payload end end diff --git a/spec/v3/services/build/restart_spec.rb b/spec/v3/services/build/restart_spec.rb index 121c9f9b..048f2307 100644 --- a/spec/v3/services/build/restart_spec.rb +++ b/spec/v3/services/build/restart_spec.rb @@ -8,6 +8,7 @@ describe Travis::API::V3::Services::Build::Restart do before do Travis::Features.stubs(:owner_active?).returns(true) + Travis::Features.stubs(:owner_active?).with(:enqueue_to_hub, repo.owner).returns(false) @original_sidekiq = Sidekiq::Client Sidekiq.send(:remove_const, :Client) # to avoid a warning Sidekiq::Client = [] @@ -245,6 +246,133 @@ describe Travis::API::V3::Services::Build::Restart do end end + describe "existing repository, push access, build not already running, enqueues message for Hub" do + let(:params) {{}} + let(:token) { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) } + let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}" }} + before do + Travis::API::V3::Models::Permission.create(repository: repo, user: repo.owner, push: true) + Travis::Features.stubs(:owner_active?).with(:enqueue_to_hub, repo.owner).returns(true) + end + + describe "errored state" do + before do + build.update_attribute(:state, "errored") + post("/v3/build/#{build.id}/restart", params, headers) + end + + example { expect(last_response.status).to be == 202 } + example { expect(JSON.load(body).to_s).to include( + "@type", + "pending", + "build", + "@href", + "@representation", + "minimal", + "restart", + "id", + "state_change") + } + + example { expect(sidekiq_payload).to be == { + "id" => "#{build.id}", + "user_id"=> repo.owner_id} + } + + example { expect(Sidekiq::Client.last['queue']).to be == 'hub' } + example { expect(Sidekiq::Client.last['class']).to be == 'Travis::Hub::Sidekiq::Worker' } + end + + describe "passed state" do + before { build.update_attribute(:state, "passed") } + before { post("/v3/build/#{build.id}/restart", params, headers) } + + example { expect(last_response.status).to be == 202 } + example { expect(JSON.load(body).to_s).to include( + "@type", + "pending", + "build", + "@href", + "@representation", + "minimal", + "restart", + "id", + "state_change") + } + + example { expect(sidekiq_payload).to be == { + "id" => "#{build.id}", + "user_id"=> repo.owner_id} + } + + example { expect(Sidekiq::Client.last['queue']).to be == 'hub' } + example { expect(Sidekiq::Client.last['class']).to be == 'Travis::Hub::Sidekiq::Worker' } + end + + describe "failed state" do + before { build.update_attribute(:state, "failed") } + before { post("/v3/build/#{build.id}/restart", params, headers) } + + example { expect(last_response.status).to be == 202 } + example { expect(JSON.load(body).to_s).to include( + "@type", + "pending", + "build", + "@href", + "@representation", + "minimal", + "restart", + "id", + "state_change") + } + + example { expect(sidekiq_payload).to be == { + "id" => "#{build.id}", + "user_id"=> repo.owner_id} + } + + example { expect(Sidekiq::Client.last['queue']).to be == 'hub' } + example { expect(Sidekiq::Client.last['class']).to be == 'Travis::Hub::Sidekiq::Worker' } + end + + describe "canceled state" do + before { build.update_attribute(:state, "canceled") } + before { post("/v3/build/#{build.id}/restart", params, headers) } + + example { expect(last_response.status).to be == 202 } + example { expect(JSON.load(body).to_s).to include( + "@type", + "pending", + "build", + "@href", + "@representation", + "minimal", + "restart", + "id", + "state_change") + } + + example { expect(sidekiq_payload).to be == { + "id" => "#{build.id}", + "user_id"=> repo.owner_id} + } + + example { expect(Sidekiq::Client.last['queue']).to be == 'hub' } + example { expect(Sidekiq::Client.last['class']).to be == 'Travis::Hub::Sidekiq::Worker' } + end + + describe "setting id has no effect" do + before { build.update_attribute(:state, "canceled") } + before { post("/v3/build/#{build.id}/restart", params, headers) } + let(:params) {{ id: 42 }} + + example { expect(sidekiq_payload).to be == { + "id" => "#{build.id}", + "user_id"=> repo.owner_id} + } + end + end + # TODO decided to discuss further with rkh as this use case doesn't really exist at the moment # and 'fixing' the query requires modifying workers that v2 uses, thereby running the risk of breaking v2, # and also because in 6 months or so travis-hub will be able to cancel builds without using travis-core at all.