Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't download artifacts for repos with no results in MRVA #2736

Merged
merged 4 commits into from
Aug 22, 2023
Merged

Don't download artifacts for repos with no results in MRVA #2736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8eda22
Don't download artifacts for repos with no results
charisk Aug 22, 2023
6938419
Remove getVariantAnalysisRepoResult requests for repos with no results
charisk Aug 22, 2023
bbcddcd
Run fix-scenario-file-numbering for mrva-problem-query-success scenario
charisk Aug 22, 2023
2b26c79
Update CHANGELOG
charisk Aug 22, 2023
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
1 change: 1 addition & 0 deletions extensions/ql-vscode/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [UNRELEASED]

- When running variant analyses, don't download artifacts for repositories with no results. [#2736](https://github.com/github/vscode-codeql/pull/2736)
- Group the extension settings, so that they're easier to find in the Settings UI. [#2706](https://github.com/github/vscode-codeql/pull/2706)

## 1.8.10 - 15 August 2023
Expand Down
10 changes: 3 additions & 7 deletions ...-query-success/24-getVariantAnalysis.json → ...-query-success/15-getVariantAnalysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"site_admin": true
},
"query_language": "javascript",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124815Z&X-Amz-Expires=3600&X-Amz-Signature=0f42201f27ad08ac1fa9caccf5005d9dac7bdcae33e88e33d62e2fc337194164&X-Amz-SignedHeaders=host",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124659Z&X-Amz-Expires=3600&X-Amz-Signature=b791ede467cd1783d31d7ee148763d0d4f9eb7abad7506ef9c25017c94aaa1df&X-Amz-SignedHeaders=host",
"created_at": "2022-10-26T12:45:12Z",
"updated_at": "2022-10-26T12:45:15Z",
"actions_workflow_run_id": 3329095282,
Expand Down Expand Up @@ -122,9 +122,7 @@
"stargazers_count": 192,
"updated_at": "2022-03-17T08:34:30Z"
},
"analysis_status": "succeeded",
"artifact_size_in_bytes": 156706,
"result_count": 8
"analysis_status": "in_progress"
},
{
"repository": {
Expand All @@ -148,9 +146,7 @@
"stargazers_count": 19033,
"updated_at": "2022-11-02T10:25:24Z"
},
"analysis_status": "succeeded",
"artifact_size_in_bytes": 710,
"result_count": 0
"analysis_status": "in_progress"
},
{
"repository": {
Expand Down
Binary file removed ...mock-gh-api/scenarios/mrva-problem-query-success/15-getVariantAnalysisRepoResult.body.zip
View file
Open in desktop
Binary file not shown.
11 changes: 0 additions & 11 deletions ...mon/mock-gh-api/scenarios/mrva-problem-query-success/15-getVariantAnalysisRepoResult.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...de/src/common/mock-gh-api/scenarios/mrva-problem-query-success/16-getVariantAnalysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"site_admin": true
},
"query_language": "javascript",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124659Z&X-Amz-Expires=3600&X-Amz-Signature=b791ede467cd1783d31d7ee148763d0d4f9eb7abad7506ef9c25017c94aaa1df&X-Amz-SignedHeaders=host",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124705Z&X-Amz-Expires=3600&X-Amz-Signature=dae9aa87c393b62ad6f84fd280c731fcd8e4551917920bf978eac5dd6102caec&X-Amz-SignedHeaders=host",
"created_at": "2022-10-26T12:45:12Z",
"updated_at": "2022-10-26T12:45:15Z",
"actions_workflow_run_id": 3329095282,
Expand Down
6 changes: 4 additions & 2 deletions ...de/src/common/mock-gh-api/scenarios/mrva-problem-query-success/17-getVariantAnalysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"site_admin": true
},
"query_language": "javascript",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124705Z&X-Amz-Expires=3600&X-Amz-Signature=dae9aa87c393b62ad6f84fd280c731fcd8e4551917920bf978eac5dd6102caec&X-Amz-SignedHeaders=host",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124726Z&X-Amz-Expires=3600&X-Amz-Signature=6698289315bd8d8378a17784ba0be9955e6e9161497137c4ccb29b1d2a3f3587&X-Amz-SignedHeaders=host",
"created_at": "2022-10-26T12:45:12Z",
"updated_at": "2022-10-26T12:45:15Z",
"actions_workflow_run_id": 3329095282,
Expand Down Expand Up @@ -122,7 +122,9 @@
"stargazers_count": 192,
"updated_at": "2022-03-17T08:34:30Z"
},
"analysis_status": "in_progress"
"analysis_status": "succeeded",
"artifact_size_in_bytes": 156706,
"result_count": 8
},
{
"repository": {
Expand Down
0 ...ry-success/19-getVariantAnalysisRepo.json → ...ry-success/18-getVariantAnalysisRepo.json
View file
Open in desktop
File renamed without changes.
0 .../20-getVariantAnalysisRepoResult.body.zip → .../19-getVariantAnalysisRepoResult.body.zip
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...cess/20-getVariantAnalysisRepoResult.json → ...cess/19-getVariantAnalysisRepoResult.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"response": {
"status": 200,
"body": "file:20-getVariantAnalysisRepoResult.body.zip",
"body": "file:19-getVariantAnalysisRepoResult.body.zip",
"contentType": "application/zip"
}
}
2 changes: 1 addition & 1 deletion ...-query-success/18-getVariantAnalysis.json → ...-query-success/20-getVariantAnalysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"site_admin": true
},
"query_language": "javascript",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124726Z&X-Amz-Expires=3600&X-Amz-Signature=6698289315bd8d8378a17784ba0be9955e6e9161497137c4ccb29b1d2a3f3587&X-Amz-SignedHeaders=host",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124732Z&X-Amz-Expires=3600&X-Amz-Signature=ad791eb1a754f473a50454616e9bd04663dfed60a5c84f2c61f27ced47ee25d0&X-Amz-SignedHeaders=host",
"created_at": "2022-10-26T12:45:12Z",
"updated_at": "2022-10-26T12:45:15Z",
"actions_workflow_run_id": 3329095282,
Expand Down
2 changes: 1 addition & 1 deletion ...de/src/common/mock-gh-api/scenarios/mrva-problem-query-success/21-getVariantAnalysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"site_admin": true
},
"query_language": "javascript",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124732Z&X-Amz-Expires=3600&X-Amz-Signature=ad791eb1a754f473a50454616e9bd04663dfed60a5c84f2c61f27ced47ee25d0&X-Amz-SignedHeaders=host",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124759Z&X-Amz-Expires=3600&X-Amz-Signature=5b0be34c426152c37e3d4c761bf576a07c9d4bb6222f32c438e02605600f0394&X-Amz-SignedHeaders=host",
"created_at": "2022-10-26T12:45:12Z",
"updated_at": "2022-10-26T12:45:15Z",
"actions_workflow_run_id": 3329095282,
Expand Down
2 changes: 1 addition & 1 deletion ...de/src/common/mock-gh-api/scenarios/mrva-problem-query-success/22-getVariantAnalysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"site_admin": true
},
"query_language": "javascript",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124759Z&X-Amz-Expires=3600&X-Amz-Signature=5b0be34c426152c37e3d4c761bf576a07c9d4bb6222f32c438e02605600f0394&X-Amz-SignedHeaders=host",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124805Z&X-Amz-Expires=3600&X-Amz-Signature=73b43f47ee53938b91fa7d23c33e750c466fff777ea94ceb052771ee8dc25b6c&X-Amz-SignedHeaders=host",
"created_at": "2022-10-26T12:45:12Z",
"updated_at": "2022-10-26T12:45:15Z",
"actions_workflow_run_id": 3329095282,
Expand Down
6 changes: 4 additions & 2 deletions ...de/src/common/mock-gh-api/scenarios/mrva-problem-query-success/23-getVariantAnalysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"site_admin": true
},
"query_language": "javascript",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124805Z&X-Amz-Expires=3600&X-Amz-Signature=73b43f47ee53938b91fa7d23c33e750c466fff777ea94ceb052771ee8dc25b6c&X-Amz-SignedHeaders=host",
"query_pack_url": "https://objects-origin.githubusercontent.com/codeql-query-console/variant_analyses/146/query_pack?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=queryconsoleprod%2F20221026%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20221026T124815Z&X-Amz-Expires=3600&X-Amz-Signature=0f42201f27ad08ac1fa9caccf5005d9dac7bdcae33e88e33d62e2fc337194164&X-Amz-SignedHeaders=host",
"created_at": "2022-10-26T12:45:12Z",
"updated_at": "2022-10-26T12:45:15Z",
"actions_workflow_run_id": 3329095282,
Expand Down Expand Up @@ -148,7 +148,9 @@
"stargazers_count": 19033,
"updated_at": "2022-11-02T10:25:24Z"
},
"analysis_status": "in_progress"
"analysis_status": "succeeded",
"artifact_size_in_bytes": 710,
"result_count": 0
},
{
"repository": {
Expand Down
0 ...ry-success/25-getVariantAnalysisRepo.json → ...ry-success/24-getVariantAnalysisRepo.json
View file
Open in desktop
File renamed without changes.
0 ...-query-success/27-getVariantAnalysis.json → ...-query-success/25-getVariantAnalysis.json
View file
Open in desktop
File renamed without changes.
Binary file removed ...mock-gh-api/scenarios/mrva-problem-query-success/26-getVariantAnalysisRepoResult.body.zip
View file
Open in desktop
Binary file not shown.
11 changes: 0 additions & 11 deletions ...mon/mock-gh-api/scenarios/mrva-problem-query-success/26-getVariantAnalysisRepoResult.json
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion extensions/ql-vscode/src/variant-analysis/shared/variant-analysis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,11 @@ export function isRepoScanSuccessful(
export function repoHasDownloadableArtifact(
repo: VariantAnalysisScannedRepository,
): boolean {
return repo.analysisStatus === VariantAnalysisRepoStatus.Succeeded;
return (
repo.analysisStatus === VariantAnalysisRepoStatus.Succeeded &&
repo.resultCount !== undefined &&
repo.resultCount > 0
);
}

/**
Expand Down