Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2022-07-27 09:36:36 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2022-07-29 09:33:48 +0300
commit799a1e521471afabbc82a94a5e615e936f358bcf (patch)
tree1ae0a08c52d492faf066b0a240dc4e3e02146707
parent0fa08d953e0d5497fe5366836d0ed54b9ff557d8 (diff)
helper: Add error functions for `DeadlineExceeded` codes
Add error functions for the gRPC code `DeadlineExceeded`.
-rw-r--r--internal/helper/error.go9
-rw-r--r--internal/helper/error_test.go10
2 files changed, 19 insertions, 0 deletions
diff --git a/internal/helper/error.go b/internal/helper/error.go
index 517fb1d70..dd3e17f08 100644
--- a/internal/helper/error.go
+++ b/internal/helper/error.go
@@ -26,6 +26,9 @@ func (sw statusWrapper) Unwrap() error {
// ErrCanceled wraps err with codes.Canceled, unless err is already a gRPC error.
func ErrCanceled(err error) error { return wrapError(codes.Canceled, err) }
+// ErrDeadlineExceeded wraps err with codes.DeadlineExceeded, unless err is already a gRPC error.
+func ErrDeadlineExceeded(err error) error { return wrapError(codes.DeadlineExceeded, err) }
+
// ErrInternal wraps err with codes.Internal, unless err is already a gRPC error.
func ErrInternal(err error) error { return wrapError(codes.Internal, err) }
@@ -66,6 +69,12 @@ func ErrCanceledf(format string, a ...interface{}) error {
return formatError(codes.Canceled, format, a...)
}
+// ErrDeadlineExceededf wraps a formatted error with codes.DeadlineExceeded, unless the formatted
+// error is a wrapped gRPC error.
+func ErrDeadlineExceededf(format string, a ...interface{}) error {
+ return formatError(codes.DeadlineExceeded, format, a...)
+}
+
// ErrInternalf wraps a formatted error with codes.Internal, unless the formatted error is a
// wrapped gRPC error.
func ErrInternalf(format string, a ...interface{}) error {
diff --git a/internal/helper/error_test.go b/internal/helper/error_test.go
index 3de56385d..44df756cd 100644
--- a/internal/helper/error_test.go
+++ b/internal/helper/error_test.go
@@ -31,6 +31,11 @@ func TestError(t *testing.T) {
code: codes.Canceled,
},
{
+ desc: "DeadlineExceeded",
+ errorf: ErrDeadlineExceeded,
+ code: codes.DeadlineExceeded,
+ },
+ {
desc: "Internal",
errorf: ErrInternal,
code: codes.Internal,
@@ -104,6 +109,11 @@ func TestErrorf(t *testing.T) {
expectedCode: codes.Canceled,
},
{
+ desc: "DeadlineExceededf",
+ errorf: ErrDeadlineExceededf,
+ expectedCode: codes.DeadlineExceeded,
+ },
+ {
desc: "Internalf",
errorf: ErrInternalf,
expectedCode: codes.Internal,