Add params requires to lint
This commit is contained in:
parent
0e4c0e7818
commit
257c2acde7
3 changed files with 35 additions and 44 deletions
|
@ -22,9 +22,9 @@ module Ci
|
|||
helpers Gitlab::CurrentSettings
|
||||
|
||||
mount ::Ci::API::Builds
|
||||
mount ::Ci::API::Lint
|
||||
mount ::Ci::API::Runners
|
||||
mount ::Ci::API::Triggers
|
||||
mount ::Ci::API::Lint
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,35 +1,35 @@
|
|||
module Ci
|
||||
module API
|
||||
class Lint < Grape::API
|
||||
before { authenticate! }
|
||||
|
||||
resources :lint do
|
||||
resource :lint do
|
||||
post do
|
||||
status 200
|
||||
params do
|
||||
requires :content, type: String, desc: 'content of .gitlab-ci.yml'
|
||||
end
|
||||
|
||||
begin
|
||||
response = {}
|
||||
@content = params[:content]
|
||||
|
||||
if @content
|
||||
@config_processor = Ci::GitlabCiYamlProcessor.new(@content)
|
||||
@stages = @config_processor.stages
|
||||
@builds = @config_processor.builds
|
||||
|
||||
response = {
|
||||
content: @content,
|
||||
status: "syntax is correct"
|
||||
status: '',
|
||||
errors: [],
|
||||
jobs: []
|
||||
}
|
||||
|
||||
@stages.each do |stage|
|
||||
response["#{stage}"] = @builds.select { |build| build[:stage] == stage }
|
||||
end
|
||||
else
|
||||
render_api_error!("Please provide content of .gitlab-ci.yml", 400)
|
||||
config_processor = Ci::GitlabCiYamlProcessor.new(params[:content])
|
||||
|
||||
config_processor.builds.each do |build|
|
||||
response[:jobs].push("#{build[:name]}")
|
||||
response[:status] = 'valid'
|
||||
end
|
||||
|
||||
response
|
||||
|
||||
rescue Ci::GitlabCiYamlProcessor::ValidationError, Psych::SyntaxError => e
|
||||
error!({ content: @content, status: "syntax is incorrect", message: e.message })
|
||||
status 200
|
||||
response[:errors].push(e.message)
|
||||
response[:status] = 'invalid'
|
||||
|
||||
response
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -9,41 +9,32 @@ describe Ci::API::API do
|
|||
end
|
||||
|
||||
describe 'POST /ci/lint' do
|
||||
context "with valid .gitlab-ci.yaml content" do
|
||||
context "authorized user" do
|
||||
it "validate content" do
|
||||
post ci_api('/lint'), { private_token: user.private_token, content: yaml_content }
|
||||
|
||||
expect(response).to have_http_status(201)
|
||||
expect(json_response).to be_an Hash
|
||||
expect(json_response['status']).to eq('syntax is correct')
|
||||
end
|
||||
end
|
||||
|
||||
context "unauthorized user" do
|
||||
it "does not validate content" do
|
||||
context 'with valid .gitlab-ci.yaml content' do
|
||||
context 'authorized user' do
|
||||
it 'validate content' do
|
||||
post ci_api('/lint'), { content: yaml_content }
|
||||
|
||||
expect(response).to have_http_status(401)
|
||||
expect(response).to have_http_status(200)
|
||||
expect(json_response).to be_an Hash
|
||||
expect(json_response['status']).to eq('valid')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "with invalid .gitlab_ci.yml content" do
|
||||
it "validate content" do
|
||||
post ci_api('/lint'), { private_token: user.private_token, content: 'invalid content' }
|
||||
context 'with invalid .gitlab_ci.yml content' do
|
||||
it 'validate content' do
|
||||
post ci_api('/lint'), { content: 'invalid content' }
|
||||
|
||||
expect(response).to have_http_status(500)
|
||||
expect(json_response['status']).to eq('syntax is incorrect')
|
||||
expect(response).to have_http_status(200)
|
||||
expect(json_response['status']).to eq('invalid')
|
||||
end
|
||||
end
|
||||
|
||||
context "no content" do
|
||||
it "shows error message" do
|
||||
post ci_api('/lint'), { private_token: user.private_token }
|
||||
context 'no content parameters' do
|
||||
it 'shows error message' do
|
||||
post ci_api('/lint')
|
||||
|
||||
expect(response).to have_http_status(400)
|
||||
expect(json_response['message']).to eq('Please provide content of .gitlab-ci.yml')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue