From cc302f4c2b2b2b7f7df3cbeb0f7c785038122b38 Mon Sep 17 00:00:00 2001 From: tgrall Date: Mon, 20 Mar 2023 09:07:07 +0100 Subject: [PATCH] fix linter/format --- __tests__/config.test.ts | 1 - src/main.ts | 17 ++++++++++------- src/schemas.ts | 8 +++++++- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/__tests__/config.test.ts b/__tests__/config.test.ts index 7a3bd57..b91aade 100644 --- a/__tests__/config.test.ts +++ b/__tests__/config.test.ts @@ -60,7 +60,6 @@ test('it defaults to none severity', async () => { expect(config.fail_on_severity).toEqual('none') }) - test('it defaults to empty allow/deny lists ', async () => { const config = await readConfig() diff --git a/src/main.ts b/src/main.ts index 64a74a0..ee0dcf1 100644 --- a/src/main.ts +++ b/src/main.ts @@ -3,7 +3,7 @@ import * as dependencyGraph from './dependency-graph' import * as github from '@actions/github' import styles from 'ansi-styles' import {RequestError} from '@octokit/request-error' -import {Change, Severity, Changes, FailOnSeverity} from './schemas' +import {Change, Severity, Changes} from './schemas' import {readConfig} from '../src/config' import { filterChangesBySeverity, @@ -35,9 +35,9 @@ async function run(): Promise { } // config.fail_on_severity const failOnSeverityParams = config.fail_on_severity - const failOnVulnerability = (config.fail_on_severity != 'none') - let minSeverity: Severity = 'low' - if (failOnSeverityParams != 'none') { + const failOnVulnerability = config.fail_on_severity !== 'none' + let minSeverity: Severity = 'low' + if (failOnSeverityParams !== 'none') { minSeverity = failOnSeverityParams } @@ -73,7 +73,11 @@ async function run(): Promise { if (config.vulnerability_check) { summary.addChangeVulnerabilitiesToSummary(vulnerableChanges, minSeverity) - printVulnerabilitiesBlock(vulnerableChanges, minSeverity, failOnVulnerability) + printVulnerabilitiesBlock( + vulnerableChanges, + minSeverity, + failOnVulnerability + ) } if (config.license_check) { summary.addLicensesToSummary(invalidLicenseChanges, config) @@ -123,7 +127,6 @@ function printVulnerabilitiesBlock( if (vulFound) { const msg = 'Dependency review detected vulnerable packages.' if (failOnVulnerability) { - const msg = 'Dependency review detected vulnerable packages.' core.setFailed(msg) } else { core.warning(msg) @@ -157,7 +160,7 @@ function printLicensesBlock( if (invalidLicenseChanges.forbidden.length > 0) { core.info('\nThe following dependencies have incompatible licenses:') printLicensesError(invalidLicenseChanges.forbidden) - const msg = 'Dependency review detected incompatible licenses.'; + const msg = 'Dependency review detected incompatible licenses.' if (failOnVulnerability) { core.setFailed(msg) } else { diff --git a/src/schemas.ts b/src/schemas.ts index 077e35c..0917065 100644 --- a/src/schemas.ts +++ b/src/schemas.ts @@ -1,6 +1,12 @@ import * as z from 'zod' -export const FAIL_ON_SEVERITIES = ['critical', 'high', 'moderate', 'low', 'none'] as const +export const FAIL_ON_SEVERITIES = [ + 'critical', + 'high', + 'moderate', + 'low', + 'none' +] as const export const SEVERITIES = ['critical', 'high', 'moderate', 'low'] as const export const SCOPES = ['unknown', 'runtime', 'development'] as const