diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2019-07-23 11:48:33 +0000 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-07-23 11:48:33 +0000 |
commit | 69adeb3718099de8bbf3090251d0061e90cada14 (patch) | |
tree | 934fbca387253e3c3666f9368febf8fa9769df76 | |
parent | 1a3fda63a5f9756cde19bc7e221651b0c33cb5dc (diff) | |
parent | 3463c24d409eaa4268be034253f51faaced2952e (diff) | |
download | gitlab-ce-69adeb3718099de8bbf3090251d0061e90cada14.tar.gz |
Merge branch 'georgekoltsov/64377-add-better-log-msg-to-members-mapper' into 'master'
Add better error message to MembersMapper#ensure_default_member!
See merge request gitlab-org/gitlab-ce!30838
3 files changed, 18 insertions, 0 deletions
diff --git a/changelogs/unreleased/georgekoltsov-64377-add-better-log-msg-to-members-mapper.yml b/changelogs/unreleased/georgekoltsov-64377-add-better-log-msg-to-members-mapper.yml new file mode 100644 index 00000000000..9557e633f76 --- /dev/null +++ b/changelogs/unreleased/georgekoltsov-64377-add-better-log-msg-to-members-mapper.yml @@ -0,0 +1,6 @@ +--- +title: When GitLab import fails during importer user mapping step, add an explicit + error message mentioning importer +merge_request: 30838 +author: +type: other diff --git a/lib/gitlab/import_export/members_mapper.rb b/lib/gitlab/import_export/members_mapper.rb index a154de5419e..ab19a509310 100644 --- a/lib/gitlab/import_export/members_mapper.rb +++ b/lib/gitlab/import_export/members_mapper.rb @@ -50,6 +50,8 @@ module Gitlab @project.project_members.destroy_all # rubocop: disable DestroyAll ProjectMember.create!(user: @user, access_level: ProjectMember::MAINTAINER, source_id: @project.id, importing: true) + rescue => e + raise e, "Error adding importer user to project members. #{e.message}" end def add_team_member(member, existing_user = nil) diff --git a/spec/lib/gitlab/import_export/members_mapper_spec.rb b/spec/lib/gitlab/import_export/members_mapper_spec.rb index b95b5dfe791..a9e8431acba 100644 --- a/spec/lib/gitlab/import_export/members_mapper_spec.rb +++ b/spec/lib/gitlab/import_export/members_mapper_spec.rb @@ -154,5 +154,15 @@ describe Gitlab::ImportExport::MembersMapper do expect(members_mapper.map[exported_user_id]).to eq(user2.id) end end + + context 'when importer mapping fails' do + let(:exception_message) { 'Something went wrong' } + + it 'includes importer specific error message' do + expect(ProjectMember).to receive(:create!).and_raise(StandardError.new(exception_message)) + + expect { members_mapper.map }.to raise_error(StandardError, "Error adding importer user to project members. #{exception_message}") + end + end end end |