Skip to content

Commit dc0fe70

Browse files
Merge pull request #6285 from devtron-labs/not-scan-img-fix
fix: IsErrNoRows check on image and imageDigest
2 parents c4133c1 + 843588e commit dc0fe70

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

pkg/policyGovernance/security/imageScanning/ImageScanService.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package imageScanning
1919
import (
2020
"context"
2121
bean4 "github.com/devtron-labs/devtron/api/bean"
22+
"github.com/devtron-labs/devtron/internal/util"
2223
"github.com/devtron-labs/devtron/pkg/cluster/environment"
2324
"github.com/devtron-labs/devtron/pkg/cluster/environment/bean"
2425
bean2 "github.com/devtron-labs/devtron/pkg/deployment/trigger/devtronApps/bean"
@@ -326,9 +327,13 @@ func (impl ImageScanServiceImpl) FetchExecutionDetailResult(request *bean3.Image
326327
}
327328
imageScanResponse.Image = ciArtifact.Image
328329
scanExecution, err := impl.scanHistoryRepository.FindByImageAndDigestWithHistoryMapping(ciArtifact.ImageDigest, ciArtifact.Image)
329-
if err != nil {
330+
if err != nil && !util.IsErrNoRows(err) {
330331
impl.Logger.Errorw("error while fetching scan execution result", "err", err)
331332
return nil, err
333+
} else if util.IsErrNoRows(err) {
334+
// image not scanned
335+
imageScanResponse.Scanned = false
336+
return imageScanResponse, nil
332337
}
333338
ciPipeline, err := impl.ciPipelineRepository.FindByIdIncludingInActive(ciArtifact.PipelineId)
334339
if err != nil {

0 commit comments

Comments
 (0)