cscli bouncers prune: query creation date if they never connected

crowdsecurity · Jun 12, 2024 · f3518c3 · f3518c3
1 parent 9a64cbe
commit f3518c3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/cmd/crowdsec-cli/bouncers.go b/cmd/crowdsec-cli/bouncers.go
@@ -264,7 +264,7 @@ func (cli *cliBouncers) prune(duration time.Duration, force bool) error {
 		}
 	}
 
-	bouncers, err := cli.db.QueryBouncersLastPulltimeLT(time.Now().UTC().Add(-duration))
+	bouncers, err := cli.db.QueryBouncersInactiveSince(time.Now().UTC().Add(-duration))
 	if err != nil {
 		return fmt.Errorf("unable to query bouncers: %w", err)
 	}

diff --git a/pkg/database/bouncers.go b/pkg/database/bouncers.go
@@ -115,6 +115,15 @@ func (c *Client) UpdateBouncerTypeAndVersion(bType string, version string, id in
 	return nil
 }
 
-func (c *Client) QueryBouncersLastPulltimeLT(t time.Time) ([]*ent.Bouncer, error) {
-	return c.Ent.Bouncer.Query().Where(bouncer.LastPullLT(t)).All(c.CTX)
+func (c *Client) QueryBouncersInactiveSince(t time.Time) ([]*ent.Bouncer, error) {
+	return c.Ent.Bouncer.Query().Where(
+		// poor man's coalesce
+		bouncer.Or(
+			bouncer.LastPullLT(t),
+			bouncer.And(
+				bouncer.LastPullIsNil(),
+				bouncer.CreatedAtLT(t),
+			),
+		),
+	).All(c.CTX)
 }