Skip to content

Commit 4570460

Browse files
committed
Audit all call sites where fmt.Errorf() was being used and switch to errwrap.
1 parent 9ab60ec commit 4570460

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

builtin/providers/postgresql/config.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"sync"
99
"unicode"
1010

11+
"github.com/hashicorp/errwrap"
1112
_ "github.com/lib/pq" //PostgreSQL db
1213
)
1314

@@ -89,7 +90,7 @@ func (c *Config) NewClient() (*Client, error) {
8990
func (c *Client) Connect() (*sql.DB, error) {
9091
db, err := sql.Open("postgres", c.connStr)
9192
if err != nil {
92-
return nil, fmt.Errorf("Error connecting to PostgreSQL server: %v", err)
93+
return nil, errwrap.Wrapf("Error connecting to PostgreSQL server: {{err}}", err)
9394
}
9495

9596
return db, nil

builtin/providers/postgresql/resource_postgresql_role.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ func resourcePostgreSQLRoleReadImpl(d *schema.ResourceData, meta interface{}) er
374374
err = conn.QueryRow("SELECT COALESCE(passwd, '') FROM pg_catalog.pg_shadow AS s WHERE s.usename = $1", roleId).Scan(&rolePassword)
375375
switch {
376376
case err == sql.ErrNoRows:
377-
return fmt.Errorf("PostgreSQL role (%s) not found in shadow database: {{err}}", roleId)
377+
return errwrap.Wrapf(fmt.Errorf("PostgreSQL role (%s) not found in shadow database: {{err}}", roleId), err)
378378
case err != nil:
379379
return errwrap.Wrapf("Error reading role: {{err}}", err)
380380
default:

0 commit comments

Comments
 (0)