Merge branch 'master' into tagliatelle

Author: asmyasnikov

.golangci.yml

@@ -238,18 +238,15 @@ linters:
     - ireturn
     - maintidx
     - maligned
-    - nakedret
     - nilerr
     - nlreturn
-    - noctx
     - nonamedreturns
     - nosnakecase
     - paralleltest
     - promlinter
     - protogetter
     - scopelint
     - structcheck
-    - tagalign
     - testableexamples
     - testifylint
     - testpackage

examples/pagination/cities.go

@@ -69,7 +69,7 @@ func selectPaging(
 			}()
 			if !res.NextResultSet(ctx) || !res.HasNextRow() {
 				empty = true
-				return
+				return res.Err()
 			}
 			var addr string
 			for res.NextRow() {
@@ -86,10 +86,7 @@ func selectPaging(
 			return res.Err()
 		},
 	)
-	if err != nil {
-		return
-	}
-	return empty, nil
+	return empty, err
 }
 
 func fillTableWithData(ctx context.Context, c table.Client, prefix string) (err error) {

examples/serverless/healthcheck/service.go

@@ -90,15 +90,15 @@ func (s *service) createTableIfNotExists(ctx context.Context) error {
 	)
 }
 
-func (s *service) ping(path string) (code int32, err error) {
+func (s *service) ping(ctx context.Context, path string) (code int32, err error) {
 	uri, err := url.Parse(path)
 	if err != nil {
 		return -1, err
 	}
 	if uri.Scheme == "" {
 		uri.Scheme = "http"
 	}
-	request, err := http.NewRequest(http.MethodGet, uri.String(), nil) //nolint:gocritic
+	request, err := http.NewRequestWithContext(ctx, http.MethodGet, uri.String(), nil) //nolint:gocritic
 	if err != nil {
 		return -1, err
 	}
@@ -130,7 +130,7 @@ func (s *service) check(ctx context.Context, urls []string) error {
 			go func(idx int, u string) {
 				defer wg.Done()
 				out := " > '" + u + "' => "
-				code, err := s.ping(u)
+				code, err := s.ping(ctx, u)
 				if err != nil {
 					fmt.Println(out + err.Error())
 				} else {

tests/slo/internal/generator/row.go

@@ -6,9 +6,9 @@ type RowID = uint64
 
 type Row struct {
 	Hash             uint64     `gorm:"column:hash;primarykey;autoIncrement:false" xorm:"pk 'hash'"`
-	ID               RowID      `gorm:"column:id;primarykey;autoIncrement:false" xorm:"pk 'id'"`
-	PayloadStr       *string    `gorm:"column:payload_str" xorm:"'payload_str'"`
-	PayloadDouble    *float64   `gorm:"column:payload_double" xorm:"'payload_double'"`
-	PayloadTimestamp *time.Time `gorm:"column:payload_timestamp" xorm:"'payload_timestamp'"`
-	PayloadHash      uint64     `gorm:"column:payload_hash" xorm:"'payload_hash'"`
+	ID               RowID      `gorm:"column:id;primarykey;autoIncrement:false" xorm:"pk 'id'"` //nolint:tagalign
+	PayloadStr       *string    `gorm:"column:payload_str" xorm:"'payload_str'"`                 //nolint:tagalign
+	PayloadDouble    *float64   `gorm:"column:payload_double" xorm:"'payload_double'"`           //nolint:tagalign
+	PayloadTimestamp *time.Time `gorm:"column:payload_timestamp" xorm:"'payload_timestamp'"`     //nolint:tagalign
+	PayloadHash      uint64     `gorm:"column:payload_hash" xorm:"'payload_hash'"`               //nolint:tagalign
 }