Chore: Upgrade golangci-lint to v1.51.2 (#63630)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
This commit is contained in:
Emil Tullstedt
2023-02-23 15:10:03 +01:00
committed by GitHub
co-authored by Sofia Papagiannaki
parent c769a6281e
commit 3abaf32cf2
19 changed files with 225 additions and 776 deletions
@@ -74,6 +74,10 @@ func (nps *NotificationPolicyService) UpdatePolicyTree(ctx context.Context, orgI
}
receivers, err := nps.receiversToMap(revision.cfg.AlertmanagerConfig.Receivers)
if err != nil {
return err
}
err = tree.ValidateReceivers(receivers)
if err != nil {
return fmt.Errorf("%w: %s", ErrValidation, err.Error())
@@ -150,9 +150,7 @@ func (m dashboardPermissionsMigrator) migratePermissions(dashes []dashboard, acl
return fmt.Errorf("failed to bulk-create roles: %w", err)
}
for i := range createdRoles {
allRoles = append(allRoles, createdRoles[i])
}
allRoles = append(allRoles, createdRoles...)
if err := m.bulkAssignRoles(createdRoles); err != nil {
return fmt.Errorf("failed to bulk-assign roles: %w", err)
+4
View File
@@ -66,6 +66,10 @@ func TestRetryingOnFailures(t *testing.T) {
// Check SQL query
sess := store.GetSqlxSession()
rows, err := sess.Query(context.Background(), `SELECT "hello",2.3,4`)
t.Cleanup(func() {
err := rows.Close()
require.NoError(t, err)
})
require.NoError(t, err)
require.True(t, rows.Next()) // first row
@@ -50,14 +50,20 @@ func updateFolderTree(ctx context.Context, tx *session.SessionTx, tenant int64)
}
err = rows.Scan(&folder.UID, &folder.parentUID, &folder.Name, &folder.originalSlug)
if err != nil {
return err
break
}
all = append(all, &folder)
}
err = rows.Close()
errClose := rows.Close()
// TODO: Use some kind of multi-error.
// Until then, we want to prioritize errors coming from the .Scan
// over those coming from .Close.
if err != nil {
return err
}
if errClose != nil {
return errClose
}
root, lost, err := buildFolderTree(all)
if err != nil {
@@ -474,15 +474,19 @@ func (s *sqlEntityServer) fillCreationInfo(ctx context.Context, tx *session.Sess
}
rows, err := tx.Query(ctx, "SELECT created_at,created_by FROM entity WHERE grn=?", grn)
if err == nil {
if rows.Next() {
err = rows.Scan(&createdAt, &createdBy)
}
if err == nil {
err = rows.Close()
}
if err != nil {
return err
}
return err
if rows.Next() {
err = rows.Scan(&createdAt, &createdBy)
}
errClose := rows.Close()
if err != nil {
return err
}
return errClose
}
func (s *sqlEntityServer) selectForUpdate(ctx context.Context, tx *session.SessionTx, grn string) (*entity.EntityVersionInfo, error) {
@@ -498,10 +502,13 @@ func (s *sqlEntityServer) selectForUpdate(ctx context.Context, tx *session.Sessi
if rows.Next() {
err = rows.Scan(&current.ETag, &current.Version, &current.UpdatedAt, &current.Size)
}
if err == nil {
err = rows.Close()
errClose := rows.Close()
if err != nil {
return nil, err
}
return current, err
return current, errClose
}
func (s *sqlEntityServer) writeSearchInfo(