Merge branch 'repository-storage-vs-shard' into 'master'

Access Repository#shard directly

See merge request gitlab-org/gitlab!35127

app/services/repositories/base_service.rb

@@ -8,20 +8,19 @@ class Repositories::BaseService < BaseService
   attr_reader :repository
 
   delegate :container, :disk_path, :full_path, to: :repository
-  delegate :repository_storage, to: :container
 
   def initialize(repository)
     @repository = repository
   end
 
   def repo_exists?(path)
-    gitlab_shell.repository_exists?(repository_storage, path + '.git')
+    gitlab_shell.repository_exists?(repository.shard, path + '.git')
   end
 
   def mv_repository(from_path, to_path)
     return true unless repo_exists?(from_path)
 
-    gitlab_shell.mv_repository(repository_storage, from_path, to_path)
+    gitlab_shell.mv_repository(repository.shard, from_path, to_path)
   end
 
   # Build a path for removing repositories

app/services/repositories/shell_destroy_service.rb

@@ -9,7 +9,7 @@ class Repositories::ShellDestroyService < Repositories::BaseService
 
     GitlabShellWorker.perform_in(delay,
                                  :remove_repository,
-                                 repository_storage,
+                                 repository.shard,
                                  removal_path)
   end
 end

lib/api/helpers/internal_helpers.rb

@@ -118,8 +118,8 @@ module API
 
         {
           repository: repository.gitaly_repository,
-          address: Gitlab::GitalyClient.address(container.repository_storage),
-          token: Gitlab::GitalyClient.token(container.repository_storage),
+          address: Gitlab::GitalyClient.address(repository.shard),
+          token: Gitlab::GitalyClient.token(repository.shard),
           features: Feature::Gitaly.server_feature_flags
         }
       end

lib/gitlab/workhorse.rb

@@ -216,8 +216,8 @@ module Gitlab
 
       def gitaly_server_hash(repository)
         {
-          address: Gitlab::GitalyClient.address(repository.container.repository_storage),
-          token: Gitlab::GitalyClient.token(repository.container.repository_storage),
+          address: Gitlab::GitalyClient.address(repository.shard),
+          token: Gitlab::GitalyClient.token(repository.shard),
           features: Feature::Gitaly.server_feature_flags
         }
       end