From a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 16 Jun 2021 18:25:58 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-0-stable-ee

---
 .../ci/pipeline/chain/validate/after_config.rb     | 24 +++++++++++++++++++
 lib/gitlab/ci/pipeline/chain/validate/external.rb  | 28 +++++-----------------
 lib/gitlab/ci/pipeline/preloader.rb                |  8 +++++++
 lib/gitlab/ci/pipeline/seed/build.rb               |  2 +-
 4 files changed, 39 insertions(+), 23 deletions(-)
 create mode 100644 lib/gitlab/ci/pipeline/chain/validate/after_config.rb

(limited to 'lib/gitlab/ci/pipeline')

diff --git a/lib/gitlab/ci/pipeline/chain/validate/after_config.rb b/lib/gitlab/ci/pipeline/chain/validate/after_config.rb
new file mode 100644
index 00000000000..c3db00b4fb2
--- /dev/null
+++ b/lib/gitlab/ci/pipeline/chain/validate/after_config.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Ci
+    module Pipeline
+      module Chain
+        module Validate
+          class AfterConfig < Chain::Base
+            include Chain::Helpers
+
+            def perform!
+            end
+
+            def break?
+              @pipeline.errors.any?
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+Gitlab::Ci::Pipeline::Chain::Validate::AfterConfig.prepend_mod_with('Gitlab::Ci::Pipeline::Chain::Validate::AfterConfig')
diff --git a/lib/gitlab/ci/pipeline/chain/validate/external.rb b/lib/gitlab/ci/pipeline/chain/validate/external.rb
index 539b44513f0..27bb7fdc05a 100644
--- a/lib/gitlab/ci/pipeline/chain/validate/external.rb
+++ b/lib/gitlab/ci/pipeline/chain/validate/external.rb
@@ -12,12 +12,9 @@ module Gitlab
 
             DEFAULT_VALIDATION_REQUEST_TIMEOUT = 5
             ACCEPTED_STATUS = 200
-            DOT_COM_REJECTED_STATUS = 406
-            GENERAL_REJECTED_STATUS = (400..499).freeze
+            REJECTED_STATUS = 406
 
             def perform!
-              return unless enabled?
-
               pipeline_authorized = validate_external
 
               log_message = pipeline_authorized ? 'authorized' : 'not authorized'
@@ -32,24 +29,17 @@ module Gitlab
 
             private
 
-            def enabled?
-              return true unless Gitlab.com?
-
-              ::Feature.enabled?(:ci_external_validation_service, project, default_enabled: :yaml)
-            end
-
             def validate_external
               return true unless validation_service_url
 
               # 200 - accepted
-              # 406 - not accepted on GitLab.com
-              # 4XX - not accepted for other installations
+              # 406 - rejected
               # everything else - accepted and logged
               response_code = validate_service_request.code
               case response_code
               when ACCEPTED_STATUS
                 true
-              when rejected_status
+              when REJECTED_STATUS
                 false
               else
                 raise InvalidResponseCode, "Unsupported response code received from Validation Service: #{response_code}"
@@ -60,14 +50,6 @@ module Gitlab
               true
             end
 
-            def rejected_status
-              if Gitlab.com?
-                DOT_COM_REJECTED_STATUS
-              else
-                GENERAL_REJECTED_STATUS
-              end
-            end
-
             def validate_service_request
               headers = {
                 'X-Gitlab-Correlation-id' => Labkit::Correlation::CorrelationId.current_id,
@@ -107,7 +89,9 @@ module Gitlab
                   id: current_user.id,
                   username: current_user.username,
                   email: current_user.email,
-                  created_at: current_user.created_at&.iso8601
+                  created_at: current_user.created_at&.iso8601,
+                  current_sign_in_ip: current_user.current_sign_in_ip,
+                  last_sign_in_ip: current_user.last_sign_in_ip
                 },
                 pipeline: {
                   sha: pipeline.sha,
diff --git a/lib/gitlab/ci/pipeline/preloader.rb b/lib/gitlab/ci/pipeline/preloader.rb
index 7befc126ca9..31ddf2c4241 100644
--- a/lib/gitlab/ci/pipeline/preloader.rb
+++ b/lib/gitlab/ci/pipeline/preloader.rb
@@ -20,6 +20,7 @@ module Gitlab
               preloader.preload_ref_commits
               preloader.preload_pipeline_warnings
               preloader.preload_stages_warnings
+              preloader.preload_persisted_environments
             end
           end
         end
@@ -54,6 +55,13 @@ module Gitlab
         def preload_stages_warnings
           @pipeline.stages.each { |stage| stage.number_of_warnings }
         end
+
+        # This batch loads the associated environments of multiple actions (builds)
+        # that can't use `preload` due to the indirect relationship.
+        def preload_persisted_environments
+          @pipeline.scheduled_actions.each { |action| action.persisted_environment }
+          @pipeline.manual_actions.each { |action| action.persisted_environment }
+        end
       end
     end
   end
diff --git a/lib/gitlab/ci/pipeline/seed/build.rb b/lib/gitlab/ci/pipeline/seed/build.rb
index 39dee7750d6..299b27a5f13 100644
--- a/lib/gitlab/ci/pipeline/seed/build.rb
+++ b/lib/gitlab/ci/pipeline/seed/build.rb
@@ -146,7 +146,7 @@ module Gitlab
             end
 
             @needs_attributes.flat_map do |need|
-              next if ::Feature.enabled?(:ci_needs_optional, default_enabled: :yaml) && need[:optional]
+              next if need[:optional]
 
               result = @previous_stages.any? do |stage|
                 stage.seeds_names.include?(need[:name])
-- 
cgit v1.2.3