Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

3 files changed, 32 insertions, 3 deletions

diff --git a/app/models/concerns/ci/has_variable.rb b/app/models/concerns/ci/has_variable.rb
index 3b437fbba16..77e7e5035a0 100644
--- a/app/models/concerns/ci/has_variable.rb
+++ b/app/models/concerns/ci/has_variable.rb
@@ -18,6 +18,7 @@ module Ci
 
       scope :by_key, -> (key) { where(key: key) }
       scope :order_key_asc, -> { reorder(key: :asc) }
+      scope :order_key_desc, -> { reorder(key: :desc) }
 
       attr_encrypted :value,
         mode: :per_attribute_iv_and_salt,
@@ -30,6 +31,16 @@ module Ci
       end
     end
 
+    class_methods do
+      def order_by(method)
+        case method.to_s
+        when 'key_asc' then order_key_asc
+        when 'key_desc' then order_key_desc
+        else all
+        end
+      end
+    end
+
     def to_runner_variable
       var_cache_key = to_runner_variable_cache_key
 
diff --git a/app/models/concerns/ci/maskable.rb b/app/models/concerns/ci/maskable.rb
index 62be0150ee0..e2cef0981d1 100644
--- a/app/models/concerns/ci/maskable.rb
+++ b/app/models/concerns/ci/maskable.rb
@@ -12,10 +12,28 @@ module Ci
     # * Characters must be from the Base64 alphabet (RFC4648) with the addition of '@', ':', '.', and '~'
     # * Absolutely no fun is allowed
     REGEX = %r{\A[a-zA-Z0-9_+=/@:.~-]{8,}\z}.freeze
+    # * Single line
+    # * No spaces
+    # * Minimal length of 8 characters
+    # * Some fun is allowed
+    MASK_AND_RAW_REGEX = %r{\A\S{8,}\z}.freeze
 
     included do
       validates :masked, inclusion: { in: [true, false] }
-      validates :value, format: { with: REGEX }, if: :masked?
+      validates :value, format: { with: REGEX }, if: :masked_and_expanded?
+      validates :value, format: { with: MASK_AND_RAW_REGEX }, if: :masked_and_raw?
+    end
+
+    def masked_and_raw?
+      return false unless self.class.method_defined?(:raw)
+
+      masked? && raw?
+    end
+
+    def masked_and_expanded?
+      return masked? unless self.class.method_defined?(:raw)
+
+      masked? && !raw?
     end
 
     def to_runner_variable
diff --git a/app/models/concerns/ci/metadatable.rb b/app/models/concerns/ci/metadatable.rb
index d93f4a150d5..d91f33452a0 100644
--- a/app/models/concerns/ci/metadatable.rb
+++ b/app/models/concerns/ci/metadatable.rb
@@ -22,7 +22,7 @@ module Ci
       delegate :set_cancel_gracefully, to: :metadata, prefix: false, allow_nil: false
       delegate :id_tokens, to: :metadata, allow_nil: true
 
-      before_create :ensure_metadata
+      before_validation :ensure_metadata, on: :create
     end
 
     def has_exposed_artifacts?
@@ -34,7 +34,7 @@ module Ci
     end
 
     def ensure_metadata
-      metadata || build_metadata(project: project, partition_id: partition_id)
+      metadata || build_metadata(project: project)
     end
 
     def degenerated?