warden/groups: add a PUT method to overwrite members & some refactoring #768
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,16 +57,20 @@ func (m *SQLManager) CreateSchemas() (int, error) { | |
| return n, nil | ||
| } | ||
|
|
||
| func (m *SQLManager) createGroup(group string) func(tx *sqlx.Tx) error { | ||
| return func(tx *sqlx.Tx) error { | ||
| _, err := tx.Exec(m.DB.Rebind("INSERT INTO hydra_warden_group (id) VALUES (?)"), group) | ||
|
|
||
| return errors.WithStack(err) | ||
|
There was a problem hiding this comment. Not sure if this works for nil values? So if error is nil, does this return nil as well or not? There was a problem hiding this comment. https://godoc.org/github.com/pkg/errors#WithStack There was a problem hiding this comment. Absolutely, it returns nil in that case: https://github.com/pkg/errors/blob/master/errors.go#L145 |
||
| } | ||
| } | ||
|
|
||
| func (m *SQLManager) CreateGroup(g *Group) error { | ||
| if g.ID == "" { | ||
| g.ID = uuid.New() | ||
| } | ||
|
|
||
| return m.applyInTransaction(m.createGroup(g.ID), m.addGroupMembers(g.ID, g.Members)) | ||
| } | ||
|
|
||
| func (m *SQLManager) GetGroup(id string) (*Group, error) { | ||
|
|
@@ -88,58 +92,48 @@ func (m *SQLManager) GetGroup(id string) (*Group, error) { | |
| }, nil | ||
| } | ||
|
|
||
| func (m *SQLManager) deleteGroup(id string) func(tx *sqlx.Tx) error { | ||
| return func(tx *sqlx.Tx) error { | ||
| _, err := tx.Exec(m.DB.Rebind("DELETE FROM hydra_warden_group WHERE id=?"), id) | ||
|
|
||
| return errors.WithStack(err) | ||
| } | ||
| } | ||
|
|
||
| func (m *SQLManager) DeleteGroup(id string) error { | ||
| return m.applyInTransaction(m.deleteGroup(id)) | ||
| } | ||
|
|
||
| func (m *SQLManager) addGroupMembers(group string, subjects []string) func(tx *sqlx.Tx) error { | ||
| return func(tx *sqlx.Tx) error { | ||
| for _, subject := range subjects { | ||
| if _, err := tx.Exec(m.DB.Rebind("INSERT INTO hydra_warden_group_member (group_id, member) VALUES (?, ?)"), group, subject); err != nil { | ||
| return errors.WithStack(err) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func (m *SQLManager) AddGroupMembers(group string, subjects []string) error { | ||
| return m.applyInTransaction(m.addGroupMembers(group, subjects)) | ||
| } | ||
|
|
||
| func (m *SQLManager) removeGroupMembers(group string, subjects []string) func(tx *sqlx.Tx) error { | ||
| return func(tx *sqlx.Tx) error { | ||
| for _, subject := range subjects { | ||
| if _, err := tx.Exec(m.DB.Rebind("DELETE FROM hydra_warden_group_member WHERE member=? AND group_id=?"), subject, group); err != nil { | ||
| return errors.WithStack(err) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func (m *SQLManager) RemoveGroupMembers(group string, subjects []string) error { | ||
| return m.applyInTransaction(m.removeGroupMembers(group, subjects)) | ||
| } | ||
|
|
||
| func (m *SQLManager) FindGroupsByMember(subject string, limit, offset int) ([]Group, error) { | ||
|
|
@@ -154,7 +148,7 @@ func (m *SQLManager) FindGroupsByMember(subject string, limit, offset int) ([]Gr | |
| for k, id := range ids { | ||
| group, err := m.GetGroup(id) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| groups[k] = *group | ||
|
|
@@ -175,11 +169,41 @@ func (m *SQLManager) ListGroups(limit, offset int) ([]Group, error) { | |
| for k, id := range ids { | ||
| group, err := m.GetGroup(id) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| groups[k] = *group | ||
| } | ||
|
|
||
| return groups, nil | ||
| } | ||
|
|
||
| func (m *SQLManager) UpdateGroupMembers(group string, members []string) error { | ||
| return m.applyInTransaction(m.deleteGroup(group), m.createGroup(group), m.addGroupMembers(group, members)) | ||
| } | ||
|
|
||
| func (m *SQLManager) applyInTransaction(executors ...func(tx *sqlx.Tx) error) error { | ||
| tx, err := m.DB.Beginx() | ||
| if err != nil { | ||
| return errors.Wrap(err, "Could not begin transaction") | ||
| } | ||
|
|
||
| for _, exec := range executors { | ||
| if err := exec(tx); err != nil { | ||
| if err := tx.Rollback(); err != nil { | ||
| return errors.WithStack(err) | ||
| } | ||
|
|
||
| return err | ||
| } | ||
| } | ||
|
|
||
| if err := tx.Commit(); err != nil { | ||
| if err := tx.Rollback(); err != nil { | ||
| return errors.WithStack(err) | ||
| } | ||
| return errors.Wrap(err, "Could not commit transaction") | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
isn't it better to always first check the request?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, maybe I was using
ghere for some reason which was why it was decoded first, but as it stands now the order can be reversed´the way you did it.