Skip to content

Commit fd66fd6

Browse files
zhijie-yangCopilot
andauthored
chore: apply suggestions from code review
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
1 parent 08b8976 commit fd66fd6

2 files changed

Lines changed: 22 additions & 17 deletions

File tree

AGENTS.md

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,12 @@ verdicts as described above.
153153
> `https://github.com/canonical/oci-factory/actions/runs/<run-id>/attempts/<n>#summary-<summary-id>`
154154
155155
- Findings are addressed in the `ignored-vulnerabilities:` field of the image
156-
trigger. Every new or modified entry must have an explanatory comment that:
157-
identifies the affected package/source and ecosystem, and states the
158-
maintainer's actual risk disposition with an image-specific reason the
159-
finding may be ignored. Existing untouched entries do not need to be updated
160-
solely to meet this comment format.
156+
trigger. Every new or modified vulnerability entry must identify the affected
157+
package/source and ecosystem; entries for other Trivy finding types must
158+
instead identify the affected file/component and rule category. Every entry
159+
must state the maintainer's actual risk disposition with an image-specific
160+
reason the finding may be ignored. Existing untouched entries do not need to
161+
be updated solely to meet this comment format.
161162
162163
A package name, description, CVSS score, Ubuntu priority, or status such as
163164
`Needs evaluation` is useful supporting context, but is not by itself a risk
@@ -190,15 +191,17 @@ verdicts as described above.
190191
191192
- The `.trivyignore` file is **deprecated**. Do not accept new `.trivyignore`
192193
files. When migrating an affected build to `ignored-vulnerabilities`, require
193-
every still-applicable rule to move, not only the changed rules. Once
194-
`ignored-vulnerabilities` is present, that build no longer uses
195-
`.trivyignore`. The legacy file may remain temporarily because previously
196-
released revisions can still depend on it.
194+
every still-applicable rule to move, not only the changed rules. A non-empty
195+
`ignored-vulnerabilities` list takes precedence over `.trivyignore`; an empty
196+
or omitted list still falls back to the legacy file. The legacy file may
197+
remain temporarily because previously released revisions can still depend on
198+
it.
197199
Example wording:
198200
199-
> Let's move every still-applicable rule to `ignored-vulnerabilities`; once
200-
> present, that build no longer uses `.trivyignore`. The legacy file may
201-
> remain for previously released revisions that still depend on it.
201+
> Let's move every still-applicable rule to `ignored-vulnerabilities`; a
202+
> non-empty list takes precedence over `.trivyignore`, while an empty or
203+
> omitted list still falls back to the legacy file. The file may remain for
204+
> previously released revisions that still depend on it.
202205
203206
- `ignored-vulnerabilities` requires a `version: 2` trigger. A `version: 1`
204207
trigger may stay as-is only until it needs this field; then it MUST switch to

README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -407,11 +407,13 @@ contain unfixed findings inherited from upstream software. Add new or modified
407407
filtering rules to `upload[*].ignored-vulnerabilities` in a `version: 2` image
408408
trigger only when the risk is acknowledged and justified.
409409

410-
Each new or modified entry must identify the affected package/source and
411-
ecosystem, and state the maintainer's risk disposition with an image-specific
412-
reason the finding may be ignored. For deb packages, link the Ubuntu Security
413-
tracker at `https://ubuntu.com/security/<CVE-ID>`. CVEs in language packages are
414-
not currently tracked internally; state the upstream fix status and link an
410+
Each new or modified vulnerability entry must identify the affected
411+
package/source and ecosystem; entries for other Trivy finding types must instead
412+
identify the affected file/component and rule category. Every entry must state
413+
the maintainer's risk disposition with an image-specific reason the finding may
414+
be ignored. For deb packages, link the Ubuntu Security tracker at
415+
`https://ubuntu.com/security/<CVE-ID>`. CVEs in language packages are not
416+
currently tracked internally; state the upstream fix status and link an
415417
upstream advisory when one is available.
416418

417419
##### Example: *ignored-vulnerabilities*

0 commit comments

Comments
 (0)