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.

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

fix: reference scan shouldn't wait on work directory scan #766

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
52 changes: 29 additions & 23 deletions domain/snyk/scanner/scanner.go
Original file line number Diff line number Diff line change
@@ -278,6 +278,9 @@ func (sc *DelegatingConcurrentScanner) Scan(
span := sc.instrumentor.NewTransaction(context.WithValue(ctx, s.Product(), s), string(s.Product()), method)
defer sc.instrumentor.Finish(span)
logger.Info().Msgf("Scanning %s with %T: STARTED", path, s)

go sc.triggerReferenceScan(s, referenceBranchScanWaitGroup, scanner, gitCheckoutHandler, processResults, path, folderPath)

sc.scanStateAggregator.SetScanInProgress(folderPath, scanner.Product(), false)

scanSpan := sc.instrumentor.StartSpan(span.Context(), "scan")
@@ -301,29 +304,6 @@ func (sc *DelegatingConcurrentScanner) Scan(
}

processResults(data)
go func() {
defer referenceBranchScanWaitGroup.Done()
isReferenceScanNeeded := path == folderPath
if isReferenceScanNeeded {
sc.scanStateAggregator.SetScanInProgress(folderPath, scanner.Product(), true)
err := sc.scanBaseBranch(context.Background(), s, folderPath, gitCheckoutHandler)
sc.scanStateAggregator.SetScanDone(folderPath, scanner.Product(), true, err)
if err != nil {
logger.Error().Err(err).Msgf("couldn't scan base branch for folder %s for product %s", folderPath, s.Product())
}
}
if !sc.c.IsDeltaFindingsEnabled() {
logger.Debug().Msgf("skipping processResults for reference scan %s on folder %s. Delta is disabled", s.Product().ToProductCodename(), folderPath)
return
}
data = snyk.ScanData{
Product: s.Product(),
Path: gitCheckoutHandler.BaseFolderPath(),
SendAnalytics: false,
UpdateGlobalCache: false,
}
processResults(data)
}()

logger.Info().Msgf("Scanning %s with %T: COMPLETE found %v issues", path, s, len(foundIssues))
}(scanner)
@@ -349,6 +329,32 @@ func (sc *DelegatingConcurrentScanner) Scan(
// TODO: handle learn actions centrally instead of in each scanner
}

func (sc *DelegatingConcurrentScanner) triggerReferenceScan(s snyk.ProductScanner, referenceBranchScanWaitGroup *sync.WaitGroup, scanner snyk.ProductScanner, gitCheckoutHandler *vcs.CheckoutHandler, processResults snyk.ScanResultProcessor, path string, folderPath string) {
logger := sc.c.Logger().With().Str("method", "triggerReferenceScan").Logger()

defer referenceBranchScanWaitGroup.Done()
isReferenceScanNeeded := path == folderPath
if isReferenceScanNeeded {
sc.scanStateAggregator.SetScanInProgress(folderPath, scanner.Product(), true)
err := sc.scanBaseBranch(context.Background(), s, folderPath, gitCheckoutHandler)
sc.scanStateAggregator.SetScanDone(folderPath, scanner.Product(), true, err)
if err != nil {
logger.Error().Err(err).Msgf("couldn't scan base branch for folder %s for product %s", folderPath, s.Product())
}
}
if !sc.c.IsDeltaFindingsEnabled() {
logger.Debug().Msgf("skipping processResults for reference scan %s on folder %s. Delta is disabled", s.Product().ToProductCodename(), folderPath)
return
}
data := snyk.ScanData{
Product: s.Product(),
Path: gitCheckoutHandler.BaseFolderPath(),
SendAnalytics: false,
UpdateGlobalCache: false,
}
processResults(data)
}

func (sc *DelegatingConcurrentScanner) internalScan(ctx context.Context, s snyk.ProductScanner, path string, folderPath string) ([]snyk.Issue, error) {
foundIssues, err := s.Scan(ctx, path, folderPath)
if err != nil {