DevFW-CICD/garm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Fixed error wrap

Browse source 
The error is not wrapped correctly, because instead of using `q.Error`,
it uses `err`, which is defined elsewhere.

Also, the `UpdateOrganization` and `CreateOrganizationPool` functions will
never fail on update/create org, because it returns a nil error, instead
of wrap error.

Signed-off-by: Mihaela Balutoiu <mbalutoiu@cloudbasesolutions.com>
This commit is contained in:
Mihaela Balutoiu 2022-10-10 13:23:23 +03:00
parent 59c8f397ac
commit 1116de7608
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
database/sql/organizations.go
View file

@ -117,7 +117,7 @@ func (s *sqlDatabase) UpdateOrganization(ctx context.Context, orgID string, para
q := s.conn.Save(&org)
if q.Error != nil {
return params.Organization{}, errors.Wrap(err, "saving org")
return params.Organization{}, errors.Wrap(q.Error, "saving org")
}
newParams := s.sqlToCommonOrganization(org)
@ -188,7 +188,7 @@ func (s *sqlDatabase) CreateOrganizationPool(ctx context.Context, orgId string,
q := s.conn.Create(&newPool)
if q.Error != nil {
return params.Pool{}, errors.Wrap(err, "adding pool")
return params.Pool{}, errors.Wrap(q.Error, "adding pool")
}
for _, tt := range tags {