diff --git a/app/models/bulk_imports/entity.rb b/app/models/bulk_imports/entity.rb index 437118c36e844282c071af08ec58614d131f56c1..da620c85676b0e2e2093cf310155821e8bb8ef88 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 44759916f99cc1a24bc3f3fb38cb3cb4448f821c..1b2183e96b4b53c82c86d79e7c3c808086794279 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 4afb715b1ee0589acef5f394ba70c57b65e12fd1..0000000000000000000000000000000000000000 --- 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 3e98ba0973e8b003a15d452a7411fa9a6bb0a0b3..90b462ea5151521dabe691377d61381c64fe3f79 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 0acc44c5cbffad30c346518bb76cbcecb2fd56c9..7be25261cdc49481e43fbb607a67f38d0fbcdf50 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