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-08-10 13:40:00 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2022-08-11 15:03:14 +0300
commitf5d1a379260156181b599d1b45e162212a67e399 (patch)
tree74dbdb3088f50f8ef109037adc81187cb38b1173
parentac315ef254b265af5323387a1df1abb5d57daa95 (diff)
golangci-lint: Update to v1.48.0
Update golangci-lint to v1.48.0 and fix two warnings it starts to surface due to that update.
-rw-r--r--Makefile2
-rw-r--r--internal/middleware/featureflag/featureflag_handler_test.go4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 39a7609d4..b62d3a494 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ ifdef GITALY_TESTING_ENABLE_SHA256
endif
# Dependency versions
-GOLANGCI_LINT_VERSION ?= v1.46.2
+GOLANGCI_LINT_VERSION ?= v1.48.0
PROTOLINT_VERSION ?= v0.38.1
GOCOVER_COBERTURA_VERSION ?= aaee18c8195c3f2d90e5ef80ca918d265463842a
GOFUMPT_VERSION ?= v0.3.1
diff --git a/internal/middleware/featureflag/featureflag_handler_test.go b/internal/middleware/featureflag/featureflag_handler_test.go
index 55e8f774a..8d1a4ec8f 100644
--- a/internal/middleware/featureflag/featureflag_handler_test.go
+++ b/internal/middleware/featureflag/featureflag_handler_test.go
@@ -47,7 +47,7 @@ func TestStreamInterceptor(t *testing.T) {
}
func callUnary(ctx context.Context) {
- // nolint: errcheck
+ //nolint: errcheck
UnaryInterceptor(ctx, nil, nil, func(context.Context, interface{}) (interface{}, error) {
ctxlogrus.Extract(ctx).Info("verify")
return nil, nil
@@ -55,7 +55,7 @@ func callUnary(ctx context.Context) {
}
func callStream(ctx context.Context) {
- // nolint: errcheck
+ //nolint: errcheck
StreamInterceptor(ctx, &grpcmw.WrappedServerStream{WrappedContext: ctx}, nil, func(interface{}, grpc.ServerStream) error {
ctxlogrus.Extract(ctx).Info("verify")
return nil