db: force decisions to have an expiration timestamp

crowdsecurity · Oct 4, 2024 · 18cb43f · 18cb43f
1 parent 40021b6
commit 18cb43f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 67 deletions.
diff --git a/pkg/apiserver/apic.go b/pkg/apiserver/apic.go
@@ -813,7 +813,7 @@ func (a *apic) ShouldForcePullBlocklist(ctx context.Context, blocklist *modelsca
 		return false, fmt.Errorf("while getting decision: %w", err)
 	}
 
-	if firstDecision == nil || firstDecision.Until == nil || firstDecision.Until.Sub(time.Now().UTC()) < (a.pullInterval+15*time.Minute) {
+	if firstDecision == nil || firstDecision.Until.Sub(time.Now().UTC()) < (a.pullInterval+15*time.Minute) {
 		log.Debugf("at least one decision found for %s, expire soon, force refresh", *blocklist.Name)
 		return true, nil
 	}

diff --git a/pkg/database/ent/decision.go b/pkg/database/ent/decision.go
diff --git a/pkg/database/ent/decision/where.go b/pkg/database/ent/decision/where.go
diff --git a/pkg/database/ent/decision_create.go b/pkg/database/ent/decision_create.go
diff --git a/pkg/database/ent/decision_update.go b/pkg/database/ent/decision_update.go
diff --git a/pkg/database/ent/migrate/schema.go b/pkg/database/ent/migrate/schema.go
diff --git a/pkg/database/ent/mutation.go b/pkg/database/ent/mutation.go
diff --git a/pkg/database/ent/schema/decision.go b/pkg/database/ent/schema/decision.go
@@ -24,7 +24,7 @@ func (Decision) Fields() []ent.Field {
 		field.Time("updated_at").
 			Default(types.UtcNow).
 			UpdateDefault(types.UtcNow),
-		field.Time("until").Nillable().Optional().SchemaType(map[string]string{
+		field.Time("until").SchemaType(map[string]string{
 			dialect.MySQL: "datetime",
 		}),
 		field.String("scenario").Immutable(),