fix: optimised handle progressing flows

chart-sync/go.mod

@@ -5,7 +5,7 @@ go 1.22.4
 toolchain go1.22.6
 
 replace (
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16
 	helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42
 )
 

chart-sync/go.sum

@@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2 h1:9CFeiv7oWP6f5OJN6Jq1FJpPndxyx0GKAEoKORWxvkw=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16 h1:NEmZC09r6KR+6aBGBbKPkJhgpDAtLrycinBe/BjTvZY=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
 github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY=
 github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=

chart-sync/vendor/modules.txt

@@ -93,7 +93,7 @@ github.com/containerd/platforms
 # github.com/davecgh/go-spew v1.1.1
 ## explicit
 github.com/davecgh/go-spew/spew
-# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2
+# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16
 ## explicit; go 1.21
 github.com/devtron-labs/common-lib/constants
 github.com/devtron-labs/common-lib/fetchAllEnv
@@ -791,4 +791,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.3.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16

ci-runner/go.mod

@@ -4,7 +4,7 @@ go 1.21
 
 toolchain go1.21.8
 
-replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2
+replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16
 
 require (
 	github.com/Knetic/govaluate v3.0.0+incompatible

ci-runner/go.sum

@@ -95,8 +95,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2 h1:9CFeiv7oWP6f5OJN6Jq1FJpPndxyx0GKAEoKORWxvkw=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16 h1:NEmZC09r6KR+6aBGBbKPkJhgpDAtLrycinBe/BjTvZY=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=

ci-runner/vendor/modules.txt

@@ -248,7 +248,7 @@ github.com/cespare/xxhash/v2
 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 ## explicit
 github.com/davecgh/go-spew/spew
-# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2
+# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16
 ## explicit; go 1.21
 github.com/devtron-labs/common-lib/blob-storage
 github.com/devtron-labs/common-lib/constants
@@ -991,4 +991,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.3.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16

common-lib/constants/constants.go

@@ -34,6 +34,7 @@ const (
 	Kubelink     ServiceName = "KUBELINK"
 	GitSensor    ServiceName = "GITSENSOR"
 	Kubewatch    ServiceName = "KUBEWATCH"
+	ImageScanner ServiceName = "IMAGE_SCANNER"
 )
 
 // metrics name constants

git-sensor/go.mod

@@ -4,7 +4,7 @@ go 1.21
 
 toolchain go1.22.4
 
-replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2
+replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16
 
 require (
 	github.com/caarlos0/env v3.5.0+incompatible

git-sensor/go.sum

@@ -27,8 +27,8 @@ github.com/cyphar/filepath-securejoin v0.3.6/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGL
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2 h1:9CFeiv7oWP6f5OJN6Jq1FJpPndxyx0GKAEoKORWxvkw=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16 h1:NEmZC09r6KR+6aBGBbKPkJhgpDAtLrycinBe/BjTvZY=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
 github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=
 github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk=
 github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=

git-sensor/vendor/modules.txt

@@ -66,7 +66,7 @@ github.com/cyphar/filepath-securejoin
 # github.com/davecgh/go-spew v1.1.1
 ## explicit
 github.com/davecgh/go-spew/spew
-# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2
+# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16
 ## explicit; go 1.21
 github.com/devtron-labs/common-lib/constants
 github.com/devtron-labs/common-lib/fetchAllEnv
@@ -488,4 +488,4 @@ gopkg.in/yaml.v3
 # mellium.im/sasl v0.3.2
 ## explicit; go 1.20
 mellium.im/sasl
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16

image-scanner/Wire.go

@@ -23,6 +23,7 @@ import (
 	"github.com/devtron-labs/common-lib/monitoring"
 	client "github.com/devtron-labs/common-lib/pubsub-lib"
 	"github.com/devtron-labs/image-scanner/api"
+	"github.com/devtron-labs/image-scanner/pkg/asyncProvider"
 	"github.com/devtron-labs/image-scanner/pkg/clairService"
 	"github.com/devtron-labs/image-scanner/pkg/grafeasService"
 	"github.com/devtron-labs/image-scanner/pkg/klarService"
@@ -38,6 +39,7 @@ import (
 
 func InitializeApp() (*App, error) {
 	wire.Build(
+		asyncProvider.AsyncWireSet,
 		NewApp,
 		api.NewRouter,
 		logger.NewSugardLogger,

image-scanner/go.mod

@@ -74,4 +74,4 @@ require (
 	mellium.im/sasl v0.3.2 // indirect
 )
 
-replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2
+replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16

image-scanner/go.sum

@@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2 h1:9CFeiv7oWP6f5OJN6Jq1FJpPndxyx0GKAEoKORWxvkw=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516092629-1f57945dd6f2/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16 h1:NEmZC09r6KR+6aBGBbKPkJhgpDAtLrycinBe/BjTvZY=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250516120455-f0b4891afc16/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
 github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=

image-scanner/pkg/asyncProvider/AsyncProvider.go

@@ -0,0 +1,11 @@
+package asyncProvider
+
+import (
+	"github.com/devtron-labs/common-lib/async"
+	"github.com/devtron-labs/common-lib/constants"
+	"go.uber.org/zap"
+)
+
+func NewAsyncRunnable(logger *zap.SugaredLogger) *async.Runnable {
+	return async.NewAsyncRunnable(logger, constants.ImageScanner)
+}

image-scanner/pkg/asyncProvider/wire_AsyncProvider.go

@@ -0,0 +1,9 @@
+package asyncProvider
+
+import (
+	"github.com/google/wire"
+)
+
+var AsyncWireSet = wire.NewSet(
+	NewAsyncRunnable,
+)

image-scanner/pkg/security/ImageScanService.go

@@ -24,6 +24,7 @@ import (
 	"fmt"
 	"github.com/Knetic/govaluate"
 	"github.com/caarlos0/env"
+	"github.com/devtron-labs/common-lib/async"
 	bean2 "github.com/devtron-labs/common-lib/imageScan/bean"
 	"github.com/devtron-labs/image-scanner/common"
 	cliUtil "github.com/devtron-labs/image-scanner/internals/step-lib/util/cli-util"
@@ -84,6 +85,7 @@ type ImageScanServiceImpl struct {
 	DockerArtifactStoreRepository             repository.DockerArtifactStoreRepository
 	RegistryIndexMappingRepository            repository.RegistryIndexMappingRepository
 	CliCommandEnv                             []string
+	asyncRunnable                             *async.Runnable
 }
 
 func NewImageScanServiceImpl(logger *zap.SugaredLogger, scanHistoryRepository repository.ImageScanHistoryRepository,
@@ -96,7 +98,8 @@ func NewImageScanServiceImpl(logger *zap.SugaredLogger, scanHistoryRepository re
 	scanToolStepRepository repository.ScanToolStepRepository,
 	scanStepConditionMappingRepository repository.ScanStepConditionMappingRepository,
 	imageScanConfig *ImageScanConfig,
-	dockerArtifactStoreRepository repository.DockerArtifactStoreRepository, registryIndexMappingRepository repository.RegistryIndexMappingRepository) *ImageScanServiceImpl {
+	dockerArtifactStoreRepository repository.DockerArtifactStoreRepository, registryIndexMappingRepository repository.RegistryIndexMappingRepository,
+	asyncRunnable *async.Runnable) *ImageScanServiceImpl {
 	imageScanService := &ImageScanServiceImpl{Logger: logger, ScanHistoryRepository: scanHistoryRepository, ScanResultRepository: scanResultRepository,
 		ScanObjectMetaRepository: scanObjectMetaRepository, CveStoreRepository: cveStoreRepository,
 		ImageScanDeployInfoRepository:             imageScanDeployInfoRepository,
@@ -110,11 +113,12 @@ func NewImageScanServiceImpl(logger *zap.SugaredLogger, scanHistoryRepository re
 		DockerArtifactStoreRepository:             dockerArtifactStoreRepository,
 		RegistryIndexMappingRepository:            registryIndexMappingRepository,
 		CliCommandEnv:                             os.Environ(),
+		asyncRunnable:                             asyncRunnable,
 	}
 	// Only check for progressing scans if the flag is enabled
 	if imageScanConfig.EnableProgressingScanCheck {
 		logger.Infow("checking for progressing scans at startup")
-		imageScanService.HandleProgressingScans()
+		asyncRunnable.Execute(imageScanService.HandleProgressingScans)
 	} else {
 		logger.Infow("skipping progressing scans check at startup as it is disabled")
 	}
@@ -961,63 +965,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) {
+	models := make([]*ImageScanExecutionHistory, 0)
+	if len(ids) == 0 {
+		return models, 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