diff --git a/lib/gitlab/github_import/client.rb b/lib/gitlab/github_import/client.rb index 844530b1ea7c6c0615b5a1efdf5139c5b4247a06..c1c338487a7dfb5db9aeb3d9ce92c0fdb0e37343 100644 --- a/lib/gitlab/github_import/client.rb +++ b/lib/gitlab/github_import/client.rb @@ -38,7 +38,14 @@ module Gitlab # otherwise hitting the rate limit will result in a thread # being blocked in a `sleep()` call for up to an hour. def initialize(token, per_page: 100, parallel: true) - @octokit = Octokit::Client.new(access_token: token, per_page: per_page) + @octokit = Octokit::Client.new( + access_token: token, + per_page: per_page, + api_endpoint: api_endpoint + ) + + @octokit.connection_options[:ssl] = { verify: verify_ssl } + @parallel = parallel end @@ -163,8 +170,27 @@ module Gitlab octokit.rate_limit.resets_in + 5 end - def respond_to_missing?(method, include_private = false) - octokit.respond_to?(method, include_private) + def api_endpoint + custom_api_endpoint || default_api_endpoint + end + + def custom_api_endpoint + github_omniauth_provider.dig('args', 'client_options', 'site') + end + + def default_api_endpoint + OmniAuth::Strategies::GitHub.default_options[:client_options][:site] + end + + def verify_ssl + github_omniauth_provider.fetch('verify_ssl', true) + end + + def github_omniauth_provider + @github_omniauth_provider ||= + Gitlab.config.omniauth.providers + .find { |provider| provider.name == 'github' } + .to_h end def rate_limit_counter diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index 8e9aef49e8913015d26d3478554082977b621636..943cbe6d80caf552de06e403fe16f8e0e17f13b1 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -14,7 +14,9 @@ class GithubImport end def run! - @repo = GithubRepos.new(@options, @current_user, @github_repo).choose_one! + @repo = GithubRepos + .new(@options[:token], @current_user, @github_repo) + .choose_one! raise 'No repo found!' unless @repo @@ -28,7 +30,7 @@ class GithubImport private def show_warning! - puts "This will import GitHub #{@repo['full_name'].bright} into GitLab #{@project_path.bright} as #{@current_user.name}" + puts "This will import GitHub #{@repo.full_name.bright} into GitLab #{@project_path.bright} as #{@current_user.name}" puts "Permission checks are ignored. Press any key to continue.".color(:red) STDIN.getch @@ -65,16 +67,16 @@ class GithubImport @current_user, name: name, path: name, - description: @repo['description'], + description: @repo.description, namespace_id: namespace.id, visibility_level: visibility_level, - skip_wiki: @repo['has_wiki'] + skip_wiki: @repo.has_wiki ).execute project.update!( import_type: 'github', - import_source: @repo['full_name'], - import_url: @repo['clone_url'].sub('://', "://#{@options[:token]}@") + import_source: @repo.full_name, + import_url: @repo.clone_url.sub('://', "://#{@options[:token]}@") ) project @@ -93,13 +95,15 @@ class GithubImport end def visibility_level - @repo['private'] ? Gitlab::VisibilityLevel::PRIVATE : Gitlab::CurrentSettings.current_application_settings.default_project_visibility + @repo.private ? Gitlab::VisibilityLevel::PRIVATE : Gitlab::CurrentSettings.current_application_settings.default_project_visibility end end class GithubRepos - def initialize(options, current_user, github_repo) - @options = options + def initialize(token, current_user, github_repo) + @client = Octokit::Client + .new(access_token: token, auto_paginate: true, per_page: 100) + @current_user = current_user @github_repo = github_repo end @@ -108,17 +112,17 @@ class GithubRepos return found_github_repo if @github_repo repos.each do |repo| - print "ID: #{repo['id'].to_s.bright}".color(:green) - print "\tName: #{repo['full_name']}\n".color(:green) + print "ID: #{repo.id.to_s.bright}".color(:green) + print "\tName: #{repo.full_name}\n".color(:green) end print 'ID? '.bright - repos.find { |repo| repo['id'] == repo_id } + repos.find { |repo| repo.id == repo_id } end def found_github_repo - repos.find { |repo| repo['full_name'] == @github_repo } + repos.find { |repo| repo.full_name == @github_repo } end def repo_id @@ -126,7 +130,7 @@ class GithubRepos end def repos - Github::Repositories.new(@options).fetch + @client.list_repositories end end diff --git a/spec/lib/gitlab/github_import/client_spec.rb b/spec/lib/gitlab/github_import/client_spec.rb index 6bbdf6bf3b63b5dc4d49f3cbd42c515b73f97122..9cbd9bcc14e7de120a0c6ca4ba89de91c83f65f0 100644 --- a/spec/lib/gitlab/github_import/client_spec.rb +++ b/spec/lib/gitlab/github_import/client_spec.rb @@ -260,27 +260,106 @@ describe Gitlab::GithubImport::Client do end end - describe '#method_missing' do - it 'delegates missing methods to the request method' do - client = described_class.new('foo') + describe '#api_endpoint' do + let(:client) { described_class.new('foo') } + + context 'without a custom endpoint configured in Omniauth' do + it 'returns the default API endpoint' do + expect(client) + .to receive(:custom_api_endpoint) + .and_return(nil) + + expect(client.api_endpoint).to eq('https://api.github.com') + end + end + + context 'with a custom endpoint configured in Omniauth' do + it 'returns the custom endpoint' do + endpoint = 'https://github.kittens.com' - expect(client).to receive(:milestones).with(state: 'all') + expect(client) + .to receive(:custom_api_endpoint) + .and_return(endpoint) - client.milestones(state: 'all') + expect(client.api_endpoint).to eq(endpoint) + end end end - describe '#respond_to_missing?' do - it 'returns true for methods supported by Octokit' do - client = described_class.new('foo') + describe '#custom_api_endpoint' do + let(:client) { described_class.new('foo') } - expect(client.respond_to?(:milestones)).to eq(true) + context 'without a custom endpoint' do + it 'returns nil' do + expect(client) + .to receive(:github_omniauth_provider) + .and_return({}) + + expect(client.custom_api_endpoint).to be_nil + end + end + + context 'with a custom endpoint' do + it 'returns the API endpoint' do + endpoint = 'https://github.kittens.com' + + expect(client) + .to receive(:github_omniauth_provider) + .and_return({ 'args' => { 'client_options' => { 'site' => endpoint } } }) + + expect(client.custom_api_endpoint).to eq(endpoint) + end end + end - it 'returns false for methods not supported by Octokit' do + describe '#default_api_endpoint' do + it 'returns the default API endpoint' do client = described_class.new('foo') - expect(client.respond_to?(:kittens)).to eq(false) + expect(client.default_api_endpoint).to eq('https://api.github.com') + end + end + + describe '#verify_ssl' do + let(:client) { described_class.new('foo') } + + context 'without a custom configuration' do + it 'returns true' do + expect(client) + .to receive(:github_omniauth_provider) + .and_return({}) + + expect(client.verify_ssl).to eq(true) + end + end + + context 'with a custom configuration' do + it 'returns the configured value' do + expect(client.verify_ssl).to eq(false) + end + end + end + + describe '#github_omniauth_provider' do + let(:client) { described_class.new('foo') } + + context 'without a configured provider' do + it 'returns an empty Hash' do + expect(Gitlab.config.omniauth) + .to receive(:providers) + .and_return([]) + + expect(client.github_omniauth_provider).to eq({}) + end + end + + context 'with a configured provider' do + it 'returns the provider details as a Hash' do + hash = client.github_omniauth_provider + + expect(hash['name']).to eq('github') + expect(hash['url']).to eq('https://github.com/') + end end end end