Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cc98e9ceac | ||
|
|
5110b138ff | ||
|
|
1123662dce | ||
|
|
8017d8b36f |
No files matched your search
+4
-2
@@ -28,7 +28,7 @@
|
||||
"error",
|
||||
{"allowExpressions": true}
|
||||
],
|
||||
"func-call-spacing": ["error", "never"],
|
||||
"@typescript-eslint/func-call-spacing": ["error", "never"],
|
||||
"@typescript-eslint/no-array-constructor": "error",
|
||||
"@typescript-eslint/no-empty-interface": "error",
|
||||
"@typescript-eslint/no-explicit-any": "error",
|
||||
@@ -49,7 +49,9 @@
|
||||
"@typescript-eslint/promise-function-async": "error",
|
||||
"@typescript-eslint/require-array-sort-compare": "error",
|
||||
"@typescript-eslint/restrict-plus-operands": "error",
|
||||
"semi": ["error", "never"],
|
||||
"semi": "off",
|
||||
"@typescript-eslint/semi": ["error", "never"],
|
||||
"@typescript-eslint/type-annotation-spacing": "error",
|
||||
"@typescript-eslint/unbound-method": "error"
|
||||
},
|
||||
"env": {
|
||||
|
||||
@@ -18,7 +18,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/setup-node@v7
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: 24
|
||||
cache: npm
|
||||
@@ -31,7 +31,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/setup-node@v7
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: 24
|
||||
cache: npm
|
||||
|
||||
@@ -28,7 +28,7 @@ jobs:
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v4.37.9
|
||||
uses: github/codeql-action/init@v4
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||
@@ -43,6 +43,6 @@ jobs:
|
||||
- dist/sourcemap-register.js
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v4.37.9
|
||||
uses: github/codeql-action/analyze@v4
|
||||
with:
|
||||
category: "/language:${{matrix.language}}"
|
||||
@@ -12,7 +12,7 @@ jobs:
|
||||
stale:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/stale@v11.0.0
|
||||
- uses: actions/stale@v10.2.0
|
||||
name: Clean up stale PRs and Issues
|
||||
with:
|
||||
stale-pr-message: "👋 This pull request has been marked as stale because it has been open with no activity for 180 days. You can: comment on the PR or remove the stale label to hold stalebot off for a while, add the `Keep` label to hold stale off permanently, or do nothing. If you do nothing, this pull request will be closed eventually by the stalebot. Please see CONTRIBUTING.md for more policy details."
|
||||
|
||||
@@ -1,231 +0,0 @@
|
||||
import {expect, test, beforeEach} from '@jest/globals'
|
||||
|
||||
// Mock GitHub Actions modules before importing anything else
|
||||
jest.mock('@actions/github')
|
||||
jest.mock('@actions/core')
|
||||
|
||||
// Create mocks that will be available throughout the module
|
||||
const createCommentMock = jest.fn()
|
||||
const updateCommentMock = jest.fn()
|
||||
const listCommentsMock = jest.fn()
|
||||
const paginateIteratorMock = jest.fn()
|
||||
|
||||
// Mock the octokit instance creation
|
||||
jest.mock('@actions/github/lib/utils', () => ({
|
||||
GitHub: {
|
||||
plugin: jest.fn(() =>
|
||||
jest.fn(() => ({
|
||||
rest: {
|
||||
issues: {
|
||||
createComment: createCommentMock,
|
||||
updateComment: updateCommentMock,
|
||||
listComments: listCommentsMock
|
||||
}
|
||||
},
|
||||
paginate: {
|
||||
iterator: paginateIteratorMock
|
||||
}
|
||||
}))
|
||||
)
|
||||
},
|
||||
getOctokitOptions: jest.fn(() => ({}))
|
||||
}))
|
||||
|
||||
jest.mock('@octokit/plugin-retry', () => ({
|
||||
retry: {}
|
||||
}))
|
||||
|
||||
// Now import the modules that use the mocks
|
||||
import {commentPr} from '../src/comment-pr'
|
||||
import {ConfigurationOptions} from '../src/schemas'
|
||||
import * as github from '@actions/github'
|
||||
import * as core from '@actions/core'
|
||||
|
||||
const mockGithub = github as jest.Mocked<typeof github>
|
||||
const mockCore = core as jest.Mocked<typeof core>
|
||||
|
||||
const defaultConfig: ConfigurationOptions = {
|
||||
comment_summary_in_pr: 'on-failure',
|
||||
fail_on_severity: 'high',
|
||||
fail_on_scopes: ['runtime'],
|
||||
allow_licenses: [],
|
||||
deny_licenses: [],
|
||||
allow_dependencies_licenses: [],
|
||||
allow_ghsas: [],
|
||||
license_check: true,
|
||||
vulnerability_check: true,
|
||||
warn_only: false,
|
||||
show_openssf_scorecard: false,
|
||||
warn_on_openssf_scorecard_level: 3,
|
||||
retry_on_snapshot_warnings: false,
|
||||
retry_on_snapshot_warnings_timeout: 120,
|
||||
show_patched_versions: false,
|
||||
base_ref: '',
|
||||
head_ref: '',
|
||||
deny_packages: [],
|
||||
deny_groups: []
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
jest.clearAllMocks()
|
||||
|
||||
// Setup GitHub context
|
||||
Object.defineProperty(mockGithub, 'context', {
|
||||
value: {
|
||||
repo: {owner: 'test-owner', repo: 'test-repo'},
|
||||
payload: {pull_request: {number: 123}}
|
||||
},
|
||||
writable: true
|
||||
})
|
||||
|
||||
mockCore.getInput.mockReturnValue('mock-token')
|
||||
|
||||
// Setup default mock returns
|
||||
createCommentMock.mockResolvedValue({data: {id: 1}})
|
||||
updateCommentMock.mockResolvedValue({data: {id: 1}})
|
||||
listCommentsMock.mockResolvedValue({data: []})
|
||||
paginateIteratorMock.mockReturnValue([{data: []}])
|
||||
})
|
||||
|
||||
test('commentPr creates comment in always mode regardless of issues', async () => {
|
||||
const config = {...defaultConfig, comment_summary_in_pr: 'always' as const}
|
||||
|
||||
await commentPr('Test content', config, false)
|
||||
|
||||
expect(createCommentMock).toHaveBeenCalledWith({
|
||||
owner: 'test-owner',
|
||||
repo: 'test-repo',
|
||||
issue_number: 123,
|
||||
body: 'Test content\n\n<!-- dependency-review-pr-comment-marker -->'
|
||||
})
|
||||
expect(updateCommentMock).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
test('commentPr creates comment in on-failure mode when issues found', async () => {
|
||||
const config = {
|
||||
...defaultConfig,
|
||||
comment_summary_in_pr: 'on-failure' as const
|
||||
}
|
||||
|
||||
await commentPr('Issues found', config, true)
|
||||
|
||||
expect(createCommentMock).toHaveBeenCalledWith({
|
||||
owner: 'test-owner',
|
||||
repo: 'test-repo',
|
||||
issue_number: 123,
|
||||
body: 'Issues found\n\n<!-- dependency-review-pr-comment-marker -->'
|
||||
})
|
||||
expect(updateCommentMock).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
test('commentPr does not comment in never mode', async () => {
|
||||
const config = {...defaultConfig, comment_summary_in_pr: 'never' as const}
|
||||
|
||||
await commentPr('Test content', config, false)
|
||||
|
||||
expect(createCommentMock).not.toHaveBeenCalled()
|
||||
expect(updateCommentMock).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
test('commentPr does not comment in on-failure mode when no issues and no existing comment', async () => {
|
||||
const config = {
|
||||
...defaultConfig,
|
||||
comment_summary_in_pr: 'on-failure' as const
|
||||
}
|
||||
|
||||
await commentPr('No issues', config, false)
|
||||
|
||||
expect(createCommentMock).not.toHaveBeenCalled()
|
||||
expect(updateCommentMock).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
test('commentPr updates existing comment in on-failure mode when no issues but comment exists', async () => {
|
||||
const config = {
|
||||
...defaultConfig,
|
||||
comment_summary_in_pr: 'on-failure' as const
|
||||
}
|
||||
|
||||
// Mock existing comment
|
||||
const existingComment = {
|
||||
id: 456,
|
||||
body: 'Previous issues\n\n<!-- dependency-review-pr-comment-marker -->'
|
||||
}
|
||||
paginateIteratorMock.mockReturnValue([{data: [existingComment]}])
|
||||
|
||||
await commentPr('Issues resolved', config, false)
|
||||
|
||||
expect(createCommentMock).not.toHaveBeenCalled()
|
||||
expect(updateCommentMock).toHaveBeenCalledWith({
|
||||
owner: 'test-owner',
|
||||
repo: 'test-repo',
|
||||
comment_id: 456,
|
||||
body: 'Issues resolved\n\n<!-- dependency-review-pr-comment-marker -->'
|
||||
})
|
||||
})
|
||||
|
||||
test('commentPr updates existing comment instead of creating new one in always mode', async () => {
|
||||
const config = {...defaultConfig, comment_summary_in_pr: 'always' as const}
|
||||
|
||||
// Mock existing comment
|
||||
const existingComment = {
|
||||
id: 789,
|
||||
body: 'Old content\n\n<!-- dependency-review-pr-comment-marker -->'
|
||||
}
|
||||
paginateIteratorMock.mockReturnValue([{data: [existingComment]}])
|
||||
|
||||
await commentPr('Updated content', config, false)
|
||||
|
||||
expect(createCommentMock).not.toHaveBeenCalled()
|
||||
expect(updateCommentMock).toHaveBeenCalledWith({
|
||||
owner: 'test-owner',
|
||||
repo: 'test-repo',
|
||||
comment_id: 789,
|
||||
body: 'Updated content\n\n<!-- dependency-review-pr-comment-marker -->'
|
||||
})
|
||||
})
|
||||
|
||||
test('commentPr finds comment marker among multiple comments', async () => {
|
||||
const config = {...defaultConfig, comment_summary_in_pr: 'always' as const}
|
||||
|
||||
// Mock multiple comments with marker in the middle
|
||||
const comments = [
|
||||
{id: 1, body: 'Regular comment'},
|
||||
{id: 2, body: 'Another comment'},
|
||||
{
|
||||
id: 3,
|
||||
body: 'Target comment\n\n<!-- dependency-review-pr-comment-marker -->'
|
||||
},
|
||||
{id: 4, body: 'Last comment'}
|
||||
]
|
||||
paginateIteratorMock.mockReturnValue([{data: comments}])
|
||||
|
||||
await commentPr('Updated content', config, false)
|
||||
|
||||
expect(createCommentMock).not.toHaveBeenCalled()
|
||||
expect(updateCommentMock).toHaveBeenCalledWith({
|
||||
owner: 'test-owner',
|
||||
repo: 'test-repo',
|
||||
comment_id: 3,
|
||||
body: 'Updated content\n\n<!-- dependency-review-pr-comment-marker -->'
|
||||
})
|
||||
})
|
||||
|
||||
test('commentPr handles non-PR context gracefully', async () => {
|
||||
Object.defineProperty(mockGithub, 'context', {
|
||||
value: {
|
||||
repo: {owner: 'test-owner', repo: 'test-repo'},
|
||||
payload: {}
|
||||
},
|
||||
writable: true
|
||||
})
|
||||
|
||||
const config = {...defaultConfig, comment_summary_in_pr: 'always' as const}
|
||||
|
||||
await commentPr('Test content', config, false)
|
||||
|
||||
expect(mockCore.warning).toHaveBeenCalledWith(
|
||||
'Not in the context of a pull request. Skipping comment creation.'
|
||||
)
|
||||
expect(createCommentMock).not.toHaveBeenCalled()
|
||||
expect(updateCommentMock).not.toHaveBeenCalled()
|
||||
})
|
||||
@@ -390,3 +390,51 @@ describe('GH License API fallback', () => {
|
||||
expect(unlicensed.length).toEqual(1)
|
||||
})
|
||||
})
|
||||
|
||||
describe('manifest/lock file license deduplication', () => {
|
||||
const manifestChange: Change = {
|
||||
change_type: 'added',
|
||||
manifest: 'pyproject.toml',
|
||||
ecosystem: 'pip',
|
||||
name: 'pydantic',
|
||||
version: '^ 2.11.0',
|
||||
package_url: 'pkg:pypi/pydantic',
|
||||
license: null,
|
||||
source_repository_url: null,
|
||||
scope: 'runtime',
|
||||
vulnerabilities: []
|
||||
}
|
||||
|
||||
const lockChange: Change = {
|
||||
...manifestChange,
|
||||
manifest: 'poetry.lock',
|
||||
version: '2.11.0',
|
||||
package_url: 'pkg:pypi/pydantic@2.11.0',
|
||||
license: 'MIT'
|
||||
}
|
||||
|
||||
test('does not flag an unlicensed manifest entry when a licensed lock entry exists', async () => {
|
||||
const {unlicensed} = await getInvalidLicenseChanges(
|
||||
[manifestChange, lockChange],
|
||||
{}
|
||||
)
|
||||
|
||||
expect(mockOctokit.rest.licenses.getForRepo).not.toHaveBeenCalled()
|
||||
expect(unlicensed.length).toEqual(0)
|
||||
})
|
||||
|
||||
test('still flags an unlicensed manifest entry when there is no licensed counterpart', async () => {
|
||||
const {unlicensed} = await getInvalidLicenseChanges([manifestChange], {})
|
||||
|
||||
expect(unlicensed.length).toEqual(1)
|
||||
})
|
||||
|
||||
test('does not deduplicate across differing change_types', async () => {
|
||||
const {unlicensed} = await getInvalidLicenseChanges(
|
||||
[manifestChange, {...lockChange, change_type: 'removed'}],
|
||||
{}
|
||||
)
|
||||
|
||||
expect(unlicensed.length).toEqual(1)
|
||||
})
|
||||
})
|
||||
+2
-18
@@ -70,15 +70,8 @@ const octo = new retryingOctokit(githubUtils.getOctokitOptions(core.getInput('re
|
||||
const COMMENT_MARKER = '<!-- dependency-review-pr-comment-marker -->';
|
||||
function commentPr(commentContent, config, issueFound) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
// For 'on-failure' mode, we need to handle both failure and success cases
|
||||
// - On failure: create/update comment with issues
|
||||
// - On success: update existing comment to show resolution (if one exists)
|
||||
const shouldComment = config.comment_summary_in_pr === 'always' ||
|
||||
(config.comment_summary_in_pr === 'on-failure' && issueFound) ||
|
||||
(config.comment_summary_in_pr === 'on-failure' &&
|
||||
!issueFound &&
|
||||
(yield hasExistingComment()));
|
||||
if (!shouldComment) {
|
||||
if (!(config.comment_summary_in_pr === 'always' ||
|
||||
(config.comment_summary_in_pr === 'on-failure' && issueFound))) {
|
||||
return;
|
||||
}
|
||||
if (!github.context.payload.pull_request) {
|
||||
@@ -120,15 +113,6 @@ function commentPr(commentContent, config, issueFound) {
|
||||
}
|
||||
});
|
||||
}
|
||||
function hasExistingComment() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
if (!github.context.payload.pull_request) {
|
||||
return false;
|
||||
}
|
||||
const existingCommentId = yield findCommentByMarker(COMMENT_MARKER);
|
||||
return existingCommentId !== undefined;
|
||||
});
|
||||
}
|
||||
function findCommentByMarker(commentBodyIncludes) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
var _a, e_1, _b, _c;
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"version":3,"file":"index.js","mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;ACzJA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;ACpFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;AC1EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;ACzCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;AC3NA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACALine truncated
|
||||
{"version":3,"file":"index.js","mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;ACzIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;ACpFA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;AC1EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;ACzCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;AC3NA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACALine truncated
|
||||
Generated
+321
-731
File diff suppressed because it is too large.
Load diff
+12
-14
@@ -37,35 +37,33 @@
|
||||
"jest": "^29.7.0",
|
||||
"octokit": "^3.1.2",
|
||||
"semver": "^7.8.5",
|
||||
"spdx-expression-parse": "^5.0.0",
|
||||
"spdx-expression-parse": "^4.0.0",
|
||||
"spdx-satisfies": "^6.0.0",
|
||||
"ts-jest": "^29.4.12",
|
||||
"ts-jest": "^29.4.11",
|
||||
"yaml": "^2.9.0",
|
||||
"zod": "^3.24.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/jest": "^29.5.14",
|
||||
"@types/node": "^24",
|
||||
"@types/semver": "^7.8.0",
|
||||
"@types/spdx-expression-parse": "^4.0.0",
|
||||
"@typescript-eslint/eslint-plugin": "^8.68.0",
|
||||
"@typescript-eslint/parser": "^8.68.0",
|
||||
"@vercel/ncc": "^0.45.0",
|
||||
"@types/spdx-expression-parse": "^3.0.4",
|
||||
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
||||
"@typescript-eslint/parser": "^6.21.0",
|
||||
"@vercel/ncc": "^0.44.0",
|
||||
"esbuild-register": "^3.6.0",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint-plugin-github": "^4.10.2",
|
||||
"eslint-plugin-jest": "29.16.5",
|
||||
"eslint-plugin-jest": "^28.8.3",
|
||||
"eslint-plugin-prettier": "^5.5.6",
|
||||
"js-yaml": "^5.4.1",
|
||||
"js-yaml": "^4.1.1",
|
||||
"nodemon": "^3.1.14",
|
||||
"prettier": "3.9.6",
|
||||
"prettier": "3.8.4",
|
||||
"typescript": "^5.9.2"
|
||||
},
|
||||
"overrides": {
|
||||
"cross-spawn": "^7.0.5",
|
||||
"eslint-plugin-escompat": "3.4.0",
|
||||
"cross-spawn": ">=7.0.5",
|
||||
"@octokit/request-error@5.0.1": "5.1.1",
|
||||
"undici": "^6.27.0",
|
||||
"minimatch": "^9.0.7"
|
||||
"undici": ">=6.27.0",
|
||||
"minimatch": ">=9.0.7"
|
||||
}
|
||||
}
|
||||
+6
-19
@@ -20,16 +20,12 @@ export async function commentPr(
|
||||
config: ConfigurationOptions,
|
||||
issueFound: boolean
|
||||
): Promise<void> {
|
||||
// For 'on-failure' mode, we need to handle both failure and success cases
|
||||
// - On failure: create/update comment with issues
|
||||
// - On success: update existing comment to show resolution (if one exists)
|
||||
const shouldComment =
|
||||
config.comment_summary_in_pr === 'always' ||
|
||||
(config.comment_summary_in_pr === 'on-failure' && issueFound) ||
|
||||
(config.comment_summary_in_pr === 'on-failure' &&
|
||||
!issueFound &&
|
||||
(await hasExistingComment()))
|
||||
if (!shouldComment) {
|
||||
if (
|
||||
!(
|
||||
config.comment_summary_in_pr === 'always' ||
|
||||
(config.comment_summary_in_pr === 'on-failure' && issueFound)
|
||||
)
|
||||
) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -79,15 +75,6 @@ export async function commentPr(
|
||||
}
|
||||
}
|
||||
|
||||
async function hasExistingComment(): Promise<boolean> {
|
||||
if (!github.context.payload.pull_request) {
|
||||
return false
|
||||
}
|
||||
|
||||
const existingCommentId = await findCommentByMarker(COMMENT_MARKER)
|
||||
return existingCommentId !== undefined
|
||||
}
|
||||
|
||||
async function findCommentByMarker(
|
||||
commentBodyIncludes: string
|
||||
): Promise<number | undefined> {
|
||||
|
||||
+4
-3
@@ -216,9 +216,10 @@ async function getRemoteConfig(configOpts: {
|
||||
ref: configOpts.ref
|
||||
})
|
||||
|
||||
// When using mediaType.format = 'raw', the response data is a string,
|
||||
// but getContent's return type does not reflect that, so validate it here.
|
||||
return z.string().parse(data)
|
||||
// When using mediaType.format = 'raw', the response.data is a string
|
||||
// but this is not reflected in the return type of getContent, so we're
|
||||
// casting the return value to a string.
|
||||
return z.string().parse(data as unknown)
|
||||
} catch (error) {
|
||||
core.debug(error as string)
|
||||
throw new Error('Error fetching remote config file')
|
||||
|
||||
+51
-4
@@ -17,7 +17,9 @@ import * as spdx from './spdx'
|
||||
* @returns {Promise<{Object.<string, Array.<Change>>}} A promise to a Record Object. The keys are strings, unlicensed, unresolved and forbidden. The values are a list of changes
|
||||
*/
|
||||
export type InvalidLicenseChangeTypes =
|
||||
'unlicensed' | 'unresolved' | 'forbidden'
|
||||
| 'unlicensed'
|
||||
| 'unresolved'
|
||||
| 'forbidden'
|
||||
export type InvalidLicenseChanges = Record<InvalidLicenseChangeTypes, Changes>
|
||||
export async function getInvalidLicenseChanges(
|
||||
changes: Change[],
|
||||
@@ -82,7 +84,7 @@ export async function getInvalidLicenseChanges(
|
||||
invalidLicenseChanges.unresolved.push(change)
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
} catch (err) {
|
||||
invalidLicenseChanges.unresolved.push(change)
|
||||
}
|
||||
}
|
||||
@@ -105,7 +107,7 @@ const fetchGHLicense = async (
|
||||
repo
|
||||
})
|
||||
return response.data.license?.spdx_id ?? null
|
||||
} catch {
|
||||
} catch (_) {
|
||||
return null
|
||||
}
|
||||
}
|
||||
@@ -121,7 +123,7 @@ const parseGitHubURL = (url: string): {owner: string; repo: string} | null => {
|
||||
return null
|
||||
}
|
||||
return {owner: components[1], repo: components[2]}
|
||||
} catch {
|
||||
} catch (_) {
|
||||
return null
|
||||
}
|
||||
}
|
||||
@@ -152,6 +154,49 @@ const setGHLicenses = async (changes: Change[]): Promise<Change[]> => {
|
||||
const truncatedDGLicense = (license: string): boolean =>
|
||||
license.length === 255 && !spdx.isValid(license)
|
||||
|
||||
// Builds a key identifying a package across manifest and lock files, so that
|
||||
// duplicate entries for the same package (differing only by version specifier)
|
||||
// can be matched. Changes are keyed by their parsed PURL type and full name,
|
||||
// ignoring the version.
|
||||
function packageKey(change: Change): string {
|
||||
const purl = parsePURL(change.package_url)
|
||||
const type = purl.type.toLowerCase()
|
||||
|
||||
const fullName =
|
||||
purl.namespace && purl.name
|
||||
? `${purl.namespace}/${purl.name}`
|
||||
: purl.name ?? purl.namespace
|
||||
|
||||
if (type && fullName) {
|
||||
return `${type}/${fullName.toLowerCase()}`
|
||||
}
|
||||
|
||||
// Fall back to ecosystem + name when the PURL can't be parsed.
|
||||
return `${change.ecosystem.toLowerCase()}/${change.name.toLowerCase()}`
|
||||
}
|
||||
|
||||
// The dependency graph API can list the same package more than once: e.g. from
|
||||
// a manifest file (like pyproject.toml) with a version range and a null
|
||||
// license, and from a lock file (like poetry.lock) with a pinned version and a
|
||||
// resolved license. This drops the null-license entries for a package when
|
||||
// another entry of the same change_type resolves a license for it, so the
|
||||
// package is not incorrectly reported as unlicensed.
|
||||
function filterLicensedDuplicates(changes: Changes): Changes {
|
||||
const licensedKeys = new Set<string>()
|
||||
for (const change of changes) {
|
||||
if (change.change_type !== 'removed' && change.license !== null) {
|
||||
licensedKeys.add(`${change.change_type}/${packageKey(change)}`)
|
||||
}
|
||||
}
|
||||
|
||||
return changes.filter(change => {
|
||||
if (change.change_type === 'removed' || change.license !== null) {
|
||||
return true
|
||||
}
|
||||
return !licensedKeys.has(`${change.change_type}/${packageKey(change)}`)
|
||||
})
|
||||
}
|
||||
|
||||
async function groupChanges(
|
||||
changes: Changes,
|
||||
licenseExclusions: PackageURL[] | null = null
|
||||
@@ -189,6 +234,8 @@ async function groupChanges(
|
||||
})
|
||||
}
|
||||
|
||||
candidateChanges = filterLicensedDuplicates(candidateChanges)
|
||||
|
||||
const ghChanges = []
|
||||
|
||||
for (const change of candidateChanges) {
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ import * as core from '@actions/core'
|
||||
export async function getScorecardLevels(
|
||||
changes: Change[]
|
||||
): Promise<Scorecard> {
|
||||
const data: Scorecard = {dependencies: []}
|
||||
const data: Scorecard = {dependencies: []} as Scorecard
|
||||
for (const change of changes) {
|
||||
const ecosystem = change.ecosystem
|
||||
const packageName = change.name
|
||||
|
||||
+4
-4
@@ -15,7 +15,7 @@ export function satisfies(candidateExpr: string, allowList: string[]): boolean {
|
||||
candidateExpr = cleanInvalidSPDX(candidateExpr)
|
||||
try {
|
||||
return spdxSatisfies(candidateExpr, allowList)
|
||||
} catch {
|
||||
} catch (_) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,7 @@ export function satisfiesAny(
|
||||
candidateExpr = cleanInvalidSPDX(candidateExpr)
|
||||
try {
|
||||
return spdxlib.satisfiesAny(candidateExpr, licenses)
|
||||
} catch {
|
||||
} catch (_) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
@@ -41,7 +41,7 @@ export function satisfiesAll(
|
||||
candidateExpr = cleanInvalidSPDX(candidateExpr)
|
||||
try {
|
||||
return spdxlib.satisfiesAll(candidateExpr, licenses)
|
||||
} catch {
|
||||
} catch (_) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
@@ -52,7 +52,7 @@ export function isValid(spdxExpr: string): boolean {
|
||||
try {
|
||||
parse(spdxExpr)
|
||||
return true
|
||||
} catch {
|
||||
} catch (_) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
+3
-2
@@ -135,7 +135,7 @@ function extractPatchVersionId(patchData: unknown): string | null {
|
||||
|
||||
// Handle object format with identifier field (for backward compatibility)
|
||||
if (patchData && typeof patchData === 'object' && 'identifier' in patchData) {
|
||||
const id = patchData.identifier
|
||||
const id = (patchData as {identifier: unknown}).identifier
|
||||
return typeof id === 'string' ? id : null
|
||||
}
|
||||
|
||||
@@ -422,7 +422,8 @@ export async function addChangeVulnerabilitiesToSummary(
|
||||
// Find matching entry by ecosystem, package name (case-insensitive), and version range
|
||||
// Use pre-normalized values from cache to avoid repeated lowercasing and range conversion
|
||||
let foundEntry:
|
||||
{eco: string; pkg: string; range: string; patch: string} | undefined
|
||||
| {eco: string; pkg: string; range: string; patch: string}
|
||||
| undefined
|
||||
for (const vulnEntry of advisoryEntries) {
|
||||
if (vulnEntry.ecoLower !== ecoLowercase) continue
|
||||
if (vulnEntry.pkgLower !== packageLowercase) continue
|
||||
|
||||
Reference in new issue
Block a user