Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

3 files changed, 234 insertions, 24 deletions

diff --git a/spec/lib/gitlab/ci/variables/builder/pipeline_spec.rb b/spec/lib/gitlab/ci/variables/builder/pipeline_spec.rb
index a5365ae53b8..0a079a69682 100644
--- a/spec/lib/gitlab/ci/variables/builder/pipeline_spec.rb
+++ b/spec/lib/gitlab/ci/variables/builder/pipeline_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::Variables::Builder::Pipeline, feature_category: :pipeline_authoring do
+RSpec.describe Gitlab::Ci::Variables::Builder::Pipeline, feature_category: :secrets_management do
   let_it_be(:project) { create_default(:project, :repository, create_tag: 'test').freeze }
   let_it_be(:user) { create(:user) }
 
@@ -30,15 +30,13 @@ RSpec.describe Gitlab::Ci::Variables::Builder::Pipeline, feature_category: :pipe
         CI_COMMIT_REF_PROTECTED
         CI_COMMIT_TIMESTAMP
         CI_COMMIT_AUTHOR
-        CI_BUILD_REF
-        CI_BUILD_BEFORE_SHA
-        CI_BUILD_REF_NAME
-        CI_BUILD_REF_SLUG
       ])
     end
 
-    context 'when the pipeline is running for a tag' do
-      let(:pipeline) { build(:ci_empty_pipeline, :created, project: project, ref: 'test', tag: true) }
+    context 'when FF `ci_remove_legacy_predefined_variables` is disabled' do
+      before do
+        stub_feature_flags(ci_remove_legacy_predefined_variables: false)
+      end
 
       it 'includes all predefined variables in a valid order' do
         keys = subject.pluck(:key)
@@ -52,6 +50,7 @@ RSpec.describe Gitlab::Ci::Variables::Builder::Pipeline, feature_category: :pipe
           CI_COMMIT_BEFORE_SHA
           CI_COMMIT_REF_NAME
           CI_COMMIT_REF_SLUG
+          CI_COMMIT_BRANCH
           CI_COMMIT_MESSAGE
           CI_COMMIT_TITLE
           CI_COMMIT_DESCRIPTION
@@ -62,11 +61,69 @@ RSpec.describe Gitlab::Ci::Variables::Builder::Pipeline, feature_category: :pipe
           CI_BUILD_BEFORE_SHA
           CI_BUILD_REF_NAME
           CI_BUILD_REF_SLUG
+        ])
+      end
+    end
+
+    context 'when the pipeline is running for a tag' do
+      let(:pipeline) { build(:ci_empty_pipeline, :created, project: project, ref: 'test', tag: true) }
+
+      it 'includes all predefined variables in a valid order' do
+        keys = subject.pluck(:key)
+
+        expect(keys).to contain_exactly(*%w[
+          CI_PIPELINE_IID
+          CI_PIPELINE_SOURCE
+          CI_PIPELINE_CREATED_AT
+          CI_COMMIT_SHA
+          CI_COMMIT_SHORT_SHA
+          CI_COMMIT_BEFORE_SHA
+          CI_COMMIT_REF_NAME
+          CI_COMMIT_REF_SLUG
+          CI_COMMIT_MESSAGE
+          CI_COMMIT_TITLE
+          CI_COMMIT_DESCRIPTION
+          CI_COMMIT_REF_PROTECTED
+          CI_COMMIT_TIMESTAMP
+          CI_COMMIT_AUTHOR
           CI_COMMIT_TAG
           CI_COMMIT_TAG_MESSAGE
-          CI_BUILD_TAG
         ])
       end
+
+      context 'when FF `ci_remove_legacy_predefined_variables` is disabled' do
+        before do
+          stub_feature_flags(ci_remove_legacy_predefined_variables: false)
+        end
+
+        it 'includes all predefined variables in a valid order' do
+          keys = subject.pluck(:key)
+
+          expect(keys).to contain_exactly(*%w[
+            CI_PIPELINE_IID
+            CI_PIPELINE_SOURCE
+            CI_PIPELINE_CREATED_AT
+            CI_COMMIT_SHA
+            CI_COMMIT_SHORT_SHA
+            CI_COMMIT_BEFORE_SHA
+            CI_COMMIT_REF_NAME
+            CI_COMMIT_REF_SLUG
+            CI_COMMIT_MESSAGE
+            CI_COMMIT_TITLE
+            CI_COMMIT_DESCRIPTION
+            CI_COMMIT_REF_PROTECTED
+            CI_COMMIT_TIMESTAMP
+            CI_COMMIT_AUTHOR
+            CI_BUILD_REF
+            CI_BUILD_BEFORE_SHA
+            CI_BUILD_REF_NAME
+            CI_BUILD_REF_SLUG
+            CI_COMMIT_TAG
+            CI_COMMIT_TAG_MESSAGE
+            CI_BUILD_TAG
+          ])
+        end
+      end
     end
 
     context 'when merge request is present' do
@@ -305,10 +362,24 @@ RSpec.describe Gitlab::Ci::Variables::Builder::Pipeline, feature_category: :pipe
         expect(subject.to_hash.keys)
           .not_to include(
             'CI_COMMIT_TAG',
-            'CI_COMMIT_TAG_MESSAGE',
-            'CI_BUILD_TAG'
+            'CI_COMMIT_TAG_MESSAGE'
           )
       end
+
+      context 'when FF `ci_remove_legacy_predefined_variables` is disabled' do
+        before do
+          stub_feature_flags(ci_remove_legacy_predefined_variables: false)
+        end
+
+        it 'does not expose tag variables' do
+          expect(subject.to_hash.keys)
+            .not_to include(
+              'CI_COMMIT_TAG',
+              'CI_COMMIT_TAG_MESSAGE',
+              'CI_BUILD_TAG'
+            )
+        end
+      end
     end
 
     context 'without a commit' do
diff --git a/spec/lib/gitlab/ci/variables/builder_spec.rb b/spec/lib/gitlab/ci/variables/builder_spec.rb
index bbd3dc54e6a..10974993fa4 100644
--- a/spec/lib/gitlab/ci/variables/builder_spec.rb
+++ b/spec/lib/gitlab/ci/variables/builder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::Variables::Builder, :clean_gitlab_redis_cache, feature_category: :pipeline_authoring do
+RSpec.describe Gitlab::Ci::Variables::Builder, :clean_gitlab_redis_cache, feature_category: :secrets_management do
   include Ci::TemplateHelpers
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, :repository, namespace: group) }
@@ -35,10 +35,6 @@ RSpec.describe Gitlab::Ci::Variables::Builder, :clean_gitlab_redis_cache, featur
           value: '1' },
         { key: 'CI_ENVIRONMENT_NAME',
           value: 'test' },
-        { key: 'CI_BUILD_NAME',
-          value: 'rspec:test 1' },
-        { key: 'CI_BUILD_STAGE',
-          value: job.stage_name },
         { key: 'CI',
           value: 'true' },
         { key: 'GITLAB_CI',
@@ -51,6 +47,10 @@ RSpec.describe Gitlab::Ci::Variables::Builder, :clean_gitlab_redis_cache, featur
           value: Gitlab.config.gitlab.port.to_s },
         { key: 'CI_SERVER_PROTOCOL',
           value: Gitlab.config.gitlab.protocol },
+        { key: 'CI_SERVER_SHELL_SSH_HOST',
+          value: Gitlab.config.gitlab_shell.ssh_host.to_s },
+        { key: 'CI_SERVER_SHELL_SSH_PORT',
+          value: Gitlab.config.gitlab_shell.ssh_port.to_s },
         { key: 'CI_SERVER_NAME',
           value: 'GitLab' },
         { key: 'CI_SERVER_VERSION',
@@ -101,6 +101,8 @@ RSpec.describe Gitlab::Ci::Variables::Builder, :clean_gitlab_redis_cache, featur
           value: project.pages_url },
         { key: 'CI_API_V4_URL',
           value: API::Helpers::Version.new('v4').root_url },
+        { key: 'CI_API_GRAPHQL_URL',
+          value: Gitlab::Routing.url_helpers.api_graphql_url },
         { key: 'CI_TEMPLATE_REGISTRY_HOST',
           value: template_registry_host },
         { key: 'CI_PIPELINE_IID',
@@ -133,14 +135,6 @@ RSpec.describe Gitlab::Ci::Variables::Builder, :clean_gitlab_redis_cache, featur
           value: pipeline.git_commit_timestamp },
         { key: 'CI_COMMIT_AUTHOR',
           value: pipeline.git_author_full_text },
-        { key: 'CI_BUILD_REF',
-          value: job.sha },
-        { key: 'CI_BUILD_BEFORE_SHA',
-          value: job.before_sha },
-        { key: 'CI_BUILD_REF_NAME',
-          value: job.ref },
-        { key: 'CI_BUILD_REF_SLUG',
-          value: job.ref_slug },
         { key: 'YAML_VARIABLE',
           value: 'value' },
         { key: 'GITLAB_USER_ID',
@@ -160,6 +154,151 @@ RSpec.describe Gitlab::Ci::Variables::Builder, :clean_gitlab_redis_cache, featur
 
     it { expect(subject.to_runner_variables).to eq(predefined_variables) }
 
+    context 'when FF `ci_remove_legacy_predefined_variables` is disabled' do
+      before do
+        stub_feature_flags(ci_remove_legacy_predefined_variables: false)
+      end
+
+      let(:predefined_variables) do
+        [
+          { key: 'CI_JOB_NAME',
+            value: 'rspec:test 1' },
+          { key: 'CI_JOB_NAME_SLUG',
+            value: 'rspec-test-1' },
+          { key: 'CI_JOB_STAGE',
+            value: job.stage_name },
+          { key: 'CI_NODE_TOTAL',
+            value: '1' },
+          { key: 'CI_ENVIRONMENT_NAME',
+            value: 'test' },
+          { key: 'CI_BUILD_NAME',
+            value: 'rspec:test 1' },
+          { key: 'CI_BUILD_STAGE',
+            value: job.stage_name },
+          { key: 'CI',
+            value: 'true' },
+          { key: 'GITLAB_CI',
+            value: 'true' },
+          { key: 'CI_SERVER_URL',
+            value: Gitlab.config.gitlab.url },
+          { key: 'CI_SERVER_HOST',
+            value: Gitlab.config.gitlab.host },
+          { key: 'CI_SERVER_PORT',
+            value: Gitlab.config.gitlab.port.to_s },
+          { key: 'CI_SERVER_PROTOCOL',
+            value: Gitlab.config.gitlab.protocol },
+          { key: 'CI_SERVER_SHELL_SSH_HOST',
+            value: Gitlab.config.gitlab_shell.ssh_host.to_s },
+          { key: 'CI_SERVER_SHELL_SSH_PORT',
+            value: Gitlab.config.gitlab_shell.ssh_port.to_s },
+          { key: 'CI_SERVER_NAME',
+            value: 'GitLab' },
+          { key: 'CI_SERVER_VERSION',
+            value: Gitlab::VERSION },
+          { key: 'CI_SERVER_VERSION_MAJOR',
+            value: Gitlab.version_info.major.to_s },
+          { key: 'CI_SERVER_VERSION_MINOR',
+            value: Gitlab.version_info.minor.to_s },
+          { key: 'CI_SERVER_VERSION_PATCH',
+            value: Gitlab.version_info.patch.to_s },
+          { key: 'CI_SERVER_REVISION',
+            value: Gitlab.revision },
+          { key: 'GITLAB_FEATURES',
+            value: project.licensed_features.join(',') },
+          { key: 'CI_PROJECT_ID',
+            value: project.id.to_s },
+          { key: 'CI_PROJECT_NAME',
+            value: project.path },
+          { key: 'CI_PROJECT_TITLE',
+            value: project.title },
+          { key: 'CI_PROJECT_DESCRIPTION',
+            value: project.description },
+          { key: 'CI_PROJECT_PATH',
+            value: project.full_path },
+          { key: 'CI_PROJECT_PATH_SLUG',
+            value: project.full_path_slug },
+          { key: 'CI_PROJECT_NAMESPACE',
+            value: project.namespace.full_path },
+          { key: 'CI_PROJECT_NAMESPACE_ID',
+            value: project.namespace.id.to_s },
+          { key: 'CI_PROJECT_ROOT_NAMESPACE',
+            value: project.namespace.root_ancestor.path },
+          { key: 'CI_PROJECT_URL',
+            value: project.web_url },
+          { key: 'CI_PROJECT_VISIBILITY',
+            value: "private" },
+          { key: 'CI_PROJECT_REPOSITORY_LANGUAGES',
+            value: project.repository_languages.map(&:name).join(',').downcase },
+          { key: 'CI_PROJECT_CLASSIFICATION_LABEL',
+            value: project.external_authorization_classification_label },
+          { key: 'CI_DEFAULT_BRANCH',
+            value: project.default_branch },
+          { key: 'CI_CONFIG_PATH',
+            value: project.ci_config_path_or_default },
+          { key: 'CI_PAGES_DOMAIN',
+            value: Gitlab.config.pages.host },
+          { key: 'CI_PAGES_URL',
+            value: project.pages_url },
+          { key: 'CI_API_V4_URL',
+            value: API::Helpers::Version.new('v4').root_url },
+          { key: 'CI_API_GRAPHQL_URL',
+            value: Gitlab::Routing.url_helpers.api_graphql_url },
+          { key: 'CI_TEMPLATE_REGISTRY_HOST',
+            value: template_registry_host },
+          { key: 'CI_PIPELINE_IID',
+            value: pipeline.iid.to_s },
+          { key: 'CI_PIPELINE_SOURCE',
+            value: pipeline.source },
+          { key: 'CI_PIPELINE_CREATED_AT',
+            value: pipeline.created_at.iso8601 },
+          { key: 'CI_COMMIT_SHA',
+            value: job.sha },
+          { key: 'CI_COMMIT_SHORT_SHA',
+            value: job.short_sha },
+          { key: 'CI_COMMIT_BEFORE_SHA',
+            value: job.before_sha },
+          { key: 'CI_COMMIT_REF_NAME',
+            value: job.ref },
+          { key: 'CI_COMMIT_REF_SLUG',
+            value: job.ref_slug },
+          { key: 'CI_COMMIT_BRANCH',
+            value: job.ref },
+          { key: 'CI_COMMIT_MESSAGE',
+            value: pipeline.git_commit_message },
+          { key: 'CI_COMMIT_TITLE',
+            value: pipeline.git_commit_title },
+          { key: 'CI_COMMIT_DESCRIPTION',
+            value: pipeline.git_commit_description },
+          { key: 'CI_COMMIT_REF_PROTECTED',
+            value: (!!pipeline.protected_ref?).to_s },
+          { key: 'CI_COMMIT_TIMESTAMP',
+            value: pipeline.git_commit_timestamp },
+          { key: 'CI_COMMIT_AUTHOR',
+            value: pipeline.git_author_full_text },
+          { key: 'CI_BUILD_REF',
+            value: job.sha },
+          { key: 'CI_BUILD_BEFORE_SHA',
+            value: job.before_sha },
+          { key: 'CI_BUILD_REF_NAME',
+            value: job.ref },
+          { key: 'CI_BUILD_REF_SLUG',
+            value: job.ref_slug },
+          { key: 'YAML_VARIABLE',
+            value: 'value' },
+          { key: 'GITLAB_USER_ID',
+            value: user.id.to_s },
+          { key: 'GITLAB_USER_EMAIL',
+            value: user.email },
+          { key: 'GITLAB_USER_LOGIN',
+            value: user.username },
+          { key: 'GITLAB_USER_NAME',
+            value: user.name }
+        ].map { |var| var.merge(public: true, masked: false) }
+      end
+
+      it { expect(subject.to_runner_variables).to eq(predefined_variables) }
+    end
+
     context 'variables ordering' do
       def var(name, value)
         { key: name, value: value.to_s, public: true, masked: false }
diff --git a/spec/lib/gitlab/ci/variables/collection_spec.rb b/spec/lib/gitlab/ci/variables/collection_spec.rb
index 4ee122cc607..181e37de9b9 100644
--- a/spec/lib/gitlab/ci/variables/collection_spec.rb
+++ b/spec/lib/gitlab/ci/variables/collection_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::Variables::Collection, feature_category: :pipeline_authoring do
+RSpec.describe Gitlab::Ci::Variables::Collection, feature_category: :secrets_management do
   describe '.new' do
     it 'can be initialized with an array' do
       variable = { key: 'VAR', value: 'value', public: true, masked: false }