fixes with linters

Author: rekby

examples/topic/topicwriter/topic_writer_transaction.go

@@ -27,9 +27,7 @@ func CopyMessagesBetweenTopicsTxWriter(
 		if err != nil {
 			return err
 		}
-
 		for _, mess := range batch.Messages {
-
 			if err = writer.Write(ctx, topicwriter.Message{Data: mess}); err != nil {
 				return err
 			}
@@ -69,7 +67,6 @@ func TableAndTopicWithinTransaction(
 		err = writer.Write(ctx, topicwriter.Message{
 			Data: strings.NewReader(fmt.Sprintf("val: %v processed", val)),
 		})
-
 		if err != nil {
 			return err
 		}

internal/grpcwrapper/rawtopic/rawtopiccommon/transaction.go

@@ -2,7 +2,7 @@ package rawtopiccommon
 
 import "github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Topic"
 
-type TransactionIdentity struct { //nolint:revive,stylecheck
+type TransactionIdentity struct {
 	ID      string
 	Session string
 }

internal/query/transaction.go

@@ -395,9 +395,9 @@ func (tx *Transaction) OnCompleted(f baseTx.OnTransactionCompletedFunc) {
 }
 
 func (tx *Transaction) waitOnBeforeCommit(ctx context.Context) (resErr error) {
-
 	tx.onBeforeCommit.Range(func(f *baseTx.OnTransactionBeforeCommit) bool {
 		resErr = (*f)(ctx)
+
 		return resErr == nil
 	})
 

internal/topic/topicclientinternal/client.go

@@ -26,9 +26,7 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
-var (
-	errUnsupportedTransactionType = xerrors.Wrap(errors.New("ydb: unsuppotred transaction type. Use transaction from Driver().Query().DoTx(...)"))
-)
+var errUnsupportedTransactionType = xerrors.Wrap(errors.New("ydb: unsuppotred transaction type. Use transaction from Driver().Query().DoTx(...)")) //nolint:lll
 
 type Client struct {
 	cfg                    topic.Config
@@ -285,7 +283,11 @@ func (c *Client) StartWriter(topicPath string, opts ...topicoptions.WriterOption
 	return topicwriter.NewWriter(writer), nil
 }
 
-func (c *Client) StartTransactionalWriter(transaction tx.Identifier, topicpath string, opts ...topicoptions.WriterOption) (*topicwriter.TxWriter, error) {
+func (c *Client) StartTransactionalWriter(
+	transaction tx.Identifier,
+	topicpath string,
+	opts ...topicoptions.WriterOption,
+) (*topicwriter.TxWriter, error) {
 	internalTx, ok := transaction.(tx.Transaction)
 	if !ok {
 		return nil, xerrors.WithStackTrace(errUnsupportedTransactionType)
@@ -298,10 +300,14 @@ func (c *Client) StartTransactionalWriter(transaction tx.Identifier, topicpath s
 	}
 
 	txWriter := topicwriterinternal.NewTopicWriterTransaction(writer, internalTx, cfg.Tracer)
+
 	return topicwriter.NewTxWriterInternal(txWriter), nil
 }
 
-func (c *Client) createWriterConfig(topicPath string, opts []topicoptions.WriterOption) topicwriterinternal.WriterReconnectorConfig {
+func (c *Client) createWriterConfig(
+	topicPath string,
+	opts []topicoptions.WriterOption,
+) topicwriterinternal.WriterReconnectorConfig {
 	var connector topicwriterinternal.ConnectFunc = func(ctx context.Context) (
 		topicwriterinternal.RawTopicWriterStream,
 		error,
@@ -318,5 +324,6 @@ func (c *Client) createWriterConfig(topicPath string, opts []topicoptions.Writer
 	}
 
 	options = append(options, opts...)
+
 	return topicwriterinternal.NewWriterReconnectorConfig(options...)
 }

internal/topic/topicwriterinternal/writer_reconnector.go

@@ -38,7 +38,7 @@ var (
 	errNoAllowedCodecs       = xerrors.Wrap(errors.New("ydb: no allowed codecs for write to topic"))
 	errLargeMessage          = xerrors.Wrap(errors.New("ydb: message uncompressed size more, then limit"))
 	PublicErrQueueIsFull     = xerrors.Wrap(errors.New("ydb: queue is full"))
-	errDiffetentTransactions = xerrors.Wrap(errors.New("ydb: internal writer has messages from different trasactions. It is internal logic error, write issue please: https://github.com/ydb-platform/ydb-go-sdk/issues/new?assignees=&labels=bug&projects=&template=01_BUG_REPORT.md&title=bug%3A+"))
+	errDiffetentTransactions = xerrors.Wrap(errors.New("ydb: internal writer has messages from different trasactions. It is internal logic error, write issue please: https://github.com/ydb-platform/ydb-go-sdk/issues/new?assignees=&labels=bug&projects=&template=01_BUG_REPORT.md&title=bug%3A+")) //nolint:lll
 
 	// errProducerIDNotEqualMessageGroupID is temporary
 	// WithMessageGroupID is optional parameter because it allowed to be skipped by protocol.
@@ -634,6 +634,7 @@ func (w *WriterReconnector) GetSessionID() (sessionID string) {
 	w.m.WithLock(func() {
 		sessionID = w.sessionID
 	})
+
 	return sessionID
 }
 

internal/tx/transaction.go

@@ -13,14 +13,16 @@ type Transaction interface {
 	SessionID() string
 
 	// OnBeforeCommit add callback, which will be called before commit transaction
-	// the method will be not call the method if some error happen and transaction will not be commited
+	// the method will be not call the method if some error happen and transaction will not be committed
 	OnBeforeCommit(f OnTransactionBeforeCommit)
 	OnCompleted(f OnTransactionCompletedFunc)
 	Rollback(ctx context.Context) error
 }
 
-type OnTransactionBeforeCommit func(ctx context.Context) error
-type OnTransactionCompletedFunc func(transactionResult error)
+type (
+	OnTransactionBeforeCommit  func(ctx context.Context) error
+	OnTransactionCompletedFunc func(transactionResult error)
+)
 
 func AsTransaction(id Identifier) (Transaction, error) {
 	if t, ok := id.(Transaction); ok {

log/topic.go

@@ -709,12 +709,15 @@ func internalTopic(l Logger, d trace.Detailer) (t trace.Topic) {
 			}
 		}
 	}
-	t.OnWriterBeforeCommitTransaction = func(info trace.TopicOnWriterBeforeCommitTransactionStartInfo) func(trace.TopicOnWriterBeforeCommitTransactionDoneInfo) {
+	t.OnWriterBeforeCommitTransaction = func(
+		info trace.TopicOnWriterBeforeCommitTransactionStartInfo,
+	) func(trace.TopicOnWriterBeforeCommitTransactionDoneInfo) {
 		if d.Details()&trace.TopicWriterStreamLifeCycleEvents == 0 {
 			return nil
 		}
 
 		start := time.Now()
+
 		return func(doneInfo trace.TopicOnWriterBeforeCommitTransactionDoneInfo) {
 			ctx := with(*info.Ctx, TRACE, "ydb", "topic", "writer", "beforecommit")
 			l.Log(ctx, "wait of flush messages before commit transaction",
@@ -726,8 +729,11 @@ func internalTopic(l Logger, d trace.Detailer) (t trace.Topic) {
 			)
 		}
 	}
-	t.OnWriterAfterFinishTransaction = func(info trace.TopicOnWriterAfterFinishTransactionStartInfo) func(trace.TopicOnWriterAfterFinishTransactionDoneInfo) {
+	t.OnWriterAfterFinishTransaction = func(
+		info trace.TopicOnWriterAfterFinishTransactionStartInfo,
+	) func(trace.TopicOnWriterAfterFinishTransactionDoneInfo) {
 		start := time.Now()
+
 		return func(doneInfo trace.TopicOnWriterAfterFinishTransactionDoneInfo) {
 			ctx := with(context.Background(), TRACE, "ydb", "topic", "writer", "beforecommit")
 			l.Log(ctx, "close writer after transaction finished",

topic/client.go

@@ -52,5 +52,9 @@ type Client interface {
 	// StartTransactionalWriter start writer for write messages within transaction
 	//
 	// Experimental: https://github.com/ydb-platform/ydb-go-sdk/blob/master/VERSIONING.md#experimental
-	StartTransactionalWriter(tx tx.Identifier, topicpath string, opts ...topicoptions.WriterOption) (*topicwriter.TxWriter, error)
+	StartTransactionalWriter(
+		tx tx.Identifier,
+		topicpath string,
+		opts ...topicoptions.WriterOption,
+	) (*topicwriter.TxWriter, error)
 }

topic/topicwriter/topicwriter.go

@@ -2,9 +2,6 @@ package topicwriter
 
 import (
 	"context"
-	"errors"
-
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicwriterinternal"
 )
@@ -13,10 +10,7 @@ type (
 	Message = topicwriterinternal.PublicMessage
 )
 
-var (
-	ErrQueueLimitExceed = topicwriterinternal.PublicErrQueueIsFull
-	errBadTxId          = xerrors.Wrap(errors.New("ydb: bad transaction type, supported transactions from query service only"))
-)
+var ErrQueueLimitExceed = topicwriterinternal.PublicErrQueueIsFull
 
 // Writer represent write session to topic
 // It handles connection problems, reconnect to server when need and resend buffered messages

topic/topicwriter/write_options.go

@@ -1,28 +1,7 @@
 package topicwriter
 
-import "github.com/ydb-platform/ydb-go-sdk/v3/internal/tx"
-
-type writeOptions struct {
-	transaction tx.Identifier
-	commit      bool
-}
+type writeOptions struct{}
 
 type WriteOption interface {
 	applyWriteOption(options *writeOptions)
 }
-
-type writeOptionWithTx struct {
-	tx tx.Identifier
-}
-
-func (o writeOptionWithTx) applyWriteOption(options *writeOptions) {
-	options.transaction = o.tx
-}
-
-type writeOptionCommitTx struct {
-	commit bool
-}
-
-func (o writeOptionCommitTx) applyWriteOption(options *writeOptions) {
-	options.commit = o.commit
-}

trace/topic.go

@@ -113,10 +113,16 @@ type (
 		OnWriterInitStream func(TopicWriterInitStreamStartInfo) func(TopicWriterInitStreamDoneInfo)
 		// Internals: https://github.com/ydb-platform/ydb-go-sdk/blob/master/VERSIONING.md#internals
 		OnWriterClose func(TopicWriterCloseStartInfo) func(TopicWriterCloseDoneInfo)
+
 		// Internals: https://github.com/ydb-platform/ydb-go-sdk/blob/master/VERSIONING.md#internals
-		OnWriterBeforeCommitTransaction func(TopicOnWriterBeforeCommitTransactionStartInfo) func(TopicOnWriterBeforeCommitTransactionDoneInfo)
+		OnWriterBeforeCommitTransaction func(
+			TopicOnWriterBeforeCommitTransactionStartInfo,
+		) func(TopicOnWriterBeforeCommitTransactionDoneInfo)
+
 		// Internals: https://github.com/ydb-platform/ydb-go-sdk/blob/master/VERSIONING.md#internals
-		OnWriterAfterFinishTransaction func(TopicOnWriterAfterFinishTransactionStartInfo) func(TopicOnWriterAfterFinishTransactionDoneInfo)
+		OnWriterAfterFinishTransaction func(
+			TopicOnWriterAfterFinishTransactionStartInfo,
+		) func(TopicOnWriterAfterFinishTransactionDoneInfo)
 
 		// TopicWriterStreamEvents