Rename gl_project_name -> gl_project_path

Upgrade gitaly-proto to 1.10.0 to have this field.

Gemfile

@@ -437,7 +437,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 1.10.0', require: 'gitaly'
 gem 'grpc', '~> 1.15.0'
 
 gem 'google-protobuf', '~> 3.6'

Gemfile.lock

@@ -302,7 +302,7 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (1.5.0)
+    gitaly-proto (1.10.0)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab-default_value_for (3.1.1)
@@ -1055,7 +1055,7 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 1.5.0)
+  gitaly-proto (~> 1.10.0)
   github-markup (~> 1.7.0)
   gitlab-default_value_for (~> 3.1.1)
   gitlab-license (~> 1.0)

lib/gitlab/git/object_pool.rb

@@ -10,13 +10,13 @@ module Gitlab
       delegate :exists?, :size, to: :repository
       delegate :unlink_repository, :delete, to: :object_pool_service
 
-      attr_reader :storage, :relative_path, :source_repository, :gl_project_name
+      attr_reader :storage, :relative_path, :source_repository, :gl_project_path
 
-      def initialize(storage, relative_path, source_repository, gl_project_name)
+      def initialize(storage, relative_path, source_repository, gl_project_path)
         @storage = storage
         @relative_path = relative_path
         @source_repository = source_repository
-        @gl_project_name = gl_project_name
+        @gl_project_path = gl_project_path
       end
 
       def create
@@ -32,12 +32,12 @@ module Gitlab
       end
 
       def to_gitaly_repository
-        Gitlab::GitalyClient::Util.repository(storage, relative_path, GL_REPOSITORY, gl_project_name)
+        Gitlab::GitalyClient::Util.repository(storage, relative_path, GL_REPOSITORY, gl_project_path)
       end
 
       # Allows for reusing other RPCs by 'tricking' Gitaly to think its a repository
       def repository
-        @repository ||= Gitlab::Git::Repository.new(storage, relative_path, GL_REPOSITORY, gl_project_name)
+        @repository ||= Gitlab::Git::Repository.new(storage, relative_path, GL_REPOSITORY, gl_project_path)
       end
 
       private

lib/gitlab/git/repository.rb

@@ -67,7 +67,7 @@ module Gitlab
       # Relative path of repo
       attr_reader :relative_path
 
-      attr_reader :storage, :gl_repository, :relative_path, :gl_project_name
+      attr_reader :storage, :gl_repository, :relative_path, :gl_project_path
 
       # This remote name has to be stable for all types of repositories that
       # can join an object pool. If it's structure ever changes, a migration
@@ -78,11 +78,11 @@ module Gitlab
 
       # This initializer method is only used on the client side (gitlab-ce).
       # Gitaly-ruby uses a different initializer.
-      def initialize(storage, relative_path, gl_repository, gl_project_name)
+      def initialize(storage, relative_path, gl_repository, gl_project_path)
         @storage = storage
         @relative_path = relative_path
         @gl_repository = gl_repository
-        @gl_project_name = gl_project_name
+        @gl_project_path = gl_project_path
 
         @name = @relative_path.split("/").last
       end
@@ -873,7 +873,7 @@ module Gitlab
       end
 
       def gitaly_repository
-        Gitlab::GitalyClient::Util.repository(@storage, @relative_path, @gl_repository, @gl_project_name)
+        Gitlab::GitalyClient::Util.repository(@storage, @relative_path, @gl_repository, @gl_project_path)
       end
 
       def gitaly_ref_client

lib/gitlab/gitaly_client/util.rb

@@ -4,7 +4,7 @@ module Gitlab
   module GitalyClient
     module Util
       class << self
-        def repository(repository_storage, relative_path, gl_repository, gl_project_name)
+        def repository(repository_storage, relative_path, gl_repository, gl_project_path)
           git_env = Gitlab::Git::HookEnv.all(gl_repository)
           git_object_directory = git_env['GIT_OBJECT_DIRECTORY_RELATIVE'].presence
           git_alternate_object_directories = Array.wrap(git_env['GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE'])
@@ -15,7 +15,7 @@ module Gitlab
             gl_repository: gl_repository.to_s,
             git_object_directory: git_object_directory.to_s,
             git_alternate_object_directories: git_alternate_object_directories,
-            gl_project_name: gl_project_name
+            gl_project_path: gl_project_path
           )
         end
 
@@ -23,7 +23,7 @@ module Gitlab
           Gitlab::Git::Repository.new(gitaly_repository.storage_name,
                                       gitaly_repository.relative_path,
                                       gitaly_repository.gl_repository,
-                                      gitaly_repository.gl_project_name)
+                                      gitaly_repository.gl_project_path)
         end
       end
     end

lib/gitlab/shell.rb

@@ -77,19 +77,19 @@ module Gitlab
     #
     # storage - the shard key
     # disk_path - project disk path
-    # gl_project_name - project name
+    # gl_project_path - project name
     #
     # Ex.
     #   create_repository("default", "path/to/gitlab-ci", "gitlab/gitlab-ci")
     #
-    def create_repository(storage, disk_path, gl_project_name)
+    def create_repository(storage, disk_path, gl_project_path)
       relative_path = disk_path.dup
       relative_path << '.git' unless relative_path.end_with?('.git')
 
       # During creation of a repository, gl_repository may not be known
       # because that depends on a yet-to-be assigned project ID in the
       # database (e.g. project-1234), so for now it is blank.
-      repository = Gitlab::Git::Repository.new(storage, relative_path, '', gl_project_name)
+      repository = Gitlab::Git::Repository.new(storage, relative_path, '', gl_project_path)
       wrapped_gitaly_errors { repository.gitaly_repository_client.create_repository }
 
       true
@@ -115,13 +115,13 @@ module Gitlab
     # Ex.
     #   import_repository("nfs-file06", "gitlab/gitlab-ci", "https://gitlab.com/gitlab-org/gitlab-test.git")
     #
-    def import_repository(storage, name, url, gl_project_name)
+    def import_repository(storage, name, url, gl_project_path)
       if url.start_with?('.', '/')
         raise Error.new("don't use disk paths with import_repository: #{url.inspect}")
       end
 
       relative_path = "#{name}.git"
-      cmd = GitalyGitlabProjects.new(storage, relative_path, gl_project_name)
+      cmd = GitalyGitlabProjects.new(storage, relative_path, gl_project_path)
 
       success = cmd.import_project(url, git_timeout)
       raise Error, cmd.output unless success
@@ -413,17 +413,17 @@ module Gitlab
     end
 
     class GitalyGitlabProjects
-      attr_reader :shard_name, :repository_relative_path, :output, :gl_project_name
+      attr_reader :shard_name, :repository_relative_path, :output, :gl_project_path
 
-      def initialize(shard_name, repository_relative_path, gl_project_name)
+      def initialize(shard_name, repository_relative_path, gl_project_path)
         @shard_name = shard_name
         @repository_relative_path = repository_relative_path
         @output = ''
-        @gl_project_name = gl_project_name
+        @gl_project_path = gl_project_path
       end
 
       def import_project(source, _timeout)
-        raw_repository = Gitlab::Git::Repository.new(shard_name, repository_relative_path, nil, gl_project_name)
+        raw_repository = Gitlab::Git::Repository.new(shard_name, repository_relative_path, nil, gl_project_path)
 
         Gitlab::GitalyClient::RepositoryService.new(raw_repository).import_repository(source)
         true
@@ -434,7 +434,7 @@ module Gitlab
 
       def fork_repository(new_shard_name, new_repository_relative_path, new_project_name)
         target_repository = Gitlab::Git::Repository.new(new_shard_name, new_repository_relative_path, nil, new_project_name)
-        raw_repository = Gitlab::Git::Repository.new(shard_name, repository_relative_path, nil, gl_project_name)
+        raw_repository = Gitlab::Git::Repository.new(shard_name, repository_relative_path, nil, gl_project_path)
 
         Gitlab::GitalyClient::RepositoryService.new(target_repository).fork_repository(raw_repository)
       rescue GRPC::BadStatus => e

spec/lib/gitlab/gitaly_client/util_spec.rb

@@ -7,7 +7,7 @@ describe Gitlab::GitalyClient::Util do
     let(:gl_repository) { 'project-1' }
     let(:git_object_directory) { '.git/objects' }
     let(:git_alternate_object_directory) { ['/dir/one', '/dir/two'] }
-    let(:gl_project_name) { 'namespace/myproject' }
+    let(:gl_project_path) { 'namespace/myproject' }
     let(:git_env) do
       {
         'GIT_OBJECT_DIRECTORY_RELATIVE' => git_object_directory,
@@ -16,7 +16,7 @@ describe Gitlab::GitalyClient::Util do
     end
 
     subject do
-      described_class.repository(repository_storage, relative_path, gl_repository, gl_project_name)
+      described_class.repository(repository_storage, relative_path, gl_repository, gl_project_path)
     end
 
     it 'creates a Gitaly::Repository with the given data' do
@@ -28,7 +28,7 @@ describe Gitlab::GitalyClient::Util do
       expect(subject.gl_repository).to eq(gl_repository)
       expect(subject.git_object_directory).to eq(git_object_directory)
       expect(subject.git_alternate_object_directories).to eq(git_alternate_object_directory)
-      expect(subject.gl_project_name).to eq(gl_project_name)
+      expect(subject.gl_project_path).to eq(gl_project_path)
     end
   end
 end

spec/models/repository_spec.rb

@@ -2291,7 +2291,7 @@ describe Repository do
       expect(subject).to be_a(Gitlab::Git::Repository)
       expect(subject.relative_path).to eq(project.disk_path + '.git')
       expect(subject.gl_repository).to eq("project-#{project.id}")
-      expect(subject.gl_project_name).to eq(project.full_path)
+      expect(subject.gl_project_path).to eq(project.full_path)
     end
 
     context 'with a wiki repository' do
@@ -2301,7 +2301,7 @@ describe Repository do
         expect(subject).to be_a(Gitlab::Git::Repository)
         expect(subject.relative_path).to eq(project.disk_path + '.wiki.git')
         expect(subject.gl_repository).to eq("wiki-#{project.id}")
-        expect(subject.gl_project_name).to eq(project.full_path)
+        expect(subject.gl_project_path).to eq(project.full_path)
       end
     end
   end