3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-04-30 10:56:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

redis: fix deletion versioning (#1871)

Browse source
This commit is contained in:
Caleb Doxsey 2021-02-08 16:12:13 -07:00 • committed by GitHub
parent a38913925d
commit b5d52ceb3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/storage/redis/redis.go
View file

@ -116,6 +116,7 @@ func (db *DB) Delete(ctx context.Context, id string) (err error) {
// mark it as deleted // mark it as deleted
record.DeletedAt = timestamppb.Now() record.DeletedAt = timestamppb.Now()
record.Version = formatVersion(version)
return nil return nil
}, },

3
pkg/storage/redis/redis_test.go
View file

@ -144,11 +144,14 @@ func testDB(t *testing.T) {
} }
}) })
t.Run("delete record", func(t *testing.T) { t.Run("delete record", func(t *testing.T) {
original, err := db.Get(ctx, id)
require.NoError(t, err)
assert.NoError(t, db.Delete(ctx, id)) assert.NoError(t, db.Delete(ctx, id))
record, err := db.Get(ctx, id) record, err := db.Get(ctx, id)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, record) require.NotNil(t, record)
assert.NotNil(t, record.DeletedAt) assert.NotNil(t, record.DeletedAt)
assert.NotEqual(t, original.GetVersion(), record.GetVersion())
}) })
t.Run("clear deleted", func(t *testing.T) { t.Run("clear deleted", func(t *testing.T) {
db.ClearDeleted(ctx, time.Now().Add(time.Second)) db.ClearDeleted(ctx, time.Now().Add(time.Second))