Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

3 files changed, 39 insertions, 28 deletions

diff --git a/lib/gitlab/ci/variables/collection.rb b/lib/gitlab/ci/variables/collection.rb
index a00c1da97ea..52673d03e69 100644
--- a/lib/gitlab/ci/variables/collection.rb
+++ b/lib/gitlab/ci/variables/collection.rb
@@ -72,24 +72,32 @@ module Gitlab
           Collection.new(@variables.reject(&block))
         end
 
-        def expand_value(value, keep_undefined: false)
+        def expand_value(value, keep_undefined: false, expand_file_vars: true)
           value.gsub(Item::VARIABLES_REGEXP) do
-            match = Regexp.last_match
-            if match[:key]
-              # we matched variable
-              if variable = self[match[:key]]
-                variable.value
-              elsif keep_undefined
-                match[0]
-              end
+            match = Regexp.last_match # it is either a valid variable definition or a ($$ / %%)
+            full_match = match[0]
+            variable_name = match[:key]
+
+            next full_match unless variable_name # it is a ($$ / %%), so we don't touch it
+
+            # now we know that it is a valid variable definition: $VARIABLE_NAME / %VARIABLE_NAME / ${VARIABLE_NAME}
+
+            # we are trying to find a variable with key VARIABLE_NAME
+            variable = self[variable_name]
+
+            if variable # VARIABLE_NAME is an existing variable
+              next variable.value unless variable.file?
+
+              expand_file_vars ? variable.value : full_match
+            elsif keep_undefined
+              full_match # we do not touch the variable definition
             else
-              # we escape sequence
-              match[0]
+              nil # we remove the variable definition
             end
           end
         end
 
-        def sort_and_expand_all(keep_undefined: false)
+        def sort_and_expand_all(keep_undefined: false, expand_file_vars: true)
           sorted = Sort.new(self)
           return self.class.new(self, sorted.errors) unless sorted.valid?
 
@@ -103,7 +111,8 @@ module Gitlab
 
             # expand variables as they are added
             variable = item.to_runner_variable
-            variable[:value] = new_collection.expand_value(variable[:value], keep_undefined: keep_undefined)
+            variable[:value] = new_collection.expand_value(variable[:value], keep_undefined: keep_undefined,
+                                                                             expand_file_vars: expand_file_vars)
             new_collection.append(variable)
           end
 
diff --git a/lib/gitlab/ci/variables/collection/item.rb b/lib/gitlab/ci/variables/collection/item.rb
index 0217e6129ca..ea2aa8f2db8 100644
--- a/lib/gitlab/ci/variables/collection/item.rb
+++ b/lib/gitlab/ci/variables/collection/item.rb
@@ -25,6 +25,10 @@ module Gitlab
             @variable.fetch(:raw)
           end
 
+          def file?
+            @variable.fetch(:file)
+          end
+
           def [](key)
             @variable.fetch(key)
           end
diff --git a/lib/gitlab/ci/variables/helpers.rb b/lib/gitlab/ci/variables/helpers.rb
index 3a62f01e2e3..300b2708e6d 100644
--- a/lib/gitlab/ci/variables/helpers.rb
+++ b/lib/gitlab/ci/variables/helpers.rb
@@ -6,24 +6,22 @@ module Gitlab
       module Helpers
         class << self
           def merge_variables(current_vars, new_vars)
-            current_vars = transform_from_yaml_variables(current_vars)
-            new_vars = transform_from_yaml_variables(new_vars)
+            return current_vars if new_vars.blank?
 
-            transform_to_yaml_variables(
-              current_vars.merge(new_vars)
-            )
-          end
+            current_vars = transform_to_array(current_vars) if current_vars.is_a?(Hash)
+            new_vars = transform_to_array(new_vars) if new_vars.is_a?(Hash)
 
-          def transform_to_yaml_variables(vars)
-            vars.to_h.map do |key, value|
-              { key: key.to_s, value: value, public: true }
-            end
+            (new_vars + current_vars).uniq { |var| var[:key] }
           end
 
-          def transform_from_yaml_variables(vars)
-            return vars.stringify_keys if vars.is_a?(Hash)
-
-            vars.to_a.to_h { |var| [var[:key].to_s, var[:value]] }
+          def transform_to_array(vars)
+            vars.to_h.map do |key, data|
+              if data.is_a?(Hash)
+                { key: key.to_s, **data.except(:key) }
+              else
+                { key: key.to_s, value: data }
+              end
+            end
           end
 
           def inherit_yaml_variables(from:, to:, inheritance:)
@@ -35,7 +33,7 @@ module Gitlab
           def apply_inheritance(variables, inheritance)
             case inheritance
             when true then variables
-            when false then {}
+            when false then []
             when Array then variables.select { |var| inheritance.include?(var[:key]) }
             end
           end