diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/api.rb | 1 | ||||
| -rw-r--r-- | lib/api/lint.rb | 38 | ||||
| -rw-r--r-- | lib/ci/api/api.rb | 1 | ||||
| -rw-r--r-- | lib/ci/api/lint.rb | 38 |
4 files changed, 39 insertions, 39 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index e14464c1b0d..a08fb056049 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -45,6 +45,7 @@ module API mount ::API::Keys mount ::API::Labels mount ::API::LicenseTemplates + mount ::API::Lint mount ::API::Members mount ::API::MergeRequests mount ::API::Milestones diff --git a/lib/api/lint.rb b/lib/api/lint.rb new file mode 100644 index 00000000000..68eabb571d6 --- /dev/null +++ b/lib/api/lint.rb @@ -0,0 +1,38 @@ +module API + class Lint < Grape::API + resource :lint do + params do + requires :content, type: String, desc: 'content of .gitlab-ci.yml' + end + + desc 'Validation of .gitlab-ci.yml content' + post do + status 200 + + begin + response = { + status: '', + errors: [], + jobs: [] + } + + 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 + status 200 + response[:errors].push(e.message) + response[:status] = 'invalid' + + response + end + end + end + end +end diff --git a/lib/ci/api/api.rb b/lib/ci/api/api.rb index 00572e6efdb..a6b9beecded 100644 --- a/lib/ci/api/api.rb +++ b/lib/ci/api/api.rb @@ -22,7 +22,6 @@ module Ci helpers Gitlab::CurrentSettings mount ::Ci::API::Builds - mount ::Ci::API::Lint mount ::Ci::API::Runners mount ::Ci::API::Triggers end diff --git a/lib/ci/api/lint.rb b/lib/ci/api/lint.rb deleted file mode 100644 index 6ea91ac34dd..00000000000 --- a/lib/ci/api/lint.rb +++ /dev/null @@ -1,38 +0,0 @@ -module Ci - module API - class Lint < Grape::API - resource :lint do - post do - status 200 - params do - requires :content, type: String, desc: 'content of .gitlab-ci.yml' - end - - begin - response = { - status: '', - errors: [], - jobs: [] - } - - 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 - status 200 - response[:errors].push(e.message) - response[:status] = 'invalid' - - response - end - end - end - end - end -end |
