Separate Bitbucket Server Importers Logic - Part 2
-
Please check this box if this contribution uses AI-generated content (including content generated by GitLab Duo features) as outlined in the GitLab DCO & CLA
What does this MR do and why?
See full context in !149302
This is Part 2 from a series of MRs to handle issues: #451129.
-
Part 1 - Moving HTTP calls -
Part 2 - Separate Importers Logic <-- This MR -
Part 3 - Add Paging on HTTP Calls -
This MR is under feature flag development, intended to be opened after the series of MRs are completed.
-
The main changes are separating importer classes and changing the parameter from "object" style to "hash" style:
-
Merge event from
PullRequestNotesImporter
toPullRequestNotes::MergeEvent
-
Approved event from
PullRequestNotesImporter
toPullRequestNotes::ApprovedEvent
-
Inline comments from
PullRequestNotesImporter
toPullRequestNotes::Inline
-
Standalone PR comments from
PullRequestNotesImporter
toPullRequestNotes::StandaloneNotes
-
Merge event from
-
Previous changes on
PullRequestNotesImporter
are reverted in favor of the newPullRequestNoteImporter
. Which is called by a new workerGitlab::BitbucketServerImport::ImportPullRequestNoteWorker
MR acceptance checklist
Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.
Screenshots or screen recordings
Screenshots are required for UI changes, and strongly recommended for all other merge requests.
Before | After |
---|---|
MR List: | |
Approved Event: | |
Standalone Comments: | |
Inline Comments: | |
Merge Event: | |
New Importer Class: | |
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
- Initial environment setup can follow this
- Prepare some data in Bitbucket Server
- Patch the code to inject interruption:
diff --git a/gems/gitlab-http/lib/gitlab/http_v2/url_blocker.rb b/gems/gitlab-http/lib/gitlab/http_v2/url_blocker.rb
index 99876c779539..06bd0c6b92cd 100644
--- a/gems/gitlab-http/lib/gitlab/http_v2/url_blocker.rb
+++ b/gems/gitlab-http/lib/gitlab/http_v2/url_blocker.rb
@@ -64,6 +64,9 @@ def validate_url_with_proxy!(
)
# rubocop:enable Metrics/ParameterLists
+ allow_localhost = true
+ allow_local_network = true
+
return Result.new(nil, nil, true) if url.nil?
raise ArgumentError, 'The schemes is a required argument' if schemes.blank?
- Tail the log file:
tail -f log/importer.log
- Go to
http://127.0.0.1:3000/import/bitbucket_server/status
- Click Import