Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "secure-inline-scan-action",
"version": "6.3.2",
"version": "6.3.3",
"description": "This actions performs image analysis on locally built container image and posts the result of the analysis to Sysdig Secure.",
"main": "index.js",
"scripts": {
Expand Down
6 changes: 4 additions & 2 deletions src/domain/services/filtering.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,20 @@ export interface FilterOptions {
export type PackageFilterOption = (pkgs: Package[]) => Package[];

export function withPackageTypes(packageTypes: string[]): PackageFilterOption {
const lowerCasePackageTypes = packageTypes.map(type => type.toLowerCase());
return (pkgs: Package[]) =>
pkgs.filter((pkg) =>
packageTypes.includes(pkg.packageType.toString().toLowerCase())
lowerCasePackageTypes.includes(pkg.packageType.toString().toLowerCase())
);
}

export function withoutPackageTypes(
packageTypes: string[]
): PackageFilterOption {
const lowerCasePackageTypes = packageTypes.map(type => type.toLowerCase());
return (pkgs: Package[]) =>
pkgs.filter(
(pkg) => !packageTypes.includes(pkg.packageType.toString().toLowerCase())
(pkg) => !lowerCasePackageTypes.includes(pkg.packageType.toString().toLowerCase())
);
}

Expand Down
24 changes: 24 additions & 0 deletions tests/domain/services/filtering.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@ describe("filterPackages", () => {
expect(result[0].name).toBe("pkg2");
});

it("filters by packageTypes with mixed case input", () => {
const pkgs = [
newPkg("pkg1", PackageType.Os, [highVuln]),
newPkg("pkg2", PackageType.Java, [highVuln]),
];

const filters: FilterOptions = { packageTypes: ["Java"] };
const result = filterPackages(pkgs, filters);
expect(result.length).toBe(1);
expect(result[0].name).toBe("pkg2");
});

it("filters by notPackageTypes", () => {
const pkgs = [
newPkg("pkg1", PackageType.Os, [highVuln]),
Expand All @@ -60,6 +72,18 @@ describe("filterPackages", () => {
expect(result[0].name).toBe("pkg2");
});

it("filters by notPackageTypes with mixed case input", () => {
const pkgs = [
newPkg("pkg1", PackageType.Os, [highVuln]),
newPkg("pkg2", PackageType.Java, [highVuln]),
];

const filters: FilterOptions = { notPackageTypes: ["Os"] };
const result = filterPackages(pkgs, filters);
expect(result.length).toBe(1);
expect(result[0].name).toBe("pkg2");
});

it("filters out accepted risks if excludeAccepted is true", () => {
const pkgWithAcceptedRisk = newPkg("pkg1", PackageType.Os, [highVuln]);
pkgWithAcceptedRisk.addAcceptedRisk(newAcceptedRisk());
Expand Down
Loading