Skip to content

Commit 28b00b2

Browse files
committed
Update variant analysis from API response
This will ensure that when we return a new variant analysis summary from the API, the variant analysis object will be updated.
1 parent 401da63 commit 28b00b2

2 files changed

Lines changed: 20 additions & 5 deletions

File tree

extensions/ql-vscode/src/remote-queries/variant-analysis-monitor.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
VariantAnalysis as VariantAnalysisApiResponse
99
} from './gh-api/variant-analysis';
1010
import { VariantAnalysisMonitorResult } from './shared/variant-analysis-monitor-result';
11-
import { processFailureReason } from './variant-analysis-processor';
11+
import { processFailureReason, processUpdatedVariantAnalysis } from './variant-analysis-processor';
1212

1313
export class VariantAnalysisMonitor {
1414
// With a sleep of 5 seconds, the maximum number of attempts takes
@@ -59,6 +59,8 @@ export class VariantAnalysisMonitor {
5959
};
6060
}
6161

62+
variantAnalysis = processUpdatedVariantAnalysis(variantAnalysis, variantAnalysisSummary);
63+
6264
void this.logger.log('****** Retrieved variant analysis' + JSON.stringify(variantAnalysisSummary));
6365

6466
if (variantAnalysisSummary.scanned_repositories) {

extensions/ql-vscode/src/remote-queries/variant-analysis-processor.ts

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,20 @@ export function processVariantAnalysis(
2323
submission: VariantAnalysisSubmission,
2424
response: ApiVariantAnalysis
2525
): VariantAnalysis {
26+
return processUpdatedVariantAnalysis({
27+
query: {
28+
name: submission.query.name,
29+
filePath: submission.query.filePath,
30+
language: submission.query.language
31+
},
32+
databases: submission.databases,
33+
}, response);
34+
}
2635

36+
export function processUpdatedVariantAnalysis(
37+
previousVariantAnalysis: Pick<VariantAnalysis, 'query' | 'databases'>,
38+
response: ApiVariantAnalysis
39+
): VariantAnalysis {
2740
let scannedRepos: VariantAnalysisScannedRepository[] = [];
2841
let skippedRepos: VariantAnalysisSkippedRepositories = {};
2942

@@ -39,11 +52,11 @@ export function processVariantAnalysis(
3952
id: response.id,
4053
controllerRepoId: response.controller_repo.id,
4154
query: {
42-
name: submission.query.name,
43-
filePath: submission.query.filePath,
44-
language: submission.query.language
55+
name: previousVariantAnalysis.query.name,
56+
filePath: previousVariantAnalysis.query.filePath,
57+
language: previousVariantAnalysis.query.language
4558
},
46-
databases: submission.databases,
59+
databases: previousVariantAnalysis.databases,
4760
status: processApiStatus(response.status),
4861
actionsWorkflowRunId: response.actions_workflow_run_id,
4962
scannedRepos: scannedRepos,

0 commit comments

Comments
 (0)