Fix lint issues

Signed-off-by: Émile Ré <emile@probo.com>
This commit is contained in:
Émile Ré
2026-06-08 15:56:36 +02:00
parent 99fdccf1e8
commit d5427a824b
5 changed files with 17 additions and 18 deletions

View File

@@ -70,7 +70,7 @@ func TestResetBannerTrackers_FullRebuild(t *testing.T) {
TrackerPatternID: &glob.ID, TrackerPatternID: &glob.ID,
TrackerType: coredata.TrackerTypeCookie, TrackerType: coredata.TrackerTypeCookie,
Identifier: identifier, Identifier: identifier,
Source: ref(coredata.CookieSourceScript), Source: new(coredata.CookieSourceScript),
LastDetectedAt: now, LastDetectedAt: now,
CreatedAt: now, CreatedAt: now,
UpdatedAt: now, UpdatedAt: now,
@@ -97,6 +97,7 @@ func TestResetBannerTrackers_FullRebuild(t *testing.T) {
require.NoError(t, client.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { require.NoError(t, client.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error {
// The glob is gone. // The glob is gone.
var goneGlob coredata.TrackerPattern var goneGlob coredata.TrackerPattern
err := goneGlob.LoadByBannerIDTypeAndPattern(ctx, conn, fx.scope, fx.banner.ID, coredata.TrackerTypeCookie, "_ga_*", nil) err := goneGlob.LoadByBannerIDTypeAndPattern(ctx, conn, fx.scope, fx.banner.ID, coredata.TrackerTypeCookie, "_ga_*", nil)
require.ErrorIs(t, err, coredata.ErrResourceNotFound) require.ErrorIs(t, err, coredata.ErrResourceNotFound)
@@ -145,10 +146,6 @@ func TestResetBannerTrackers_FullRebuild(t *testing.T) {
})) }))
} }
func ref[T any](v T) *T {
return &v
}
func seedCommonTrackerPattern(t *testing.T, ctx context.Context, client *pg.Client, pattern string) gid.GID { func seedCommonTrackerPattern(t *testing.T, ctx context.Context, client *pg.Client, pattern string) gid.GID {
t.Helper() t.Helper()

View File

@@ -44,6 +44,7 @@ func Paginate[E page.Paginable[F], F page.OrderField](
for { for {
size := paginatePageSize size := paginatePageSize
if limit > 0 { if limit > 0 {
remaining := limit - len(result) remaining := limit - len(result)
if remaining <= 0 { if remaining <= 0 {

View File

@@ -144,6 +144,7 @@ func renderPatternTable(cmd *cobra.Command, f *cmdutil.Factory, patterns coredat
} }
var linkedIDs []gid.GID var linkedIDs []gid.GID
for _, p := range patterns { for _, p := range patterns {
if p.CommonThirdPartyID != nil { if p.CommonThirdPartyID != nil {
linkedIDs = append(linkedIDs, *p.CommonThirdPartyID) linkedIDs = append(linkedIDs, *p.CommonThirdPartyID)

View File

@@ -119,6 +119,7 @@ func newCmdReenrich(f *cmdutil.Factory) *cobra.Command {
ctx, ctx,
func(ctx context.Context, tx pg.Tx) error { func(ctx context.Context, tx pg.Tx) error {
var ps coredata.CommonTrackerPatterns var ps coredata.CommonTrackerPatterns
requeued, err = ps.RequestEnrichmentByIDs(ctx, tx, ids, flagResetEnriched) requeued, err = ps.RequestEnrichmentByIDs(ctx, tx, ids, flagResetEnriched)
return err return err
@@ -194,6 +195,7 @@ func resolveReenrichIDs(
} }
var tps coredata.TrackerPatterns var tps coredata.TrackerPatterns
ids, err = tps.LoadAllLinkedCommonTrackerPatternIDsByCookieBannerID(ctx, conn, coredata.NewScopeFromObjectID(bannerID), bannerID) ids, err = tps.LoadAllLinkedCommonTrackerPatternIDsByCookieBannerID(ctx, conn, coredata.NewScopeFromObjectID(bannerID), bannerID)
return err return err
@@ -204,6 +206,7 @@ func resolveReenrichIDs(
} }
var tps coredata.TrackerPatterns var tps coredata.TrackerPatterns
ids, err = tps.LoadAllLinkedCommonTrackerPatternIDsByOrganizationID(ctx, conn, coredata.NewScopeFromObjectID(orgID), orgID) ids, err = tps.LoadAllLinkedCommonTrackerPatternIDsByOrganizationID(ctx, conn, coredata.NewScopeFromObjectID(orgID), orgID)
return err return err
@@ -218,6 +221,7 @@ func resolveReenrichIDs(
} }
var ps coredata.CommonTrackerPatterns var ps coredata.CommonTrackerPatterns
ids, err = ps.LoadAllIDs(ctx, conn, filter) ids, err = ps.LoadAllIDs(ctx, conn, filter)
return err return err
@@ -246,6 +250,7 @@ func buildReenrichFilter(
} }
filter.WithCommonThirdPartyID(&id) filter.WithCommonThirdPartyID(&id)
hasSelector = true hasSelector = true
} }
@@ -256,11 +261,13 @@ func buildReenrichFilter(
} }
filter.WithTrackerType(&tt) filter.WithTrackerType(&tt)
hasSelector = true hasSelector = true
} }
if keyword != "" { if keyword != "" {
filter.WithKeyword(&keyword) filter.WithKeyword(&keyword)
hasSelector = true hasSelector = true
} }
@@ -271,6 +278,7 @@ func buildReenrichFilter(
} }
filter.WithState(&st) filter.WithState(&st)
hasSelector = true hasSelector = true
} }

View File

@@ -54,11 +54,11 @@ func newCmdStats(f *cmdutil.Factory) *cobra.Command {
filter *coredata.CommonTrackerPatternFilter filter *coredata.CommonTrackerPatternFilter
}{ }{
{"total", coredata.NewCommonTrackerPatternFilter()}, {"total", coredata.NewCommonTrackerPatternFilter()},
{"queued", coredata.NewCommonTrackerPatternFilter().WithState(refState(coredata.CommonTrackerPatternEnrichmentStateQueued))}, {"queued", coredata.NewCommonTrackerPatternFilter().WithState(new(coredata.CommonTrackerPatternEnrichmentStateQueued))},
{"enriched", coredata.NewCommonTrackerPatternFilter().WithState(refState(coredata.CommonTrackerPatternEnrichmentStateEnriched))}, {"enriched", coredata.NewCommonTrackerPatternFilter().WithState(new(coredata.CommonTrackerPatternEnrichmentStateEnriched))},
{"unenriched", coredata.NewCommonTrackerPatternFilter().WithState(refState(coredata.CommonTrackerPatternEnrichmentStateUnenriched))}, {"unenriched", coredata.NewCommonTrackerPatternFilter().WithState(new(coredata.CommonTrackerPatternEnrichmentStateUnenriched))},
{"linked", coredata.NewCommonTrackerPatternFilter().WithLinked(refBool(true))}, {"linked", coredata.NewCommonTrackerPatternFilter().WithLinked(new(true))},
{"unlinked", coredata.NewCommonTrackerPatternFilter().WithLinked(refBool(false))}, {"unlinked", coredata.NewCommonTrackerPatternFilter().WithLinked(new(false))},
} }
for _, c := range counts { for _, c := range counts {
@@ -94,11 +94,3 @@ func newCmdStats(f *cmdutil.Factory) *cobra.Command {
return cmd return cmd
} }
func refState(s coredata.CommonTrackerPatternEnrichmentState) *coredata.CommonTrackerPatternEnrichmentState {
return &s
}
func refBool(b bool) *bool {
return &b
}