Skip to content

Commit d649d32

Browse files
authored
fix: remove errors.Wrap(nil) (#4576)
* Fix errors.Wrap(nil) * fix resource_test failure where resource does not exist
1 parent 88b38ff commit d649d32

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

store/db/mysql/inbox.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func (d *DB) GetInbox(ctx context.Context, find *store.FindInbox) (*store.Inbox,
110110
return nil, errors.Wrap(err, "failed to get inbox")
111111
}
112112
if len(list) != 1 {
113-
return nil, errors.Wrapf(nil, "unexpected inbox count: %d", len(list))
113+
return nil, errors.Errorf("unexpected inbox count: %d", len(list))
114114
}
115115
return list[0], nil
116116
}

store/db/mysql/user.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (d *DB) CreateUser(ctx context.Context, create *store.User) (*store.User, e
3232
return nil, err
3333
}
3434
if len(list) != 1 {
35-
return nil, errors.Wrapf(nil, "unexpected user count: %d", len(list))
35+
return nil, errors.Errorf("unexpected user count: %d", len(list))
3636
}
3737

3838
return list[0], nil
@@ -142,7 +142,7 @@ func (d *DB) GetUser(ctx context.Context, find *store.FindUser) (*store.User, er
142142
return nil, err
143143
}
144144
if len(list) != 1 {
145-
return nil, errors.Wrapf(nil, "unexpected user count: %d", len(list))
145+
return nil, errors.Errorf("unexpected user count: %d", len(list))
146146
}
147147
return list[0], nil
148148
}

store/db/postgres/inbox.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (d *DB) GetInbox(ctx context.Context, find *store.FindInbox) (*store.Inbox,
100100
return nil, errors.Wrap(err, "failed to get inbox")
101101
}
102102
if len(list) != 1 {
103-
return nil, errors.Wrapf(nil, "unexpected inbox count: %d", len(list))
103+
return nil, errors.Errorf("unexpected inbox count: %d", len(list))
104104
}
105105
return list[0], nil
106106
}

store/resource.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func (s *Store) DeleteResource(ctx context.Context, delete *DeleteResource) erro
103103
return errors.Wrap(err, "failed to get resource")
104104
}
105105
if resource == nil {
106-
return errors.Wrap(nil, "resource not found")
106+
return errors.New("resource not found")
107107
}
108108

109109
if resource.StorageType == storepb.ResourceStorageType_LOCAL {

store/test/resource_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ func TestResourceStore(t *testing.T) {
5858
err = ts.DeleteResource(ctx, &store.DeleteResource{
5959
ID: 2,
6060
})
61-
require.NoError(t, err)
61+
require.ErrorContains(t, err, "resource not found")
6262
ts.Close()
6363
}

0 commit comments

Comments
 (0)