Remove references to V3 internal API

In the main Rails app we use exactly the same code for /api/v3/internal and /api/v4/internal This means that we can move gitlab-shell to V4 in preparation for sunsetting V3

Author: adamniedzielski

lib/gitlab_net.rb

@@ -33,7 +33,7 @@ def check_access(cmd, gl_repository, repo, actor, changes, protocol, env: {})
  params.merge!(user_id: actor.gsub("user-", ""))
  end
 
- url = "#{host_v3}/allowed"
+ url = "#{host}/allowed"
  resp = post(url, params)
 
  if resp.code == '200'
@@ -45,7 +45,7 @@ def check_access(cmd, gl_repository, repo, actor, changes, protocol, env: {})
 
  def discover(key)
  key_id = key.gsub("key-", "")
- resp = get("#{host_v3}/discover?key_id=#{key_id}")
+ resp = get("#{host}/discover?key_id=#{key_id}")
  JSON.parse(resp.body) rescue nil
  end
 
@@ -55,41 +55,41 @@ def lfs_authenticate(key, repo)
  key_id: key.gsub('key-', '')
  }
 
- resp = post("#{host_v3}/lfs_authenticate", params)
+ resp = post("#{host}/lfs_authenticate", params)
 
  if resp.code == '200'
  GitlabLfsAuthentication.build_from_json(resp.body)
  end
  end
 
  def broadcast_message
- resp = get("#{host_v3}/broadcast_message")
+ resp = get("#{host}/broadcast_message")
  JSON.parse(resp.body) rescue {}
  end
 
  def merge_request_urls(gl_repository, repo_path, changes)
  changes = changes.join("\n") unless changes.kind_of?(String)
  changes = changes.encode('UTF-8', 'ASCII', invalid: :replace, replace: '')
- url = "#{host_v3}/merge_request_urls?project=#{URI.escape(repo_path)}&changes=#{URI.escape(changes)}"
+ url = "#{host}/merge_request_urls?project=#{URI.escape(repo_path)}&changes=#{URI.escape(changes)}"
  url += "&gl_repository=#{URI.escape(gl_repository)}" if gl_repository
  resp = get(url)
  JSON.parse(resp.body) rescue []
  end
 
  def check
- get("#{host_v3}/check", read_timeout: CHECK_TIMEOUT)
+ get("#{host}/check", read_timeout: CHECK_TIMEOUT)
  end
 
  def authorized_key(key)
- resp = get("#{host_v3}/authorized_keys?key=#{URI.escape(key, '+/=')}")
+ resp = get("#{host}/authorized_keys?key=#{URI.escape(key, '+/=')}")
  JSON.parse(resp.body) if resp.code == "200"
  rescue
  nil
  end
 
  def two_factor_recovery_codes(key)
  key_id = key.gsub('key-', '')
- resp = post("#{host_v3}/two_factor_recovery_codes", key_id: key_id)
+ resp = post("#{host}/two_factor_recovery_codes", key_id: key_id)
 
  JSON.parse(resp.body) if resp.code == '200'
  rescue
@@ -139,10 +139,6 @@ def config
  @config ||= GitlabConfig.new
  end
 
- def host_v3
- "#{config.gitlab_url}/api/v3/internal"
- end
-
  def host
  "#{config.gitlab_url}/api/v4/internal"
  end

spec/gitlab_net_spec.rb

@@ -6,11 +6,9 @@
 describe GitlabNet, vcr: true do
  let(:gitlab_net) { GitlabNet.new }
  let(:changes) { ['0000000000000000000000000000000000000000 92d0970eefd7acb6d548878925ce2208cfe2d2ec refs/heads/branch4'] }
- let(:host_v3) { 'https://dev.gitlab.org/api/v3/internal' }
  let(:host) { 'https://dev.gitlab.org/api/v4/internal' }
 
  before do
- gitlab_net.stub(:host_v3).and_return(host_v3)
  gitlab_net.stub(:host).and_return(host)
  gitlab_net.stub(:secret_token).and_return('a123')
  end
@@ -100,13 +98,13 @@
  let(:encoded_changes) { "123456%20789012%20refs/heads/test%0A654321%20210987%20refs/tags/tag" }
 
  it "sends the given arguments as encoded URL parameters" do
- gitlab_net.should_receive(:get).with("#{host_v3}/merge_request_urls?project=#{repo_path}&changes=#{encoded_changes}&gl_repository=#{gl_repository}")
+ gitlab_net.should_receive(:get).with("#{host}/merge_request_urls?project=#{repo_path}&changes=#{encoded_changes}&gl_repository=#{gl_repository}")
 
  gitlab_net.merge_request_urls(gl_repository, repo_path, changes)
  end
 
  it "omits the gl_repository parameter if it's nil" do
- gitlab_net.should_receive(:get).with("#{host_v3}/merge_request_urls?project=#{repo_path}&changes=#{encoded_changes}")
+ gitlab_net.should_receive(:get).with("#{host}/merge_request_urls?project=#{repo_path}&changes=#{encoded_changes}")
 
  gitlab_net.merge_request_urls(nil, repo_path, changes)
  end
@@ -280,14 +278,6 @@
  it("uses API version 4") { should include("api/v4") }
  end
 
- describe :host_v3 do
- let(:net) { GitlabNet.new }
- subject { net.send :host_v3 }
-
- it { should include(net.send(:config).gitlab_url) }
- it("uses API version 3") { should include("api/v3") }
- end
-
  describe :http_client_for do
  subject { gitlab_net.send :http_client_for, URI('https://localhost/') }
  before do