Merge pull request #1031 from NovruzovE/master

Enable maligned linter

Author: asmyasnikov

.golangci.yml

@@ -240,7 +240,6 @@ linters:
     - interfacebloat
     - ireturn
     - maintidx
-    - maligned
     - nonamedreturns
     - paralleltest
     - scopelint

driver.go

@@ -50,7 +50,7 @@ import (
 var _ Connection = (*Driver)(nil)
 
 // Driver type provide access to YDB service clients
-type Driver struct { //nolint:maligned
+type Driver struct {
 	ctx       context.Context // cancel while Driver.Close called.
 	ctxCancel context.CancelFunc
 

internal/background/worker.go

@@ -19,19 +19,15 @@ var (
 
 // A Worker must not be copied after first use
 type Worker struct {
-	ctx      context.Context
-	workers  sync.WaitGroup
-	onceInit sync.Once
-
+	ctx            context.Context
+	workers        sync.WaitGroup
+	closeReason    error
 	tasksCompleted empty.Chan
-
-	m xsync.Mutex
-
-	tasks chan backgroundTask
-
-	closed      bool
-	stop        context.CancelFunc
-	closeReason error
+	tasks          chan backgroundTask
+	stop           context.CancelFunc
+	onceInit       sync.Once
+	m              xsync.Mutex
+	closed         bool
 }
 
 type CallbackFunc func(ctx context.Context)

internal/coordination/config/config.go

@@ -6,8 +6,6 @@ import (
 )
 
 // Config is an configuration of coordination client
-//
-//nolint:maligned
 type Config struct {
 	config.Common
 

internal/grpcwrapper/rawtopic/rawtopicreader/messages.go

@@ -90,11 +90,11 @@ type UpdateTokenRequest struct {
 }
 
 type UpdateTokenResponse struct {
+	rawtopiccommon.UpdateTokenResponse
+
 	serverMessageImpl
 
 	rawtopiccommon.ServerMessageMetadata
-
-	rawtopiccommon.UpdateTokenResponse
 }
 
 //

internal/grpcwrapper/rawtopic/rawtopicwriter/messages.go

@@ -303,9 +303,9 @@ type UpdateTokenRequest struct {
 }
 
 type UpdateTokenResponse struct {
+	rawtopiccommon.UpdateTokenResponse
+
 	serverMessageImpl
 
 	rawtopiccommon.ServerMessageMetadata
-
-	rawtopiccommon.UpdateTokenResponse
 }

internal/ratelimiter/config/config.go

@@ -6,8 +6,6 @@ import (
 )
 
 // Config is a configuration of ratelimiter client
-//
-//nolint:maligned
 type Config struct {
 	config.Common
 

internal/scheme/config/config.go

@@ -6,8 +6,6 @@ import (
 )
 
 // Config is a configuration of scheme client
-//
-//nolint:maligned
 type Config struct {
 	config.Common
 

internal/table/session.go

@@ -45,17 +45,15 @@ import (
 // Note that after session is no longer needed it should be destroyed by
 // Close() call.
 type session struct {
+	onClose      []func(s *session)
 	id           string
 	tableService Ydb_Table_V1.TableServiceClient
+	status       table.SessionStatus
 	config       *config.Config
-
-	status    table.SessionStatus
-	statusMtx sync.RWMutex
-	nodeID    atomic.Uint32
-	lastUsage atomic.Int64
-
-	onClose   []func(s *session)
-	closeOnce sync.Once
+	lastUsage    atomic.Int64
+	statusMtx    sync.RWMutex
+	closeOnce    sync.Once
+	nodeID       atomic.Uint32
 }
 
 func (s *session) LastUsage() time.Time {

internal/topic/topicreaderinternal/stream_reconnector.go

@@ -29,30 +29,24 @@ var (
 type readerConnectFunc func(ctx context.Context) (batchedStreamReader, error)
 
 type readerReconnector struct {
-	clock      clockwork.Clock
-	background background.Worker
-
-	tracer        *trace.Topic
-	baseContext   context.Context
-	retrySettings topic.RetrySettings
-
-	readerConnect readerConnectFunc
-
-	reconnectFromBadStream chan reconnectRequest
-	connectTimeout         time.Duration
-
-	closeOnce sync.Once
-	readerID  int64
-
-	m                          xsync.RWMutex
-	streamConnectionInProgress empty.Chan // opened if connection in progress, closed if connection established
+	background                 background.Worker
+	clock                      clockwork.Clock
+	baseContext                context.Context
+	retrySettings              topic.RetrySettings
 	streamVal                  batchedStreamReader
 	streamErr                  error
 	closedErr                  error
-
-	initErr    error
-	initDone   bool
-	initDoneCh empty.Chan
+	initErr                    error
+	tracer                     *trace.Topic
+	readerConnect              readerConnectFunc
+	reconnectFromBadStream     chan reconnectRequest
+	connectTimeout             time.Duration
+	readerID                   int64
+	streamConnectionInProgress empty.Chan // opened if connection in progress, closed if connection established
+	initDoneCh                 empty.Chan
+	m                          xsync.RWMutex
+	closeOnce                  sync.Once
+	initDone                   bool
 }
 
 //nolint:revive