Add CSAF GC test and simplify SBOM GC test #1980
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also deleted some superfluous code, i.e. no advisories ingested so none need to be deleted in the now-renamed gc_purls_from_sbom test.
Reviewer's GuideRenamed the existing garbage-collection test to focus on SBOMs, removed unnecessary advisory-deletion logic, and added a new test to reproduce issue #1977 by verifying purl GC behavior after ingesting a single CSAF document. File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey there - I've reviewed your changes and they look great!
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location> `modules/fundamental/src/purl/service/test.rs:820` </location>
<code_context>
+ );
+
+ // should any packages be garbage collected? I honestly don't know.
+ assert_eq!(0, purl_service.gc_purls(&ctx.db).await?);
+
+ Ok(())
</code_context>
<issue_to_address>
**question (testing):** Clarify the expected behavior for garbage collection after CSAF ingestion.
Please update the test description or comments to clearly state the expected outcome. If there are cases where packages should be garbage collected after CSAF ingestion, consider adding a corresponding test.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
sourcery-ai
bot
changed the title
|
this change makes the test to pass: ➜ trustify git:(1977) ✗ git diff
diff --git a/modules/fundamental/src/purl/service/gc_purls.sql b/modules/fundamental/src/purl/service/gc_purls.sql
index 4a8703a2..7bc6d692 100644
--- a/modules/fundamental/src/purl/service/gc_purls.sql
+++ b/modules/fundamental/src/purl/service/gc_purls.sql
@@ -1,9 +1,18 @@
WITH
alive_qualified_purl AS (
+ (
SELECT DISTINCT t2.id, t2.versioned_purl_id
FROM sbom_package_purl_ref AS t1
INNER JOIN qualified_purl AS t2
ON t2.id = t1.qualified_purl_id
+ )
+ UNION
+ (
+ SELECT t1.id, t1.versioned_purl_id
+ FROM qualified_purl AS t1
+ INNER JOIN versioned_purl AS t2 ON t2.id = t1.versioned_purl_id
+ INNER JOIN purl_status AS t3 ON t2.base_purl_id = t3.base_purl_id
+ )
),
alive_versioned_purl AS (
SELECT DISTINCT t2.id, t2.base_purl_id➜ trustify git:(1977) ✗ cargo nextest run gc_purls_from_single_csaf
Compiling trustify-module-fundamental v0.3.6 (/home/heliofrota/Desktop/tc/trustify/modules/fundamental)
Finished `test` profile [unoptimized + debuginfo] target(s) in 21.85s
────────────
Nextest run ID a38d5869-c649-4f1a-9a64-609f0a3845f0 with nextest profile: default
Starting 1 test across 35 binaries (478 tests skipped)
PASS [ 2.891s] trustify-module-fundamental purl::service::test::gc_purls_from_single_csaf
────────────
Summary [ 2.923s] 1 test run: 1 passed, 478 skippedit works fine for an empty / small database , unfortunately we can not merge the PR atm |
jcrossley3
commented
Sep 25, 2025
There was a problem hiding this comment.
Great! Please add a call to PurlService::gc_purls() in https://github.com/guacsec/trustify-scale-testing so we can get a sense of the perf impact triggered by a /scale-test comment.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1980 +/- ##
==========================================
- Coverage 67.84% 67.72% -0.12%
==========================================
Files 353 355 +2
Lines 19683 19801 +118
Branches 19683 19801 +118
==========================================
+ Hits 13354 13411 +57
- Misses 5551 5614 +63
+ Partials 778 776 -2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
trustify-scale-testing calls trustify endpoints, I'm not sure if I understood well, for this we would need to create a new endpoint in trustify just to call Also the impact is based on the database size, please see some comments here Then may end up with an illusion that the performance good or acceptable 👍 |
helio-frota
approved these changes
Sep 26, 2025
Good idea. Let's add an endpoint, |
jcrossley3
commented
Sep 26, 2025
|
/scale-test |
|
🛠️ Scale test has started! Follow the progress here: Workflow Run |
Goose ReportGoose Attack ReportPlan Overview
Request Metrics
Response Time Metrics
Status Code Metrics
Transaction Metrics
Scenario Metrics
Error Metrics
📄 Full Report (Go to "Artifacts" and download report) |
|
/scale-test |
|
🛠️ Scale test has started! Follow the progress here: Workflow Run |
That might actually be dangerous. As we know it has side effects. This might be good way for a DoS. |
|
scale test is failing with |
|
➕
let's revert then? |
Having tests is fine. Exposing the GC on an HTTP endpoint I think is not. |
|
yeah sorry I forgot to add the link #1996 👍 |
|
/scale-test |
|
🛠️ Scale test has started! Follow the progress here: Workflow Run |
Goose ReportGoose Attack ReportPlan Overview
Request Metrics
Response Time Metrics
Status Code Metrics
Transaction Metrics
Scenario Metrics
Error Metrics
📄 Full Report (Go to "Artifacts" and download report) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also deleted some superfluous code, i.e. no advisories ingested so none need to be deleted in the now-renamed
gc_purls_from_sbomtest.Summary by Sourcery
Add a new test for reproducing garbage collection behavior with a single CSAF document and clean up the existing SBOM-based GC test.
Enhancements:
Tests: