1 files changed, 38 insertions, 8 deletions
diff --git a/lib/gitlab/git/base_error.rb b/lib/gitlab/git/base_error.rb
index a7eaa82b347..0b0fdef54cc 100644
--- a/lib/gitlab/git/base_error.rb
+++ b/lib/gitlab/git/base_error.rb
@@ -1,20 +1,50 @@
 # frozen_string_literal: true
+require 'grpc'
 
 module Gitlab
   module Git
     class BaseError < StandardError
       DEBUG_ERROR_STRING_REGEX = /(.*?) debug_error_string:.*$/m.freeze
+      GRPC_CODES = {
+        '0' => 'ok',
+        '1' => 'cancelled',
+        '2' => 'unknown',
+        '3' => 'invalid_argument',
+        '4' => 'deadline_exceeded',
+        '5' => 'not_found',
+        '6' => 'already_exists',
+        '7' => 'permission_denied',
+        '8' => 'resource_exhausted',
+        '9' => 'failed_precondition',
+        '10' => 'aborted',
+        '11' => 'out_of_range',
+        '12' => 'unimplemented',
+        '13' => 'internal',
+        '14' => 'unavailable',
+        '15' => 'data_loss',
+        '16' => 'unauthenticated'
+      }.freeze
+
+      attr_reader :status, :code, :service
 
       def initialize(msg = nil)
-        if msg
-          raw_message = msg.to_s
-          match = DEBUG_ERROR_STRING_REGEX.match(raw_message)
-          raw_message = match[1] if match
+        super && return if msg.nil?
+
+        set_grpc_error_code(msg) if msg.is_a?(::GRPC::BadStatus)
+
+        super(build_raw_message(msg))
+      end
+
+      def build_raw_message(message)
+        raw_message = message.to_s
+        match = DEBUG_ERROR_STRING_REGEX.match(raw_message)
+        match ? match[1] : raw_message
+      end
 
-          super(raw_message)
-        else
-          super
-        end
+      def set_grpc_error_code(grpc_error)
+        @status = grpc_error.code
+        @code = GRPC_CODES[@status.to_s]
+        @service = 'git'
       end
     end
   end