Remove dead code, complete printScorecardBlock

This commit is contained in:
Justin Hutchings
2024-03-11 22:17:28 +00:00
parent 70801db78f
commit ba6b805e18
5 changed files with 20 additions and 171 deletions
Generated Vendored
+8 -104
View File
@@ -652,8 +652,6 @@ function run() {
summary.addDeniedToSummary(deniedChanges);
printDeniedDependencies(deniedChanges, config);
}
core.debug('Adding scorecard to summary');
core.debug(`Config: ${config.show_openssf_scorecard}`);
if (config.show_openssf_scorecard) {
const scorecard = yield (0, scorecard_1.getScorecardLevels)(filteredChanges);
summary.addScorecardToSummary(scorecard, config);
@@ -751,10 +749,14 @@ function printNullLicenses(changes) {
}
function printScorecardBlock(scorecard, config) {
core.group('Scorecard', () => __awaiter(this, void 0, void 0, function* () {
var _a;
var _a, _b, _c, _d;
if (scorecard) {
for (const dependency of scorecard.dependencies) {
core.info(`${dependency.change.ecosystem}/${dependency.change.name}: OpenSSF Scorecard Score: ${(_a = dependency === null || dependency === void 0 ? void 0 : dependency.scorecard) === null || _a === void 0 ? void 0 : _a.score}`);
if (((_a = dependency.scorecard) === null || _a === void 0 ? void 0 : _a.score) &&
((_b = dependency.scorecard) === null || _b === void 0 ? void 0 : _b.score) < config.warn_on_openssf_scorecard_level) {
core.info(`${ansi_styles_1.default.color.red}${dependency.change.ecosystem}/${dependency.change.name}: OpenSSF Scorecard Score: ${(_c = dependency === null || dependency === void 0 ? void 0 : dependency.scorecard) === null || _c === void 0 ? void 0 : _c.score}${ansi_styles_1.default.red.close}`);
}
core.info(`${dependency.change.ecosystem}/${dependency.change.name}: OpenSSF Scorecard Score: ${(_d = dependency === null || dependency === void 0 ? void 0 : dependency.scorecard) === null || _d === void 0 ? void 0 : _d.score}`);
}
}
}));
@@ -854,7 +856,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
return result;
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.ScorecardSchema = exports.DepsDevProjectSchema = exports.ScorecardApiSchema = exports.ComparisonResponseSchema = exports.ChangesSchema = exports.ConfigurationOptionsSchema = exports.PullRequestSchema = exports.ChangeSchema = exports.SeveritySchema = exports.SCOPES = exports.SEVERITIES = void 0;
exports.ScorecardSchema = exports.ScorecardApiSchema = exports.ComparisonResponseSchema = exports.ChangesSchema = exports.ConfigurationOptionsSchema = exports.PullRequestSchema = exports.ChangeSchema = exports.SeveritySchema = exports.SCOPES = exports.SEVERITIES = void 0;
const z = __importStar(__nccwpck_require__(3301));
exports.SEVERITIES = ['critical', 'high', 'moderate', 'low'];
exports.SCOPES = ['unknown', 'runtime', 'development'];
@@ -974,55 +976,6 @@ exports.ScorecardApiSchema = z.object({
.nullish(),
score: z.number().nullish()
});
exports.DepsDevProjectSchema = z
.object({
projectKey: z.object({
id: z.string({})
}),
openIssuesCount: z.string().nullish(),
starsCount: z.string().nullish(),
forksCount: z.string().nullish(),
license: z.string().nullish(),
description: z.string().nullish(),
homepage: z.string().nullish(),
scorecard: z.object({
date: z.string(),
repository: z
.object({
name: z.string(),
commit: z.string()
})
.nullish(),
scorecard: z
.object({
version: z.string(),
commit: z.string()
})
.nullish(),
checks: z
.array(z.object({
name: z.string(),
documentation: z.object({
shortDescription: z.string(),
url: z.string()
}),
score: z.string(),
reason: z.string(),
details: z.array(z.string())
}))
.nullish(),
overallScore: z.number().nullish()
}),
ossFuzz: z
.object({
lineCount: z.string(),
lineCoverCount: z.string(),
date: z.string(),
configUrl: z.string()
})
.nullish()
})
.nullish();
exports.ScorecardSchema = z.object({
dependencies: z.array(z.object({
change: exports.ChangeSchema,
@@ -50033,7 +49986,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
return result;
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.ScorecardSchema = exports.DepsDevProjectSchema = exports.ScorecardApiSchema = exports.ComparisonResponseSchema = exports.ChangesSchema = exports.ConfigurationOptionsSchema = exports.PullRequestSchema = exports.ChangeSchema = exports.SeveritySchema = exports.SCOPES = exports.SEVERITIES = void 0;
exports.ScorecardSchema = exports.ScorecardApiSchema = exports.ComparisonResponseSchema = exports.ChangesSchema = exports.ConfigurationOptionsSchema = exports.PullRequestSchema = exports.ChangeSchema = exports.SeveritySchema = exports.SCOPES = exports.SEVERITIES = void 0;
const z = __importStar(__nccwpck_require__(3301));
exports.SEVERITIES = ['critical', 'high', 'moderate', 'low'];
exports.SCOPES = ['unknown', 'runtime', 'development'];
@@ -50153,55 +50106,6 @@ exports.ScorecardApiSchema = z.object({
.nullish(),
score: z.number().nullish()
});
exports.DepsDevProjectSchema = z
.object({
projectKey: z.object({
id: z.string({})
}),
openIssuesCount: z.string().nullish(),
starsCount: z.string().nullish(),
forksCount: z.string().nullish(),
license: z.string().nullish(),
description: z.string().nullish(),
homepage: z.string().nullish(),
scorecard: z.object({
date: z.string(),
repository: z
.object({
name: z.string(),
commit: z.string()
})
.nullish(),
scorecard: z
.object({
version: z.string(),
commit: z.string()
})
.nullish(),
checks: z
.array(z.object({
name: z.string(),
documentation: z.object({
shortDescription: z.string(),
url: z.string()
}),
score: z.string(),
reason: z.string(),
details: z.array(z.string())
}))
.nullish(),
overallScore: z.number().nullish()
}),
ossFuzz: z
.object({
lineCount: z.string(),
lineCoverCount: z.string(),
date: z.string(),
configUrl: z.string()
})
.nullish()
})
.nullish();
exports.ScorecardSchema = z.object({
dependencies: z.array(z.object({
change: exports.ChangeSchema,
Generated Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
+8 -2
View File
@@ -150,8 +150,6 @@ async function run(): Promise<void> {
summary.addDeniedToSummary(deniedChanges)
printDeniedDependencies(deniedChanges, config)
}
core.debug('Adding scorecard to summary')
core.debug(`Config: ${config.show_openssf_scorecard}`)
if (config.show_openssf_scorecard) {
const scorecard = await getScorecardLevels(filteredChanges)
summary.addScorecardToSummary(scorecard, config)
@@ -281,6 +279,14 @@ function printScorecardBlock(
core.group('Scorecard', async () => {
if (scorecard) {
for (const dependency of scorecard.dependencies) {
if (
dependency.scorecard?.score &&
dependency.scorecard?.score < config.warn_on_openssf_scorecard_level
) {
core.info(
`${styles.color.red}${dependency.change.ecosystem}/${dependency.change.name}: OpenSSF Scorecard Score: ${dependency?.scorecard?.score}${styles.red.close}`
)
}
core.info(
`${dependency.change.ecosystem}/${dependency.change.name}: OpenSSF Scorecard Score: ${dependency?.scorecard?.score}`
)
-53
View File
@@ -133,58 +133,6 @@ export const ScorecardApiSchema = z.object({
score: z.number().nullish()
})
export const DepsDevProjectSchema = z
.object({
projectKey: z.object({
id: z.string({})
}),
openIssuesCount: z.string().nullish(),
starsCount: z.string().nullish(),
forksCount: z.string().nullish(),
license: z.string().nullish(),
description: z.string().nullish(),
homepage: z.string().nullish(),
scorecard: z.object({
date: z.string(),
repository: z
.object({
name: z.string(),
commit: z.string()
})
.nullish(),
scorecard: z
.object({
version: z.string(),
commit: z.string()
})
.nullish(),
checks: z
.array(
z.object({
name: z.string(),
documentation: z.object({
shortDescription: z.string(),
url: z.string()
}),
score: z.string(),
reason: z.string(),
details: z.array(z.string())
})
)
.nullish(),
overallScore: z.number().nullish()
}),
ossFuzz: z
.object({
lineCount: z.string(),
lineCoverCount: z.string(),
date: z.string(),
configUrl: z.string()
})
.nullish()
})
.nullish()
export const ScorecardSchema = z.object({
dependencies: z.array(
z.object({
@@ -200,6 +148,5 @@ export type ComparisonResponse = z.infer<typeof ComparisonResponseSchema>
export type ConfigurationOptions = z.infer<typeof ConfigurationOptionsSchema>
export type Severity = z.infer<typeof SeveritySchema>
export type Scope = (typeof SCOPES)[number]
export type DepsDevProject = z.infer<typeof DepsDevProjectSchema>
export type Scorecard = z.infer<typeof ScorecardSchema>
export type ScorecardApi = z.infer<typeof ScorecardApiSchema>
+3 -11
View File
@@ -1,12 +1,4 @@
import {
Change,
DepsDevProject,
DepsDevProjectSchema,
Scorecard,
ScorecardApi
} from './schemas'
import {isSPDXValid, octokitClient} from './utils'
import {PackageURL} from 'packageurl-js'
import {Change, Scorecard, ScorecardApi} from './schemas'
import * as core from '@actions/core'
export async function getScorecardLevels(
@@ -44,8 +36,8 @@ export async function getScorecardLevels(
) {
try {
scorecardApi = await getScorecard(repositoryUrl)
} catch (error: any) {
core.debug(`Error querying for scorecard: ${error.message}`)
} catch (error: unknown) {
core.debug(`Error querying for scorecard: ${(error as Error).message}`)
}
}
data.dependencies.push({