Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 24 insertions, 14 deletions

diff --git a/lib/gitlab/ci/variables/collection.rb b/lib/gitlab/ci/variables/collection.rb
index b6d6e1a3e5f..e9766061072 100644
--- a/lib/gitlab/ci/variables/collection.rb
+++ b/lib/gitlab/ci/variables/collection.rb
@@ -72,7 +72,8 @@ module Gitlab
           Collection.new(@variables.reject(&block))
         end
 
-        def expand_value(value, keep_undefined: false, expand_file_vars: true, project: nil)
+        # `expand_raw_refs` will be deleted with the FF `ci_raw_variables_in_yaml_config`.
+        def expand_value(value, keep_undefined: false, expand_file_refs: true, expand_raw_refs: true, project: nil)
           value.gsub(Item::VARIABLES_REGEXP) do
             match = Regexp.last_match # it is either a valid variable definition or a ($$ / %%)
             full_match = match[0]
@@ -86,19 +87,26 @@ module Gitlab
             variable = self[variable_name]
 
             if variable # VARIABLE_NAME is an existing variable
-              next variable.value unless variable.file?
-
-              # Will be cleaned up with https://gitlab.com/gitlab-org/gitlab/-/issues/378266
-              if project
-                # We only log if `project` exists to make sure it is called from `Ci::BuildRunnerPresenter`
-                # when the variables are sent to Runner.
-                Gitlab::AppJsonLogger.info(
-                  event: 'file_variable_is_referenced_in_another_variable',
-                  project_id: project.id
-                )
+              if variable.file?
+                # Will be cleaned up with https://gitlab.com/gitlab-org/gitlab/-/issues/378266
+                if project
+                  # We only log if `project` exists to make sure it is called from `Ci::BuildRunnerPresenter`
+                  # when the variables are sent to Runner.
+                  Gitlab::AppJsonLogger.info(event: 'file_variable_is_referenced_in_another_variable',
+                                             project_id: project.id,
+                                             variable: variable_name)
+                end
+
+                expand_file_refs ? variable.value : full_match
+              elsif variable.raw?
+                # With `full_match`, we defer the expansion of raw variables to the runner. If we expand them here,
+                # the runner will not know the expanded value is a raw variable and it tries to expand it again.
+                # Discussion: https://gitlab.com/gitlab-org/gitlab/-/issues/353991#note_1103274951
+                expand_raw_refs ? variable.value : full_match
+              else
+                variable.value
               end
 
-              expand_file_vars ? variable.value : full_match
             elsif keep_undefined
               full_match # we do not touch the variable definition
             else
@@ -107,7 +115,8 @@ module Gitlab
           end
         end
 
-        def sort_and_expand_all(keep_undefined: false, expand_file_vars: true, project: nil)
+        # `expand_raw_refs` will be deleted with the FF `ci_raw_variables_in_yaml_config`.
+        def sort_and_expand_all(keep_undefined: false, expand_file_refs: true, expand_raw_refs: true, project: nil)
           sorted = Sort.new(self)
           return self.class.new(self, sorted.errors) unless sorted.valid?
 
@@ -122,7 +131,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,
-                                                                             expand_file_vars: expand_file_vars,
+                                                                             expand_file_refs: expand_file_refs,
+                                                                             expand_raw_refs: expand_raw_refs,
                                                                              project: project)
             new_collection.append(variable)
           end