From 55a15123a6e3822a04d17bf40beafadd5a94eade Mon Sep 17 00:00:00 2001 From: Karthik Nayak Date: Wed, 29 Nov 2023 18:43:55 +0100 Subject: errors: Fix format directive for two errors There are 2 instances in our code base where we have two errors and want to merge them. While the best fix would be to use `errors.Join()`, for now, let's just fix the type so that the linter doesn't barf. --- internal/praefect/middleware/errorhandler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'internal/praefect') diff --git a/internal/praefect/middleware/errorhandler.go b/internal/praefect/middleware/errorhandler.go index 8dbba24de..738f9c1ed 100644 --- a/internal/praefect/middleware/errorhandler.go +++ b/internal/praefect/middleware/errorhandler.go @@ -18,8 +18,8 @@ func StreamErrorHandler(registry *protoregistry.Registry, errorTracker tracker.E mi, lookupErr := registry.LookupMethod(method) if err != nil { - //nolint:gitaly-linters - return nil, fmt.Errorf("error when looking up method: %w %v", err, lookupErr) + // TODO: use errors.Join() to combine errors instead + return nil, fmt.Errorf("error when looking up method: %w %s", err, lookupErr.Error()) } return newCatchErrorStreamer(stream, errorTracker, mi.Operation, nodeStorage), err -- cgit v1.2.3