From 3fa3fe7fdc71942f429d3e7180526857d63d064b Mon Sep 17 00:00:00 2001 From: Zachary Wasserman Date: Tue, 2 Oct 2018 15:19:50 -0700 Subject: [PATCH] Use errors.Wrapf instead of nested fmt.Sprintf (#1933) --- server/datastore/mysql/delete.go | 4 ++-- server/datastore/mysql/options.go | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/datastore/mysql/delete.go b/server/datastore/mysql/delete.go index b4bddfd6d4..5eb104716d 100644 --- a/server/datastore/mysql/delete.go +++ b/server/datastore/mysql/delete.go @@ -14,7 +14,7 @@ func (d *Datastore) deleteEntity(dbTable string, id uint) error { `, dbTable) result, err := d.db.Exec(deleteStmt, d.clock.Now(), id) if err != nil { - return errors.Wrap(err, fmt.Sprintf("delete %s", dbTable)) + return errors.Wrapf(err, "delete %s", dbTable) } rows, _ := result.RowsAffected() if rows != 1 { @@ -33,7 +33,7 @@ func (d *Datastore) deleteEntityByName(dbTable string, name string) error { if isMySQLForeignKey(err) { return foreignKey(dbTable, name) } - return errors.Wrap(err, fmt.Sprintf("delete %s", dbTable)) + return errors.Wrapf(err, "delete %s", dbTable) } rows, _ := result.RowsAffected() if rows != 1 { diff --git a/server/datastore/mysql/options.go b/server/datastore/mysql/options.go index 924b773fc6..3f539a73f3 100644 --- a/server/datastore/mysql/options.go +++ b/server/datastore/mysql/options.go @@ -2,7 +2,6 @@ package mysql import ( "database/sql" - "fmt" "github.com/kolide/fleet/server/datastore/internal/appstate" "github.com/kolide/fleet/server/kolide" @@ -23,7 +22,7 @@ func (d *Datastore) ResetOptions() (opts []kolide.Option, err error) { defer func() { if err != nil { if txErr := txn.Rollback(); txErr != nil { - err = errors.Wrap(err, fmt.Sprintf("reset options failed, transaction rollback failed with error: %s", txErr)) + err = errors.Wrapf(err, "reset options failed, transaction rollback failed with error: %s", txErr) } } }()