refactor: linters

ImpressionableRaccoon · ImpressionableRaccoon · commit 83e97654d710 · 2023-06-05T16:17:41.000+03:00
diff --git a/tests/slo/database/sql/storage.go b/tests/slo/database/sql/storage.go
@@ -169,7 +169,7 @@ func (s *Storage) Write(ctx context.Context, e generator.Row) (attempts int, err
 	ctx, cancel := context.WithTimeout(ctx, time.Duration(s.cfg.WriteTimeout)*time.Millisecond)
 	defer cancel()
 
-	return attempts, retry.Do(ydb.WithTxControl(ctx, writeTx), s.db,
+	err = retry.Do(ydb.WithTxControl(ctx, writeTx), s.db,
 		func(ctx context.Context, cc *sql.Conn) (err error) {
 			if err = ctx.Err(); err != nil {
 				return err
@@ -199,6 +199,8 @@ func (s *Storage) Write(ctx context.Context, e generator.Row) (attempts int, err
 			),
 		),
 	)
+
+	return attempts, err
 }
 
 func (s *Storage) createTable(ctx context.Context) error {
@@ -239,10 +241,16 @@ func (s *Storage) close(ctx context.Context) error {
 	}
 
 	if err := s.db.Close(); err != nil {
-		return err
+		return fmt.Errorf("error close database/sql driver: %w", err)
 	}
+
 	if err := s.c.Close(); err != nil {
-		return err
+		return fmt.Errorf("error close connector: %w", err)
 	}
-	return s.cc.Close(ctx)
+
+	if err := s.cc.Close(ctx); err != nil {
+		return fmt.Errorf("error close ydb driver: %w", err)
+	}
+
+	return nil
 }
diff --git a/tests/slo/gorm/storage.go b/tests/slo/gorm/storage.go
@@ -100,7 +100,7 @@ func (s *Storage) Read(ctx context.Context, id generator.RowID) (r generator.Row
 		return generator.Row{}, attempts, err
 	}
 
-	return r, attempts, retry.Do(ydbSDK.WithTxControl(ctx, readTx), db,
+	err = retry.Do(ydbSDK.WithTxControl(ctx, readTx), db,
 		func(ctx context.Context, cc *sql.Conn) (err error) {
 			if err = ctx.Err(); err != nil {
 				return err
@@ -135,6 +135,8 @@ func (s *Storage) Read(ctx context.Context, id generator.RowID) (r generator.Row
 			),
 		),
 	)
+
+	return r, attempts, err
 }
 
 func (s *Storage) Write(ctx context.Context, row generator.Row) (attempts int, err error) {
@@ -150,7 +152,7 @@ func (s *Storage) Write(ctx context.Context, row generator.Row) (attempts int, e
 		return attempts, err
 	}
 
-	return attempts, retry.Do(ydbSDK.WithTxControl(ctx, writeTx), db,
+	err = retry.Do(ydbSDK.WithTxControl(ctx, writeTx), db,
 		func(ctx context.Context, cc *sql.Conn) (err error) {
 			if err = ctx.Err(); err != nil {
 				return err
@@ -183,6 +185,8 @@ func (s *Storage) Write(ctx context.Context, row generator.Row) (attempts int, e
 			),
 		),
 	)
+
+	return attempts, err
 }
 
 func (s *Storage) createTable(ctx context.Context) error {
diff --git a/tests/slo/native/storage.go b/tests/slo/native/storage.go
@@ -106,7 +106,7 @@ func (s *Storage) Read(ctx context.Context, entryID generator.RowID) (_ generato
 
 	e := generator.Row{}
 
-	return e, attempts, s.db.Table().Do(ctx,
+	err = s.db.Table().Do(ctx,
 		func(ctx context.Context, session table.Session) (err error) {
 			if err = ctx.Err(); err != nil {
 				return err
@@ -157,17 +157,19 @@ func (s *Storage) Read(ctx context.Context, entryID generator.RowID) (_ generato
 			},
 		}),
 	)
+
+	return e, attempts, err
 }
 
-func (s *Storage) Write(ctx context.Context, e generator.Row) (attempts int, err error) {
+func (s *Storage) Write(ctx context.Context, e generator.Row) (attempts int, _ error) {
 	if err := ctx.Err(); err != nil {
 		return attempts, err
 	}
 
 	ctx, cancel := context.WithTimeout(ctx, time.Duration(s.cfg.WriteTimeout)*time.Millisecond)
 	defer cancel()
 
-	return attempts, s.db.Table().Do(ctx,
+	err := s.db.Table().Do(ctx,
 		func(ctx context.Context, session table.Session) error {
 			if err := ctx.Err(); err != nil {
 				return err
@@ -203,6 +205,8 @@ func (s *Storage) Write(ctx context.Context, e generator.Row) (attempts int, err
 			},
 		}),
 	)
+
+	return attempts, err
 }
 
 func (s *Storage) createTable(ctx context.Context) error {
diff --git a/tests/slo/xorm/storage.go b/tests/slo/xorm/storage.go
@@ -217,19 +217,19 @@ func (s *Storage) close(ctx context.Context) error {
 	}
 
 	if err := s.x.Context(ctx).Close(); err != nil {
-		return fmt.Errorf("close sessions pool error: %w", err)
+		return fmt.Errorf("error close sessions pool: %w", err)
 	}
 
 	if err := s.db.Close(); err != nil {
-		return fmt.Errorf("close database/sql driver error: %w", err)
+		return fmt.Errorf("error close database/sql driver: %w", err)
 	}
 
 	if err := s.c.Close(); err != nil {
-		return fmt.Errorf("close connector error: %w", err)
+		return fmt.Errorf("error close connector: %w", err)
 	}
 
 	if err := s.cc.Close(ctx); err != nil {
-		return fmt.Errorf("close ydb driver error: %w", err)
+		return fmt.Errorf("error close ydb driver: %w", err)
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ func (s *Storage) Write(ctx context.Context, e generator.Row) (attempts int, err`
`169`	`169`	`ctx, cancel := context.WithTimeout(ctx, time.Duration(s.cfg.WriteTimeout)*time.Millisecond)`
`170`	`170`	`defer cancel()`
`171`	`171`
`172`		`- return attempts, retry.Do(ydb.WithTxControl(ctx, writeTx), s.db,`
	`172`	`+ err = retry.Do(ydb.WithTxControl(ctx, writeTx), s.db,`
`173`	`173`	`func(ctx context.Context, cc *sql.Conn) (err error) {`
`174`	`174`	`if err = ctx.Err(); err != nil {`
`175`	`175`	`return err`
`@@ -199,6 +199,8 @@ func (s *Storage) Write(ctx context.Context, e generator.Row) (attempts int, err`
`199`	`199`	`),`
`200`	`200`	`),`
`201`	`201`	`)`
	`202`	`+`
	`203`	`+ return attempts, err`
`202`	`204`	`}`
`203`	`205`
`204`	`206`	`func (s *Storage) createTable(ctx context.Context) error {`
`@@ -239,10 +241,16 @@ func (s *Storage) close(ctx context.Context) error {`
`239`	`241`	`}`
`240`	`242`
`241`	`243`	`if err := s.db.Close(); err != nil {`
`242`		`- return err`
	`244`	`+ return fmt.Errorf("error close database/sql driver: %w", err)`
`243`	`245`	`}`
	`246`	`+`
`244`	`247`	`if err := s.c.Close(); err != nil {`
`245`		`- return err`
	`248`	`+ return fmt.Errorf("error close connector: %w", err)`
`246`	`249`	`}`
`247`		`- return s.cc.Close(ctx)`
	`250`	`+`
	`251`	`+ if err := s.cc.Close(ctx); err != nil {`
	`252`	`+ return fmt.Errorf("error close ydb driver: %w", err)`
	`253`	`+ }`
	`254`	`+`
	`255`	`+ return nil`
`248`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func (s *Storage) Read(ctx context.Context, id generator.RowID) (r generator.Row`
`100`	`100`	`return generator.Row{}, attempts, err`
`101`	`101`	`}`
`102`	`102`
`103`		`- return r, attempts, retry.Do(ydbSDK.WithTxControl(ctx, readTx), db,`
	`103`	`+ err = retry.Do(ydbSDK.WithTxControl(ctx, readTx), db,`
`104`	`104`	`func(ctx context.Context, cc *sql.Conn) (err error) {`
`105`	`105`	`if err = ctx.Err(); err != nil {`
`106`	`106`	`return err`
`@@ -135,6 +135,8 @@ func (s *Storage) Read(ctx context.Context, id generator.RowID) (r generator.Row`
`135`	`135`	`),`
`136`	`136`	`),`
`137`	`137`	`)`
	`138`	`+`
	`139`	`+ return r, attempts, err`
`138`	`140`	`}`
`139`	`141`
`140`	`142`	`func (s *Storage) Write(ctx context.Context, row generator.Row) (attempts int, err error) {`
`@@ -150,7 +152,7 @@ func (s *Storage) Write(ctx context.Context, row generator.Row) (attempts int, e`
`150`	`152`	`return attempts, err`
`151`	`153`	`}`
`152`	`154`
`153`		`- return attempts, retry.Do(ydbSDK.WithTxControl(ctx, writeTx), db,`
	`155`	`+ err = retry.Do(ydbSDK.WithTxControl(ctx, writeTx), db,`
`154`	`156`	`func(ctx context.Context, cc *sql.Conn) (err error) {`
`155`	`157`	`if err = ctx.Err(); err != nil {`
`156`	`158`	`return err`
`@@ -183,6 +185,8 @@ func (s *Storage) Write(ctx context.Context, row generator.Row) (attempts int, e`
`183`	`185`	`),`
`184`	`186`	`),`
`185`	`187`	`)`
	`188`	`+`
	`189`	`+ return attempts, err`
`186`	`190`	`}`
`187`	`191`
`188`	`192`	`func (s *Storage) createTable(ctx context.Context) error {`
Original file line number	Diff line number	Diff line change
`@@ -217,19 +217,19 @@ func (s *Storage) close(ctx context.Context) error {`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`if err := s.x.Context(ctx).Close(); err != nil {`
`220`		`- return fmt.Errorf("close sessions pool error: %w", err)`
	`220`	`+ return fmt.Errorf("error close sessions pool: %w", err)`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`if err := s.db.Close(); err != nil {`
`224`		`- return fmt.Errorf("close database/sql driver error: %w", err)`
	`224`	`+ return fmt.Errorf("error close database/sql driver: %w", err)`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`if err := s.c.Close(); err != nil {`
`228`		`- return fmt.Errorf("close connector error: %w", err)`
	`228`	`+ return fmt.Errorf("error close connector: %w", err)`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`if err := s.cc.Close(ctx); err != nil {`
`232`		`- return fmt.Errorf("close ydb driver error: %w", err)`
	`232`	`+ return fmt.Errorf("error close ydb driver: %w", err)`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`return nil`