rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return errors from tracker pattern loads in dual-writes

Browse Source 
Non-not-found errors from LoadByBannerIDTypeAndPattern were
silently swallowed, risking partial state on DB failures.

Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-05-05 17:27:01 +04:00
parent 1121bc6fea
commit 91e7659428
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/cookiebanner/service.go
View File

@@ -1300,7 +1300,11 @@ func (s *Service) UpdateCookiePattern(
}
var tp coredata.TrackerPattern
if err := tp.LoadByBannerIDTypeAndPattern(ctx, tx, scope, pattern.CookieBannerID, coredata.TrackerTypeCookie, pattern.Pattern); err == nil {
if err := tp.LoadByBannerIDTypeAndPattern(ctx, tx, scope, pattern.CookieBannerID, coredata.TrackerTypeCookie, pattern.Pattern); err != nil {
if !errors.Is(err, coredata.ErrResourceNotFound) {
return fmt.Errorf("cannot load tracker pattern: %w", err)
}
} else {
if req.DisplayName != nil {
tp.DisplayName = *req.DisplayName
}
@@ -1358,7 +1362,11 @@ func (s *Service) DeleteCookiePattern(
}
var tp coredata.TrackerPattern
if err := tp.LoadByBannerIDTypeAndPattern(ctx, tx, scope, pattern.CookieBannerID, coredata.TrackerTypeCookie, pattern.Pattern); err == nil {
if err := tp.LoadByBannerIDTypeAndPattern(ctx, tx, scope, pattern.CookieBannerID, coredata.TrackerTypeCookie, pattern.Pattern); err != nil {
if !errors.Is(err, coredata.ErrResourceNotFound) {
return fmt.Errorf("cannot load tracker pattern: %w", err)
}
} else {
if err := tp.Delete(ctx, tx, scope); err != nil {
return fmt.Errorf("cannot delete tracker pattern: %w", err)
}
@@ -1423,7 +1431,11 @@ func (s *Service) MoveCookiePatternToCategory(
}
var tp coredata.TrackerPattern
if err := tp.LoadByBannerIDTypeAndPattern(ctx, tx, scope, pattern.CookieBannerID, coredata.TrackerTypeCookie, pattern.Pattern); err == nil {
if err := tp.LoadByBannerIDTypeAndPattern(ctx, tx, scope, pattern.CookieBannerID, coredata.TrackerTypeCookie, pattern.Pattern); err != nil {
if !errors.Is(err, coredata.ErrResourceNotFound) {
return fmt.Errorf("cannot load tracker pattern: %w", err)
}
} else {
tp.CookieCategoryID = target.ID
tp.UpdatedAt = time.Now()
if err := tp.Update(ctx, tx, scope); err != nil {