From 199902dcbe2323e9ba4665f28404e00733d13cb4 Mon Sep 17 00:00:00 2001
From: Bojan Marjanovic <bmarjanovic@gitlab.com>
Date: Mon, 2 Oct 2023 19:26:19 +0000
Subject: [PATCH] Remove FF bulk_imports_batched_import_export
This feature flag was introduced in 16.2 and is now being removed.
Changelog: other
---
app/models/bulk_imports/entity.rb | 6 +++---
app/workers/bulk_imports/export_request_worker.rb | 2 +-
.../bulk_imports_batched_import_export.yml | 8 --------
spec/models/bulk_imports/entity_spec.rb | 4 ++--
.../bulk_imports/export_request_worker_spec.rb | 14 --------------
5 files changed, 6 insertions(+), 28 deletions(-)
delete mode 100644 config/feature_flags/development/bulk_imports_batched_import_export.yml
diff --git a/app/models/bulk_imports/entity.rb b/app/models/bulk_imports/entity.rb
index 437118c36e844..da620c85676b0 100644
--- a/app/models/bulk_imports/entity.rb
+++ b/app/models/bulk_imports/entity.rb
@@ -144,9 +144,9 @@ def export_relations_url_path_base
File.join(base_resource_path, 'export_relations')
end
- def export_relations_url_path(batched: false)
- if batched && bulk_import.supports_batched_export?
- Gitlab::Utils.add_url_parameters(export_relations_url_path_base, batched: batched)
+ def export_relations_url_path
+ if bulk_import.supports_batched_export?
+ Gitlab::Utils.add_url_parameters(export_relations_url_path_base, batched: true)
else
export_relations_url_path_base
end
diff --git a/app/workers/bulk_imports/export_request_worker.rb b/app/workers/bulk_imports/export_request_worker.rb
index 44759916f99cc..1b2183e96b4b5 100644
--- a/app/workers/bulk_imports/export_request_worker.rb
+++ b/app/workers/bulk_imports/export_request_worker.rb
@@ -125,7 +125,7 @@ def log_and_fail(exception)
end
def export_url
- entity.export_relations_url_path(batched: Feature.enabled?(:bulk_imports_batched_import_export))
+ entity.export_relations_url_path
end
end
end
diff --git a/config/feature_flags/development/bulk_imports_batched_import_export.yml b/config/feature_flags/development/bulk_imports_batched_import_export.yml
deleted file mode 100644
index 4afb715b1ee05..0000000000000
--- a/config/feature_flags/development/bulk_imports_batched_import_export.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: bulk_imports_batched_import_export
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124434
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406559
-milestone: '16.2'
-type: development
-group: group::import and integrate
-default_enabled: false
diff --git a/spec/models/bulk_imports/entity_spec.rb b/spec/models/bulk_imports/entity_spec.rb
index 3e98ba0973e8b..90b462ea51515 100644
--- a/spec/models/bulk_imports/entity_spec.rb
+++ b/spec/models/bulk_imports/entity_spec.rb
@@ -271,7 +271,7 @@
import = build(:bulk_import, source_version: '16.2.0')
entity = build(:bulk_import_entity, :project_entity, bulk_import: import)
- expect(entity.export_relations_url_path(batched: true))
+ expect(entity.export_relations_url_path)
.to eq("/projects/#{entity.source_xid}/export_relations?batched=true")
end
end
@@ -280,7 +280,7 @@
it 'returns export relations url' do
entity = build(:bulk_import_entity)
- expect(entity.export_relations_url_path(batched: true))
+ expect(entity.export_relations_url_path)
.to eq("/groups/#{entity.source_xid}/export_relations")
end
end
diff --git a/spec/workers/bulk_imports/export_request_worker_spec.rb b/spec/workers/bulk_imports/export_request_worker_spec.rb
index 0acc44c5cbffa..7be25261cdc49 100644
--- a/spec/workers/bulk_imports/export_request_worker_spec.rb
+++ b/spec/workers/bulk_imports/export_request_worker_spec.rb
@@ -127,20 +127,6 @@
described_class.new.perform(entity.id)
end
-
- context 'when bulk_imports_batched_import_export feature flag is disabled' do
- it 'requests relation export without batched param' do
- stub_feature_flags(bulk_imports_batched_import_export: false)
-
- expected_url = "/projects/#{entity.source_xid}/export_relations"
-
- expect_next_instance_of(BulkImports::Clients::HTTP) do |client|
- expect(client).to receive(:post).with(expected_url)
- end
-
- described_class.new.perform(entity.id)
- end
- end
end
end
--
GitLab