Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 31 insertions, 7 deletions

diff --git a/lib/api/lint.rb b/lib/api/lint.rb
index f7796b1e969..bfd152f70b1 100644
--- a/lib/api/lint.rb
+++ b/lib/api/lint.rb
@@ -1,24 +1,48 @@
 # frozen_string_literal: true
 
 module API
-  class Lint < Grape::API::Instance
+  class Lint < ::API::Base
     namespace :ci do
       desc 'Validation of .gitlab-ci.yml content'
       params do
         requires :content, type: String, desc: 'Content of .gitlab-ci.yml'
+        optional :include_merged_yaml, type: Boolean, desc: 'Whether or not to include merged CI config yaml in the response'
       end
       post '/lint' do
-        error = Gitlab::Ci::YamlProcessor.validation_message(params[:content],
-          user: current_user)
+        result = Gitlab::Ci::YamlProcessor.new(params[:content], user: current_user).execute
+        error = result.errors.first
 
         status 200
 
-        if error.blank?
-          { status: 'valid', errors: [] }
-        else
-          { status: 'invalid', errors: [error] }
+        response = if error.blank?
+                     { status: 'valid', errors: [] }
+                   else
+                     { status: 'invalid', errors: [error] }
+                   end
+
+        response.tap do |response|
+          response[:merged_yaml] = result.merged_yaml if params[:include_merged_yaml]
         end
       end
     end
+
+    resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
+      desc 'Validation of .gitlab-ci.yml content' do
+        detail 'This feature was introduced in GitLab 13.5.'
+      end
+      params do
+        optional :dry_run, type: Boolean, default: false, desc: 'Run pipeline creation simulation, or only do static check.'
+      end
+      get ':id/ci/lint' do
+        authorize! :download_code, user_project
+
+        content = user_project.repository.gitlab_ci_yml_for(user_project.commit.id, user_project.ci_config_path_or_default)
+        result = Gitlab::Ci::Lint
+          .new(project: user_project, current_user: current_user)
+          .validate(content, dry_run: params[:dry_run])
+
+        present result, with: Entities::Ci::Lint::Result, current_user: current_user
+      end
+    end
   end
 end