From 966cad99bf60f18ea0f2a2c8080829dfb5bcbd64 Mon Sep 17 00:00:00 2001
From: Rajendra Kadam <rkadam@gitlab.com>
Date: Mon, 22 Jul 2024 10:10:28 +0530
Subject: [PATCH] Remove project_ref_name_in_variables FF
Remove flag references in code
Changelog: fixed
MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/160190
---
app/services/ci/list_config_variables_service.rb | 3 +--
.../project_ref_name_in_variables.yml | 9 ---------
.../ci/list_config_variables_service_spec.rb | 15 ---------------
3 files changed, 1 insertion(+), 26 deletions(-)
delete mode 100644 config/feature_flags/gitlab_com_derisk/project_ref_name_in_variables.yml
diff --git a/app/services/ci/list_config_variables_service.rb b/app/services/ci/list_config_variables_service.rb
index 6742e31551ab4..35b59eb63b76b 100644
--- a/app/services/ci/list_config_variables_service.rb
+++ b/app/services/ci/list_config_variables_service.rb
@@ -28,8 +28,7 @@ def calculate_reactive_cache(sha)
return {} unless config.exists?
- ref_name = Gitlab::Ci::RefFinder.new(project).find_by_sha(sha) if Feature.enabled?(
- :project_ref_name_in_variables, project)
+ ref_name = Gitlab::Ci::RefFinder.new(project).find_by_sha(sha)
result = Gitlab::Ci::YamlProcessor.new(
config.content,
diff --git a/config/feature_flags/gitlab_com_derisk/project_ref_name_in_variables.yml b/config/feature_flags/gitlab_com_derisk/project_ref_name_in_variables.yml
deleted file mode 100644
index a3e4763423dc7..0000000000000
--- a/config/feature_flags/gitlab_com_derisk/project_ref_name_in_variables.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: project_ref_name_in_variables
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430786
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/155868
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/466427
-milestone: '17.2'
-group: group::pipeline authoring
-type: gitlab_com_derisk
-default_enabled: false
diff --git a/spec/services/ci/list_config_variables_service_spec.rb b/spec/services/ci/list_config_variables_service_spec.rb
index 2c3ea7d2880b4..3e04286bab802 100644
--- a/spec/services/ci/list_config_variables_service_spec.rb
+++ b/spec/services/ci/list_config_variables_service_spec.rb
@@ -213,21 +213,6 @@
expect(result['COMMON_VAR']).to eq({ value: 'include_two', description: 'Common variable' })
end
end
-
- context 'when feature flag is disabled in the project' do
- before do
- stub_feature_flags(project_ref_name_in_variables: false)
- end
-
- it 'passes nil as the ref name to YamlProcessor' do
- expect(Gitlab::Ci::YamlProcessor)
- .to receive(:new)
- .with(anything, a_hash_including(ref: nil))
- .and_call_original
-
- result
- end
- end
end
context 'when project CI config is external' do
--
GitLab