Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

9 files changed, 60 insertions, 59 deletions

diff --git a/lib/gitlab/gitaly_client/attributes_bag.rb b/lib/gitlab/gitaly_client/attributes_bag.rb
index f935281ac2e..74e6279708e 100644
--- a/lib/gitlab/gitaly_client/attributes_bag.rb
+++ b/lib/gitlab/gitaly_client/attributes_bag.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module GitalyClient
     # This module expects an `ATTRS` const to be defined on the subclass
-    # See GitalyClient::WikiFile for an example
+    # See GitalyClient::WikiPage for an example
     module AttributesBag
       extend ActiveSupport::Concern
 
diff --git a/lib/gitlab/gitaly_client/blob_service.rb b/lib/gitlab/gitaly_client/blob_service.rb
index c66b3335d89..19a473e4785 100644
--- a/lib/gitlab/gitaly_client/blob_service.rb
+++ b/lib/gitlab/gitaly_client/blob_service.rb
@@ -78,17 +78,7 @@ module Gitlab
       end
 
       def get_new_lfs_pointers(revision, limit, not_in, dynamic_timeout = nil)
-        request = Gitaly::GetNewLFSPointersRequest.new(
-          repository: @gitaly_repo,
-          revision: encode_binary(revision),
-          limit: limit || 0
-        )
-
-        if not_in.nil? || not_in == :all
-          request.not_in_all = true
-        else
-          request.not_in_refs += not_in
-        end
+        request, rpc = create_new_lfs_pointers_request(revision, limit, not_in)
 
         timeout =
           if dynamic_timeout
@@ -100,7 +90,7 @@ module Gitlab
         response = GitalyClient.call(
           @gitaly_repo.storage_name,
           :blob_service,
-          :get_new_lfs_pointers,
+          rpc,
           request,
           timeout: timeout
         )
@@ -108,16 +98,51 @@ module Gitlab
       end
 
       def get_all_lfs_pointers
-        request = Gitaly::GetAllLFSPointersRequest.new(
-          repository: @gitaly_repo
+        request = Gitaly::ListLFSPointersRequest.new(
+          repository: @gitaly_repo,
+          revisions: [encode_binary("--all")]
         )
 
-        response = GitalyClient.call(@gitaly_repo.storage_name, :blob_service, :get_all_lfs_pointers, request, timeout: GitalyClient.medium_timeout)
+        response = GitalyClient.call(@gitaly_repo.storage_name, :blob_service, :list_lfs_pointers, request, timeout: GitalyClient.medium_timeout)
         map_lfs_pointers(response)
       end
 
       private
 
+      def create_new_lfs_pointers_request(revision, limit, not_in)
+        # If the check happens for a change which is using a quarantine
+        # environment for incoming objects, then we can avoid doing the
+        # necessary graph walk to detect only new LFS pointers and instead scan
+        # through all quarantined objects.
+        git_env = ::Gitlab::Git::HookEnv.all(@gitaly_repo.gl_repository)
+        if Feature.enabled?(:lfs_integrity_inspect_quarantined_objects, @project, default_enabled: :yaml) && git_env['GIT_OBJECT_DIRECTORY_RELATIVE'].present?
+          repository = @gitaly_repo.dup
+          repository.git_alternate_object_directories = Google::Protobuf::RepeatedField.new(:string)
+
+          request = Gitaly::ListAllLFSPointersRequest.new(
+            repository: repository,
+            limit: limit || 0
+          )
+
+          [request, :list_all_lfs_pointers]
+        else
+          revisions = [revision]
+          revisions += if not_in.nil? || not_in == :all
+                         ["--not", "--all"]
+                       else
+                         not_in.prepend "--not"
+                       end
+
+          request = Gitaly::ListLFSPointersRequest.new(
+            repository: @gitaly_repo,
+            limit: limit || 0,
+            revisions: revisions.map { |rev| encode_binary(rev) }
+          )
+
+          [request, :list_lfs_pointers]
+        end
+      end
+
       def consume_blob_response(response)
         data = []
         blob = nil
diff --git a/lib/gitlab/gitaly_client/call.rb b/lib/gitlab/gitaly_client/call.rb
index 9d4d86997ad..4bb184bee2f 100644
--- a/lib/gitlab/gitaly_client/call.rb
+++ b/lib/gitlab/gitaly_client/call.rb
@@ -50,11 +50,11 @@ module Gitlab
       end
 
       def recording_request
-        start = Gitlab::Metrics::System.monotonic_time
+        @start = Gitlab::Metrics::System.monotonic_time
 
         yield
       ensure
-        @duration += Gitlab::Metrics::System.monotonic_time - start
+        @duration += Gitlab::Metrics::System.monotonic_time - @start
       end
 
       def store_timings
@@ -64,8 +64,14 @@ module Gitlab
 
         request_hash = @request.is_a?(Google::Protobuf::MessageExts) ? @request.to_h : {}
 
-        GitalyClient.add_call_details(feature: "#{@service}##{@rpc}", duration: @duration, request: request_hash, rpc: @rpc,
-                                      backtrace: Gitlab::BacktraceCleaner.clean_backtrace(caller))
+        GitalyClient.add_call_details(
+          start: @start,
+          feature: "#{@service}##{@rpc}",
+          duration: @duration,
+          request: request_hash,
+          rpc: @rpc,
+          backtrace: Gitlab::BacktraceCleaner.clean_backtrace(caller)
+        )
       end
     end
   end
diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb
index ef5221a8042..3d24b4d53a4 100644
--- a/lib/gitlab/gitaly_client/commit_service.rb
+++ b/lib/gitlab/gitaly_client/commit_service.rb
@@ -107,6 +107,8 @@ module Gitlab
         entry.data = data.join
 
         entry unless entry.oid.blank?
+      rescue GRPC::NotFound
+        nil
       end
 
       def tree_entries(repository, revision, path, recursive)
diff --git a/lib/gitlab/gitaly_client/operation_service.rb b/lib/gitlab/gitaly_client/operation_service.rb
index 6f302b2c4e7..5ce1b1f0c87 100644
--- a/lib/gitlab/gitaly_client/operation_service.rb
+++ b/lib/gitlab/gitaly_client/operation_service.rb
@@ -103,7 +103,7 @@ module Gitlab
         end
       end
 
-      def user_merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref, allow_conflicts)
+      def user_merge_to_ref(user, source_sha:, branch:, target_ref:, message:, first_parent_ref:, allow_conflicts: false)
         request = Gitaly::UserMergeToRefRequest.new(
           repository: @gitaly_repo,
           source_sha: source_sha,
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index bd450249355..a93f4071efc 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -339,6 +339,11 @@ module Gitlab
         search_results_from_response(response, options)
       end
 
+      def search_files_by_regexp(ref, filter)
+        request = Gitaly::SearchFilesByNameRequest.new(repository: @gitaly_repo, ref: ref, query: '.', filter: filter)
+        GitalyClient.call(@storage, :repository_service, :search_files_by_name, request, timeout: GitalyClient.fast_timeout).flat_map(&:files)
+      end
+
       def disconnect_alternates
         request = Gitaly::DisconnectGitAlternatesRequest.new(
           repository: @gitaly_repo
diff --git a/lib/gitlab/gitaly_client/storage_settings.rb b/lib/gitlab/gitaly_client/storage_settings.rb
index 7edd42f9ef7..dd9e3d5d28b 100644
--- a/lib/gitlab/gitaly_client/storage_settings.rb
+++ b/lib/gitlab/gitaly_client/storage_settings.rb
@@ -11,7 +11,7 @@ module Gitlab
       DirectPathAccessError = Class.new(StandardError)
       InvalidConfigurationError = Class.new(StandardError)
 
-      INVALID_STORAGE_MESSAGE = <<~MSG.freeze
+      INVALID_STORAGE_MESSAGE = <<~MSG
         Storage is invalid because it has no `path` key.
 
         For source installations, update your config/gitlab.yml Refer to gitlab.yml.example for an updated example.
diff --git a/lib/gitlab/gitaly_client/wiki_file.rb b/lib/gitlab/gitaly_client/wiki_file.rb
deleted file mode 100644
index ef2b23732d1..00000000000
--- a/lib/gitlab/gitaly_client/wiki_file.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module GitalyClient
-    class WikiFile
-      ATTRS = %i(name mime_type path raw_data).freeze
-
-      include AttributesBag
-    end
-  end
-end
diff --git a/lib/gitlab/gitaly_client/wiki_service.rb b/lib/gitlab/gitaly_client/wiki_service.rb
index 9034edb6263..fecc2b7023d 100644
--- a/lib/gitlab/gitaly_client/wiki_service.rb
+++ b/lib/gitlab/gitaly_client/wiki_service.rb
@@ -153,32 +153,6 @@ module Gitlab
         versions
       end
 
-      def find_file(name, revision)
-        request = Gitaly::WikiFindFileRequest.new(
-          repository: @gitaly_repo,
-          name: encode_binary(name),
-          revision: encode_binary(revision)
-        )
-
-        response = GitalyClient.call(@repository.storage, :wiki_service, :wiki_find_file, request, timeout: GitalyClient.fast_timeout)
-        wiki_file = nil
-
-        response.each do |message|
-          next unless message.name.present? || wiki_file
-
-          if wiki_file
-            wiki_file.raw_data = "#{wiki_file.raw_data}#{message.raw_data}"
-          else
-            wiki_file = GitalyClient::WikiFile.new(message.to_h)
-            # All gRPC strings in a response are frozen, so we get
-            # an unfrozen version here so appending in the else clause below doesn't blow up.
-            wiki_file.raw_data = wiki_file.raw_data.dup
-          end
-        end
-
-        wiki_file
-      end
-
       private
 
       # If a block is given and the yielded value is truthy, iteration will be