Commit e25f26e5 authored by Tomasz Maczukin's avatar Tomasz Maczukin

Rename API::Ci to API::Runner

parent 22c983d7
...@@ -52,7 +52,6 @@ module API ...@@ -52,7 +52,6 @@ module API
mount ::API::Branches mount ::API::Branches
mount ::API::BroadcastMessages mount ::API::BroadcastMessages
mount ::API::Builds mount ::API::Builds
mount ::API::Ci
mount ::API::Commits mount ::API::Commits
mount ::API::CommitStatuses mount ::API::CommitStatuses
mount ::API::DeployKeys mount ::API::DeployKeys
...@@ -77,6 +76,7 @@ module API ...@@ -77,6 +76,7 @@ module API
mount ::API::Projects mount ::API::Projects
mount ::API::ProjectSnippets mount ::API::ProjectSnippets
mount ::API::Repositories mount ::API::Repositories
mount ::API::Runner
mount ::API::Runners mount ::API::Runners
mount ::API::Services mount ::API::Services
mount ::API::Session mount ::API::Session
......
module API module API
module Helpers module Helpers
module Ci module Runner
def runner_registration_token_valid? def runner_registration_token_valid?
ActiveSupport::SecurityUtils.variable_size_secure_compare(params[:token], ActiveSupport::SecurityUtils.variable_size_secure_compare(params[:token],
current_application_settings.runners_registration_token) current_application_settings.runners_registration_token)
......
module API module API
class Ci < Grape::API class Runner < Grape::API
helpers ::API::Helpers::Ci helpers ::API::Helpers::Runner
resource :runners do resource :runners do
desc 'Registers a new Runner' do desc 'Registers a new Runner' do
...@@ -21,7 +21,7 @@ module API ...@@ -21,7 +21,7 @@ module API
runner = runner =
if runner_registration_token_valid? if runner_registration_token_valid?
# Create shared runner. Requires admin access # Create shared runner. Requires admin access
::Ci::Runner.create(attributes.merge(is_shared: true)) Ci::Runner.create(attributes.merge(is_shared: true))
elsif project = Project.find_by(runners_token: params[:token]) elsif project = Project.find_by(runners_token: params[:token])
# Create a specific runner for project. # Create a specific runner for project.
project.runners.create(attributes) project.runners.create(attributes)
...@@ -45,7 +45,7 @@ module API ...@@ -45,7 +45,7 @@ module API
end end
delete '/' do delete '/' do
authenticate_runner! authenticate_runner!
::Ci::Runner.find_by_token(params[:token]).destroy Ci::Runner.find_by_token(params[:token]).destroy
end end
end end
end end
......
require 'spec_helper' require 'spec_helper'
describe API::Ci do describe API::Runner do
include ApiHelpers include ApiHelpers
include StubGitlabCalls include StubGitlabCalls
......
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