Skip to content

Commit 90c171f

Browse files
authored
Use suppression_reason instead of suppressed (#1510)
1 parent 529610b commit 90c171f

File tree

11 files changed

+20
-16
lines changed

11 files changed

+20
-16
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
88

99
## Unreleased
1010

11+
### Changed
12+
13+
- Use `suppression_reason` instead of deprecated `suppressed` field
14+
1115
## 7.1.0 - 2024-09-24
1216

1317
### Added

cli/src/api/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ mod tests {
870870
description: None,
871871
reason: None,
872872
},
873-
suppressed: false,
873+
suppression_reason: None,
874874
}],
875875
}],
876876
job_link: Some("job_link".into()),

cli/src/format.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ impl Format for PolicyEvaluationResponseRaw {
126126
}
127127

128128
// Write summary for each issue.
129-
for package in self
130-
.dependencies
131-
.iter()
132-
.filter(|package| package.rejections.iter().any(|rejection| !rejection.suppressed))
133-
{
129+
for package in self.dependencies.iter().filter(|package| {
130+
package.rejections.iter().any(|rejection| rejection.suppression_reason.is_none())
131+
}) {
134132
let _ = writeln!(writer, "[{}] {}@{}", package.registry, package.name, package.version);
135133

136-
for rejection in package.rejections.iter().filter(|rejection| !rejection.suppressed) {
134+
for rejection in
135+
package.rejections.iter().filter(|rejection| rejection.suppression_reason.is_none())
136+
{
137137
let domain = rejection
138138
.source
139139
.domain

cli/src/types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ pub struct EvaluatedDependency {
102102
pub struct PolicyRejection {
103103
pub title: String,
104104
pub source: RejectionSource,
105-
pub suppressed: bool,
105+
pub suppression_reason: Option<String>,
106106
}
107107

108108
/// Policy rejection source.

extensions/bundle/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ function logPackageAnalysisResults(result: PolicyEvaluationResponseRaw) {
248248

249249
for (const rejection of pkg.rejections) {
250250
// Skip suppressed issues.
251-
if (rejection.suppressed) {
251+
if (rejection.suppression_reason !== null) {
252252
continue;
253253
}
254254

extensions/cargo/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ function logPackageAnalysisResults(result: PolicyEvaluationResponseRaw) {
264264

265265
for (const rejection of pkg.rejections) {
266266
// Skip suppressed issues.
267-
if (rejection.suppressed) {
267+
if (rejection.suppression_reason !== null) {
268268
continue;
269269
}
270270

extensions/npm/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ function logPackageAnalysisResults(result: PolicyEvaluationResponseRaw) {
320320

321321
for (const rejection of pkg.rejections) {
322322
// Skip suppressed issues.
323-
if (rejection.suppressed) {
323+
if (rejection.suppression_reason !== null) {
324324
continue;
325325
}
326326

extensions/phylum.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ type EvaluatedDependencies = {
4848

4949
type PolicyRejection = {
5050
title: string;
51-
suppressed: boolean;
51+
suppression_reason: string | null;
5252
source: RejectionSource;
5353
};
5454

@@ -207,7 +207,7 @@ declare namespace Phylum {
207207
* version: "0.2.1",
208208
* rejections: [
209209
* title: "Commercial license risk detected in [email protected]",
210-
* suppressed: false,
210+
* suppression_reason: null,
211211
* source: {
212212
* type: "Issue",
213213
* tag: "HL0030",

extensions/pip/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ function logPackageAnalysisResults(result: PolicyEvaluationResponseRaw) {
266266

267267
for (const rejection of pkg.rejections) {
268268
// Skip suppressed issues.
269-
if (rejection.suppressed) {
269+
if (rejection.suppression_reason !== null) {
270270
continue;
271271
}
272272

extensions/poetry/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ function logPackageAnalysisResults(result: PolicyEvaluationResponseRaw) {
245245

246246
for (const rejection of pkg.rejections) {
247247
// Skip suppressed issues.
248-
if (rejection.suppressed) {
248+
if (rejection.suppression_reason !== null) {
249249
continue;
250250
}
251251

0 commit comments

Comments
 (0)