all: fix linter complaints

Change-Id: Ia01404dbb6bdd19a146fa10ff7302e08f87a8c95

cmd/storj-admin/main.go

@@ -31,7 +31,6 @@ var (
 	runCmd = &cobra.Command{
 		Use:   "run",
 		Short: "Run the storj-admin",
-		//RunE:  cmdRun,
 	}
 	confDir string
 

cmd/storj-sim/prefix.go

@@ -100,7 +100,8 @@ func (writer *prefixWriter) Write(data []byte) (int, error) {
 
 	// buffer everything that hasn't been written yet
 	if len(writer.buffer) > 0 {
-		buffer = append(writer.buffer, data...) // nolint gocritic
+		buffer = writer.buffer
+		buffer = append(buffer, data...)
 		defer func() {
 			writer.buffer = buffer
 		}()

private/migrate/versions_test.go

@@ -59,7 +59,7 @@ func TestBasicMigration(t *testing.T) {
 }
 
 func basicMigration(ctx *testcontext.Context, t *testing.T, db tagsql.DB, testDB tagsql.DB) {
-	dbName := strings.ToLower(`versions_` + strings.Replace(t.Name(), "/", "_", -1))
+	dbName := strings.ToLower(`versions_` + strings.ReplaceAll(t.Name(), "/", "_"))
 	defer func() { assert.NoError(t, dropTables(ctx, db, dbName, "users")) }()
 
 	/* #nosec G306 */ // This is a test besides the file contains just test data.

private/post/message.go

@@ -123,7 +123,7 @@ func (msg *Message) Bytes() (data []byte, err error) {
 }
 
 func tocrlf(data []byte) []byte {
-	lf := bytes.Replace(data, []byte("\r\n"), []byte("\n"), -1)
-	crlf := bytes.Replace(lf, []byte("\n"), []byte("\r\n"), -1)
+	lf := bytes.ReplaceAll(data, []byte("\r\n"), []byte("\n"))
+	crlf := bytes.ReplaceAll(lf, []byte("\n"), []byte("\r\n"))
 	return crlf
 }

private/web/ratelimiter_test.go

@@ -24,6 +24,7 @@ func TestNewIPRateLimiter(t *testing.T) {
 	cfgstruct.Bind(&pflag.FlagSet{}, &config, cfgstruct.UseDevDefaults())
 	config.NumLimits = 2
 	rateLimiter := web.NewIPRateLimiter(config)
+
 	// run ratelimiter cleanup until end of test
 	ctx := testcontext.New(t)
 	defer ctx.Cleanup()
@@ -33,10 +34,12 @@ func TestNewIPRateLimiter(t *testing.T) {
 		rateLimiter.Run(ctx2)
 		return nil
 	})
+
 	// make the default HTTP handler return StatusOK
 	handler := rateLimiter.Limit(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
 	}))
+
 	// expect burst number of successes
 	testWithAddress(t, "192.168.1.1:5000", rateLimiter.Burst(), handler)
 	// expect similar results for a different IP
@@ -52,12 +55,14 @@ func testWithAddress(t *testing.T, remoteAddress string, burst int, handler http
 	req, err := http.NewRequest("GET", "", nil)
 	require.NoError(t, err)
 	req.RemoteAddr = remoteAddress
+
 	// expect burst number of successes
 	for x := 0; x < burst; x++ {
 		rr := httptest.NewRecorder()
 		handler.ServeHTTP(rr, req)
 		assert.Equal(t, rr.Code, http.StatusOK, remoteAddress)
 	}
+
 	// then expect failure
 	rr := httptest.NewRecorder()
 	handler.ServeHTTP(rr, req)

satellite/admin/project_test.go

@@ -538,7 +538,7 @@ func TestDeleteProjectWithUsagePreviousMonth(t *testing.T) {
 		err = planet.Satellites[0].DB.Console().APIKeys().Delete(ctx, apiKeys.APIKeys[0].ID)
 		require.NoError(t, err)
 
-		//ToDo: Improve updating of DB entries
+		// TODO: Improve updating of DB entries
 		now := time.Now().UTC()
 		// set fixed day to avoid failures at the end of the month
 		accTime := time.Date(now.Year(), now.Month()-1, 15, now.Hour(), now.Minute(), now.Second(), now.Nanosecond(), time.UTC)

satellite/console/projects_test.go

@@ -21,7 +21,6 @@ import (
 )
 
 func TestProjectsRepository(t *testing.T) {
-	//testing constants
 	const (
 		// for user
 		shortName    = "lastName"
@@ -195,7 +194,7 @@ func TestProjectsList(t *testing.T) {
 
 		projectsDB := db.Console().Projects()
 
-		//create projects
+		// Create projects
 		var projects []console.Project
 		for i := 0; i < length; i++ {
 			proj, err := projectsDB.Insert(ctx,

satellite/console/resetpasswordtoken_test.go

@@ -16,9 +16,7 @@ import (
 )
 
 func TestNewRegistrationSecret(t *testing.T) {
-	// testing constants
 	const (
-		// for user
 		shortName    = "lastName"
 		email        = "email@mail.test"
 		pass         = "123456"

satellite/console/service.go

@@ -227,7 +227,7 @@ func (paymentService PaymentsService) AddCreditCard(ctx context.Context, creditC
 		return nil
 	}
 
-	//ToDo: check if this is the right place
+	// TODO: check if this is the right place
 	err = paymentService.AddPromotionalCoupon(ctx, auth.User.ID)
 	if err != nil {
 		paymentService.service.log.Warn(fmt.Sprintf("could not add promotional coupon for user %s", auth.User.ID.String()), zap.Error(err))
@@ -719,7 +719,7 @@ func (s *Service) ActivateAccount(ctx context.Context, activationToken string) (
 		return nil
 	}
 
-	//ToDo: check if this is the right place
+	// TODO: check if this is the right place
 	err = s.accounts.Coupons().AddPromotionalCoupon(ctx, user.ID)
 	if err != nil {
 		s.log.Debug(fmt.Sprintf("could not add promotional coupon for user %s", user.ID.String()), zap.Error(Error.Wrap(err)))

satellite/console/users_test.go

@@ -17,7 +17,6 @@ import (
 	"storj.io/storj/satellite/satellitedb/satellitedbtest"
 )
 
-//testing constants.
 const (
 	lastName    = "lastName"
 	email       = "email@mail.test"

satellite/satellitedb/apikeys.go

@@ -28,7 +28,7 @@ type apikeys struct {
 func (keys *apikeys) GetPagedByProjectID(ctx context.Context, projectID uuid.UUID, cursor console.APIKeyCursor) (akp *console.APIKeyPage, err error) {
 	defer mon.Task()(&ctx)(&err)
 
-	search := "%" + strings.Replace(cursor.Search, " ", "%", -1) + "%"
+	search := "%" + strings.ReplaceAll(cursor.Search, " ", "%") + "%"
 
 	if cursor.Limit > 50 {
 		cursor.Limit = 50

satellite/satellitedb/projectmembers.go

@@ -38,7 +38,7 @@ func (pm *projectMembers) GetByMemberID(ctx context.Context, memberID uuid.UUID)
 func (pm *projectMembers) GetPagedByProjectID(ctx context.Context, projectID uuid.UUID, cursor console.ProjectMembersCursor) (_ *console.ProjectMembersPage, err error) {
 	defer mon.Task()(&ctx)(&err)
 
-	search := "%" + strings.Replace(cursor.Search, " ", "%", -1) + "%"
+	search := "%" + strings.ReplaceAll(cursor.Search, " ", "%") + "%"
 
 	if cursor.Limit > 50 {
 		cursor.Limit = 50

satellite/satellitedb/repairqueue.go

@@ -120,7 +120,7 @@ func (r *repairQueue) SelectN(ctx context.Context, limit int) (segs []pb.Injured
 	if limit <= 0 || limit > RepairQueueSelectLimit {
 		limit = RepairQueueSelectLimit
 	}
-	//todo: strictly enforce order-by or change tests
+	// TODO: strictly enforce order-by or change tests
 	rows, err := r.db.QueryContext(ctx, r.db.Rebind(`SELECT data FROM injuredsegments LIMIT ?`), limit)
 	if err != nil {
 		return nil, Error.Wrap(err)

storagenode/peer.go

@@ -456,7 +456,7 @@ func New(log *zap.Logger, full *identity.FullIdentity, db DB, revocationDB exten
 			peer.Contact.Service,
 			peer.DB.Bandwidth(),
 			config.Storage.AllocatedDiskSpace.Int64(),
-			//TODO use config.Storage.Monitor.Interval, but for some reason is not set
+			// TODO: use config.Storage.Monitor.Interval, but for some reason is not set
 			config.Storage.KBucketRefreshInterval,
 			peer.Contact.Chore.Trigger,
 			config.Storage2.Monitor,

storagenode/pieces/cache.go

@@ -199,8 +199,7 @@ func (blobs *BlobsUsageCache) SpaceUsedBySatellite(ctx context.Context, satellit
 	return values.Total, values.ContentSize, nil
 }
 
-// SpaceUsedForPieces returns the current total used space for
-//// all pieces.
+// SpaceUsedForPieces returns the current total used space for all pieces.
 func (blobs *BlobsUsageCache) SpaceUsedForPieces(ctx context.Context) (int64, int64, error) {
 	blobs.mu.Lock()
 	defer blobs.mu.Unlock()

storagenode/piecestore/endpoint.go

@@ -122,7 +122,7 @@ var monLiveRequests = mon.TaskNamed("live-request")
 
 // Delete handles deleting a piece on piece store requested by uplink.
 //
-// DEPRECATED in favor of DeletePieces.
+// Deprecated: use DeletePieces instead.
 func (endpoint *Endpoint) Delete(ctx context.Context, delete *pb.PieceDeleteRequest) (_ *pb.PieceDeleteResponse, err error) {
 	defer monLiveRequests(&ctx)(&err)
 	defer mon.Task()(&ctx)(&err)

storagenode/piecestore/verification_test.go

@@ -259,8 +259,8 @@ func TestOrderLimitGetValidation(t *testing.T) {
 			closeErr := downloader.Close()
 			err = errs.Combine(readErr, closeErr)
 			if tt.err != "" {
-				assert.Equal(t, 0, len(buffer)) //errors 10240
-				require.Error(t, err)           //nil
+				assert.Equal(t, 0, len(buffer))
+				require.Error(t, err)
 				require.Contains(t, err.Error(), tt.err)
 			} else {
 				require.NoError(t, err)

storagenode/storagenodedb/storagenodedbtest/run_test.go

@@ -128,7 +128,6 @@ func verifyOrders(t *testing.T, ctx *testcontext.Context, db *storagenodedb.DB,
 	for _, order := range orders {
 		for _, dbOrder := range dbOrders {
 			if order.Order.SerialNumber == dbOrder.Order.SerialNumber {
-				//fmt.Printf("Found %v\n", order.Order.SerialNumber)
 				found++
 			}
 		}

versioncontrol/peer.go

@@ -39,7 +39,8 @@ type Config struct {
 }
 
 // OldVersionConfig provides a list of allowed Versions per process.
-// NB: this will be deprecated in favor of `ProcessesConfig`.
+//
+// NB: use `ProcessesConfig` for newer code instead.
 type OldVersionConfig struct {
 	Satellite   string `user:"true" help:"Allowed Satellite Versions" default:"v0.0.1"`
 	Storagenode string `user:"true" help:"Allowed Storagenode Versions" default:"v0.0.1"`