extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-21 10:17:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

soft deletes for shares (#262)

Browse Source
This commit is contained in:
Michael Quigley 2023-03-10 11:16:37 -05:00
parent 01dd77ca3b
commit fb14b12446
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/gc.go
View File

@ -37,7 +37,7 @@ func GC(inCfg *Config) error {
return err return err
} }
defer func() { _ = tx.Rollback() }() defer func() { _ = tx.Rollback() }()
sshrs, err := str.GetAllShares(tx) sshrs, err := str.FindAllShares(tx)
if err != nil { if err != nil {
return err return err
} }

12
controller/store/share.go
View File

@ -39,8 +39,8 @@ func (self *Store) GetShare(id int, tx *sqlx.Tx) (*Share, error) {
return shr, nil return shr, nil
} }
func (self *Store) GetAllShares(tx *sqlx.Tx) ([]*Share, error) { func (self *Store) FindAllShares(tx *sqlx.Tx) ([]*Share, error) {
rows, err := tx.Queryx("select * from shares order by id") rows, err := tx.Queryx("select * from shares where not deleted order by id")
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error selecting all shares") return nil, errors.Wrap(err, "error selecting all shares")
} }
@ -57,7 +57,7 @@ func (self *Store) GetAllShares(tx *sqlx.Tx) ([]*Share, error) {
func (self *Store) FindShareWithToken(shrToken string, tx *sqlx.Tx) (*Share, error) { func (self *Store) FindShareWithToken(shrToken string, tx *sqlx.Tx) (*Share, error) {
shr := &Share{} shr := &Share{}
if err := tx.QueryRowx("select * from shares where token = $1", shrToken).StructScan(shr); err != nil { if err := tx.QueryRowx("select * from shares where token = $1 and not deleted", shrToken).StructScan(shr); err != nil {
return nil, errors.Wrap(err, "error selecting share by token") return nil, errors.Wrap(err, "error selecting share by token")
} }
return shr, nil return shr, nil
@ -65,14 +65,14 @@ func (self *Store) FindShareWithToken(shrToken string, tx *sqlx.Tx) (*Share, err
func (self *Store) FindShareWithZId(zId string, tx *sqlx.Tx) (*Share, error) { func (self *Store) FindShareWithZId(zId string, tx *sqlx.Tx) (*Share, error) {
shr := &Share{} shr := &Share{}
if err := tx.QueryRowx("select * from shares where z_id = $1", zId).StructScan(shr); err != nil { if err := tx.QueryRowx("select * from shares where z_id = $1 and not deleted", zId).StructScan(shr); err != nil {
return nil, errors.Wrap(err, "error selecting share by z_id") return nil, errors.Wrap(err, "error selecting share by z_id")
} }
return shr, nil return shr, nil
} }
func (self *Store) FindSharesForEnvironment(envId int, tx *sqlx.Tx) ([]*Share, error) { func (self *Store) FindSharesForEnvironment(envId int, tx *sqlx.Tx) ([]*Share, error) {
rows, err := tx.Queryx("select shares.* from shares where environment_id = $1", envId) rows, err := tx.Queryx("select shares.* from shares where environment_id = $1 and not deleted", envId)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error selecting shares by environment id") return nil, errors.Wrap(err, "error selecting shares by environment id")
} }
@ -101,7 +101,7 @@ func (self *Store) UpdateShare(shr *Share, tx *sqlx.Tx) error {
} }
func (self *Store) DeleteShare(id int, tx *sqlx.Tx) error { func (self *Store) DeleteShare(id int, tx *sqlx.Tx) error {
stmt, err := tx.Prepare("delete from shares where id = $1") stmt, err := tx.Prepare("update shares set updated_at = current_timestamp, deleted = true where id = $1")
if err != nil { if err != nil {
return errors.Wrap(err, "error preparing shares delete statement") return errors.Wrap(err, "error preparing shares delete statement")
} }