From 8b70f969b6f1bf25d6ffe4f6d90d9f34b6999bf4 Mon Sep 17 00:00:00 2001
From: Egon Elbre <egonelbre@gmail.com>
Date: Tue, 11 Oct 2022 14:47:02 +0300
Subject: [PATCH] all: fix nolint directives

Change-Id: I261c8b12e4961e6401cc4024fa5abc35b1a5efa6
---
 private/post/message.go                  | 2 +-
 satellite/audit/verifier_test.go         | 3 ++-
 satellite/metabase/bench_expired_test.go | 2 +-
 satellite/metabase/bench_test.go         | 2 +-
 satellite/repair/repair_test.go          | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/private/post/message.go b/private/post/message.go
index 7feca45bc..90b2ce497 100644
--- a/private/post/message.go
+++ b/private/post/message.go
@@ -49,7 +49,7 @@ func (msg *Message) Bytes() (data []byte, err error) {
 	fmt.Fprintf(&body, "Subject: %v\r\n", mime.QEncoding.Encode("utf-8", msg.Subject))
 	fmt.Fprintf(&body, "From: %s\r\n", &msg.From)
 	for _, to := range msg.To {
-		fmt.Fprintf(&body, "To: %s\r\n", &to) // nolint:scopelint
+		fmt.Fprintf(&body, "To: %s\r\n", &to) //nolint:scopelint
 	}
 	for _, recipient := range msg.ReceiptTo {
 		fmt.Fprintf(&body, "Disposition-Notification-To: <%v>\r\n", mime.QEncoding.Encode("utf-8", recipient))
diff --git a/satellite/audit/verifier_test.go b/satellite/audit/verifier_test.go
index 1a7f8649a..30399ca8c 100644
--- a/satellite/audit/verifier_test.go
+++ b/satellite/audit/verifier_test.go
@@ -1044,7 +1044,8 @@ func TestAuditRepairedSegmentInExcludedCountries(t *testing.T) {
 }
 
 // getRemoteSegment returns a remote pointer its path from satellite.
-// nolint:golint
+//
+//nolint:golint
 func getRemoteSegment(
 	ctx context.Context, t *testing.T, satellite *testplanet.Satellite, projectID uuid.UUID, bucketName string,
 ) (_ metabase.Segment, key metabase.SegmentKey) {
diff --git a/satellite/metabase/bench_expired_test.go b/satellite/metabase/bench_expired_test.go
index 2a2b0d7fb..3d89b3dec 100644
--- a/satellite/metabase/bench_expired_test.go
+++ b/satellite/metabase/bench_expired_test.go
@@ -95,7 +95,7 @@ func (s *expiredScenario) name() string {
 
 // run runs the specified scenario.
 //
-// nolint: scopelint // This heavily uses loop variables without goroutines, avoiding these would add lots of boilerplate.
+//nolint:scopelint // This heavily uses loop variables without goroutines, avoiding these would add lots of boilerplate.
 func (s *expiredScenario) run(ctx *testcontext.Context, b *testing.B, db *metabase.DB) {
 	if s.redundancy.IsZero() {
 		s.redundancy = storj.RedundancyScheme{
diff --git a/satellite/metabase/bench_test.go b/satellite/metabase/bench_test.go
index c728ee2b2..65821aa64 100644
--- a/satellite/metabase/bench_test.go
+++ b/satellite/metabase/bench_test.go
@@ -53,7 +53,7 @@ func (s *scenario) name() string {
 
 // run runs the specified scenario.
 //
-// nolint: scopelint // This heavily uses loop variables without goroutines, avoiding these would add lots of boilerplate.
+//nolint:scopelint // This heavily uses loop variables without goroutines, avoiding these would add lots of boilerplate.
 func (s *scenario) run(ctx *testcontext.Context, b *testing.B, db *metabase.DB) {
 	if s.redundancy.IsZero() {
 		s.redundancy = storj.RedundancyScheme{
diff --git a/satellite/repair/repair_test.go b/satellite/repair/repair_test.go
index c0011cb3e..81307aa22 100644
--- a/satellite/repair/repair_test.go
+++ b/satellite/repair/repair_test.go
@@ -2337,7 +2337,8 @@ func TestRepairGracefullyExited(t *testing.T) {
 }
 
 // getRemoteSegment returns a remote pointer its path from satellite.
-// nolint:golint
+//
+//nolint:golint
 func getRemoteSegment(
 	ctx context.Context, t *testing.T, satellite *testplanet.Satellite, projectID uuid.UUID, bucketName string,
 ) (_ metabase.Segment, key metabase.SegmentKey) {