Add latest changes from gitlab-org/gitlab@master

1 files changed, 34 insertions, 0 deletions

diff --git a/lib/gitlab/template/gitlab_ci_yml_template.rb b/lib/gitlab/template/gitlab_ci_yml_template.rb
index e1ca4b5ff6a..bf5c66ab054 100644
--- a/lib/gitlab/template/gitlab_ci_yml_template.rb
+++ b/lib/gitlab/template/gitlab_ci_yml_template.rb
@@ -5,11 +5,20 @@ module Gitlab
     class GitlabCiYmlTemplate < BaseTemplate
       BASE_EXCLUDED_PATTERNS = [%r{\.latest\.}].freeze
 
+      TEMPLATES_WITH_LATEST_VERSION = {
+        'Jobs/Deploy' => true,
+        'Jobs/Browser-Performance-Testing' => true,
+        'Security/API-Fuzzing' => true,
+        'Security/DAST' => true,
+        'Terraform' => true
+      }.freeze
+
       def description
         "# This file is a template, and might need editing before it works on your project."
       end
 
       class << self
+        extend ::Gitlab::Utils::Override
         include Gitlab::Utils::StrongMemoize
 
         def extension
@@ -54,6 +63,31 @@ module Gitlab
             excluded_patterns: self.excluded_patterns
           )
         end
+
+        override :find
+        def find(key, project = nil)
+          if try_redirect_to_latest?(key, project)
+            key += '.latest'
+          end
+
+          super(key, project)
+        end
+
+        private
+
+        # To gauge the impact of the latest template,
+        # you can redirect the stable template to the latest template by enabling the feature flag.
+        # See https://docs.gitlab.com/ee/development/cicd/templates.html#versioning for more information.
+        def try_redirect_to_latest?(key, project)
+          return false unless templates_with_latest_version[key]
+
+          flag_name = "redirect_to_latest_template_#{key.underscore.tr('/', '_')}"
+          ::Feature.enabled?(flag_name, project, default_enabled: :yaml)
+        end
+
+        def templates_with_latest_version
+          TEMPLATES_WITH_LATEST_VERSION
+        end
       end
     end
   end