optimised flows

Author: Shivam-nagar23

image-scanner/pkg/security/ImageScanService.go

@@ -114,7 +114,7 @@ func NewImageScanServiceImpl(logger *zap.SugaredLogger, scanHistoryRepository re
 	// Only check for progressing scans if the flag is enabled
 	if imageScanConfig.EnableProgressingScanCheck {
 		logger.Infow("checking for progressing scans at startup")
-		imageScanService.HandleProgressingScans()
+		go imageScanService.HandleProgressingScans()
 	} else {
 		logger.Infow("skipping progressing scans check at startup as it is disabled")
 	}
@@ -961,63 +961,63 @@ func (impl *ImageScanServiceImpl) HandleProgressingScans() {
 		impl.Logger.Errorw("error in getting all scans by running state", "err", err)
 		return
 	}
-
-	var executionHistoryDirPath string
-	flagForDeleting := false
-	// Create Folder for output data for execution history only if any pending scans are there due to pod died
 	if len(scanHistories) > 0 {
-		flagForDeleting = true
+		var executionHistoryDirPath string
+		// Create Folder for output data for execution history only if any pending scans are there due to pod died
 		executionHistoryDirPath = impl.CreateFolderForOutputData(scanHistories[0].ImageScanExecutionHistoryId)
-	}
-	wg := &sync.WaitGroup{}
-	wg.Add(len(scanHistories))
-	imagescanExecutionHistories, err := impl.ScanHistoryRepository.FindAll()
-	if err != nil {
-		impl.Logger.Errorw("error in getting scan histories on start up", "err", err)
-		return
-	}
-	imageScanToolMetadatas, err := impl.ScanToolMetadataRepository.FindAllActiveTools()
-	if err != nil {
-		impl.Logger.Errorw("error in getting all active tools", "err", err)
-	}
-	imageScanExecutionHistoryMap := make(map[int]*repository.ImageScanExecutionHistory)
-	imageScanToolsMap := make(map[int]*repository.ScanToolMetadata)
-
-	for _, imageScanExecutionHistory := range imagescanExecutionHistories {
-		imageScanExecutionHistoryMap[imageScanExecutionHistory.Id] = imageScanExecutionHistory
-	}
-	for _, imageScanToolMetaData := range imageScanToolMetadatas {
-		imageScanToolsMap[imageScanToolMetaData.Id] = imageScanToolMetaData
-	}
-
-	//System doing image scanning for all pending scans
-	for _, scanHistory := range scanHistories {
-		scanEvent := bean2.ImageScanEvent{}
-		scanEventJson := imageScanExecutionHistoryMap[scanHistory.ImageScanExecutionHistoryId].SourceMetadataJson
-		if len(scanEventJson) == 0 {
-			return
+		imageScanExecutionHistoryIds := make([]int, 0, len(scanHistories))
+		for _, scanHistory := range scanHistories {
+			imageScanExecutionHistoryIds = append(imageScanExecutionHistoryIds, scanHistory.ImageScanExecutionHistoryId)
 		}
-		scanTool := imageScanToolsMap[scanHistory.ScanToolId]
-		err = json.Unmarshal([]byte(scanEventJson), &scanEvent)
+		wg := &sync.WaitGroup{}
+		wg.Add(len(scanHistories))
+		imagescanExecutionHistories, err := impl.ScanHistoryRepository.FindByIds(imageScanExecutionHistoryIds)
 		if err != nil {
-			impl.Logger.Errorw("error in un-marshaling", "err", err)
+			impl.Logger.Errorw("error in getting scan histories on start up", "err", err)
 			return
 		}
-		imageScanRenderDto, err := impl.GetImageScanRenderDto(scanEvent.DockerRegistryId, &scanEvent)
+		imageScanToolMetadatas, err := impl.ScanToolMetadataRepository.FindAllActiveTools()
 		if err != nil {
-			impl.Logger.Errorw("service error, GetImageScanRenderDto", "dockerRegistryId", scanEvent.DockerRegistryId, "err", err)
+			impl.Logger.Errorw("error in getting all active tools", "err", err)
 			return
 		}
-		_, _, err = impl.ScanImageForTool(scanTool, scanHistory.ImageScanExecutionHistoryId, executionHistoryDirPath, wg, 1, context.Background(), imageScanRenderDto)
-		if err != nil {
-			impl.Logger.Errorw("error in scanning image", "err", err)
-			return
+		imageScanExecutionHistoryMap := make(map[int]*repository.ImageScanExecutionHistory)
+		imageScanToolsMap := make(map[int]*repository.ScanToolMetadata)
+
+		for _, imageScanExecutionHistory := range imagescanExecutionHistories {
+			imageScanExecutionHistoryMap[imageScanExecutionHistory.Id] = imageScanExecutionHistory
 		}
-	}
-	wg.Wait()
+		for _, imageScanToolMetaData := range imageScanToolMetadatas {
+			imageScanToolsMap[imageScanToolMetaData.Id] = imageScanToolMetaData
+		}
+
+		//System doing image scanning for all pending scans
+		for _, scanHistory := range scanHistories {
+			scanEvent := bean2.ImageScanEvent{}
+			scanEventJson := imageScanExecutionHistoryMap[scanHistory.ImageScanExecutionHistoryId].SourceMetadataJson
+			if len(scanEventJson) == 0 {
+				return
+			}
+			scanTool := imageScanToolsMap[scanHistory.ScanToolId]
+			err = json.Unmarshal([]byte(scanEventJson), &scanEvent)
+			if err != nil {
+				impl.Logger.Errorw("error in un-marshaling", "err", err)
+				return
+			}
+			imageScanRenderDto, err := impl.GetImageScanRenderDto(scanEvent.DockerRegistryId, &scanEvent)
+			if err != nil {
+				impl.Logger.Errorw("service error, GetImageScanRenderDto", "dockerRegistryId", scanEvent.DockerRegistryId, "err", err)
+				return
+			}
+			_, _, err = impl.ScanImageForTool(scanTool, scanHistory.ImageScanExecutionHistoryId, executionHistoryDirPath, wg, 1, context.Background(), imageScanRenderDto)
+			if err != nil {
+				impl.Logger.Errorw("error in scanning image", "err", err)
+				return
+			}
+		}
+		wg.Wait()
 
-	//deleting executionDirectoryPath
-	if flagForDeleting {
+		//deleting executionDirectoryPath
 		err = os.Remove(executionHistoryDirPath)
 		if err != nil {
 			impl.Logger.Errorw("error in deleting executionHistoryDirectory", "executionHistoryDirPath", executionHistoryDirPath, "err", err)

image-scanner/pkg/sql/repository/ImageScanHistoryRepository.go

@@ -61,6 +61,7 @@ type ImageScanHistoryRepository interface {
 	Save(tx *pg.Tx, model *ImageScanExecutionHistory) error
 	FindAll() ([]*ImageScanExecutionHistory, error)
 	FindOne(id int) (*ImageScanExecutionHistory, error)
+	FindByIds(ids []int) ([]*ImageScanExecutionHistory, error)
 	FindByImageDigest(image string) (*ImageScanExecutionHistory, error)
 	FindByImageDigests(digest []string) ([]*ImageScanExecutionHistory, error)
 	Update(model *ImageScanExecutionHistory) error
@@ -103,6 +104,15 @@ func (impl ImageScanHistoryRepositoryImpl) FindOne(id int) (*ImageScanExecutionH
 		Where("id = ?", id).Select()
 	return &model, err
 }
+func (impl ImageScanHistoryRepositoryImpl) FindByIds(ids []int) ([]*ImageScanExecutionHistory, error) {
+	var models []*ImageScanExecutionHistory
+	if len(ids) == 0 {
+		return nil, nil
+	}
+	err := impl.dbConnection.Model(&models).
+		Where("id in (?)", pg.In(ids)).Select()
+	return models, err
+}
 
 func (impl ImageScanHistoryRepositoryImpl) FindByImageDigest(image string) (*ImageScanExecutionHistory, error) {
 	var model ImageScanExecutionHistory