3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-18 19:47:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

databroker: preserve data type when deleting changeset (#5540)

Browse source 
* databroker: preserve data type when deleting changeset

* use cs.now
This commit is contained in:
Caleb Doxsey 2025-03-25 10:11:36 -06:00 • committed by GitHub
parent a96ab2fe93
commit e7675a5b2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 58 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pkg/grpc/databroker/changeset.go
View file

@ -4,7 +4,7 @@ import (
"context"
"fmt"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb"
)
@ -14,7 +14,7 @@ func GetChangeSet(current, target RecordSetBundle, cmpFn RecordCompareFn) []*Rec
cs := &changeSet{now: timestamppb.Now()}
for _, rec := range current.GetRemoved(target).Flatten() {
cs.Remove(rec.GetType(), rec.GetId())
cs.Remove(rec)
}
for _, rec := range current.GetModified(target, cmpFn).Flatten() {
cs.Upsert(rec)
@ -33,13 +33,10 @@ type changeSet struct {
}
// Remove adds a record to the change set.
func (cs *changeSet) Remove(typ string, id string) {
cs.updates = append(cs.updates, &Record{
Type: typ,
Id: id,
DeletedAt: cs.now,
Data: &anypb.Any{TypeUrl: typ},
})
func (cs *changeSet) Remove(record *Record) {
record = proto.Clone(record).(*Record)
record.DeletedAt = cs.now
cs.updates = append(cs.updates, record)
}
// Upsert adds a record to the change set.