fix: wrong image scan execution result (#4691)

* Bug(same image scan detail) : bug fix

* Bug(same image scan detail) : code refactored

Author: adi6859

api/restHandler/ExternalCiRestHandler.go

@@ -19,8 +19,8 @@ package restHandler
 
 import (
 	"encoding/json"
-	"github.com/devtron-labs/devtron/pkg/workflow/dag"
 	util3 "github.com/devtron-labs/devtron/api/util"
+	"github.com/devtron-labs/devtron/pkg/workflow/dag"
 	"net/http"
 	"strconv"
 

api/router/pubsub/ApplicationStatusHandler.go

@@ -24,11 +24,11 @@ import (
 	"fmt"
 	"github.com/devtron-labs/common-lib/pubsub-lib/model"
 	"github.com/devtron-labs/devtron/pkg/app"
+	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode"
 	"github.com/devtron-labs/devtron/pkg/deployment/gitOps/config"
 	bean2 "github.com/devtron-labs/devtron/pkg/deployment/trigger/devtronApps/bean"
 	"github.com/devtron-labs/devtron/pkg/workflow/cd"
 	"github.com/devtron-labs/devtron/pkg/workflow/dag"
-	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode"
 	"k8s.io/utils/pointer"
 	"time"
 

internal/sql/repository/security/ImageScanHistoryRepository.go

@@ -36,7 +36,7 @@ type ImageScanHistoryRepository interface {
 	Save(model *ImageScanExecutionHistory) error
 	FindAll() ([]*ImageScanExecutionHistory, error)
 	FindOne(id int) (*ImageScanExecutionHistory, error)
-	FindByImageDigest(image string) (*ImageScanExecutionHistory, error)
+	FindByImageAndDigest(imageDigest string, image string) (*ImageScanExecutionHistory, error)
 	FindByImageDigests(digest []string) ([]*ImageScanExecutionHistory, error)
 	Update(model *ImageScanExecutionHistory) error
 	FindByImage(image string) (*ImageScanExecutionHistory, error)
@@ -72,10 +72,12 @@ func (impl ImageScanHistoryRepositoryImpl) FindOne(id int) (*ImageScanExecutionH
 	return &model, err
 }
 
-func (impl ImageScanHistoryRepositoryImpl) FindByImageDigest(image string) (*ImageScanExecutionHistory, error) {
+func (impl ImageScanHistoryRepositoryImpl) FindByImageAndDigest(imageDigest string, image string) (*ImageScanExecutionHistory, error) {
 	var model ImageScanExecutionHistory
 	err := impl.dbConnection.Model(&model).
-		Where("image_hash = ?", image).Order("execution_time desc").Limit(1).Select()
+		Where("image_hash = ?", imageDigest).
+		Where("image = ?", image).
+		Order("execution_time desc").Limit(1).Select()
 	return &model, err
 }
 

pkg/app/AppService.go

@@ -1132,7 +1132,6 @@ func (impl *AppServiceImpl) UpdateCdWorkflowRunnerByACDObject(app *v1alpha1.Appl
 	return nil
 }
 
-
 func (impl *AppServiceImpl) GetActiveCiCdAppsCount() (int, error) {
 	return impl.appRepository.GetActiveCiCdAppsCount()
-}
+}

pkg/deployment/trigger/devtronApps/TriggerService.go

@@ -771,7 +771,7 @@ func (impl *TriggerServiceImpl) triggerPipeline(overrideRequest *bean3.ValuesOve
 	go impl.writeCDTriggerEvent(overrideRequest, valuesOverrideResponse.Artifact, valuesOverrideResponse.PipelineOverride.PipelineReleaseCounter, valuesOverrideResponse.PipelineOverride.Id)
 
 	_, span := otel.Tracer("orchestrator").Start(ctx, "markImageScanDeployed")
-	_ = impl.markImageScanDeployed(overrideRequest.AppId, valuesOverrideResponse.EnvOverride.TargetEnvironment, valuesOverrideResponse.Artifact.ImageDigest, overrideRequest.ClusterId, valuesOverrideResponse.Artifact.ScanEnabled)
+	_ = impl.markImageScanDeployed(overrideRequest.AppId, valuesOverrideResponse.EnvOverride.TargetEnvironment, valuesOverrideResponse.Artifact.ImageDigest, overrideRequest.ClusterId, valuesOverrideResponse.Artifact.ScanEnabled, valuesOverrideResponse.Artifact.Image)
 	span.End()
 
 	middleware.CdTriggerCounter.WithLabelValues(overrideRequest.AppName, overrideRequest.EnvName).Inc()
@@ -1182,9 +1182,9 @@ func (impl *TriggerServiceImpl) writeCDTriggerEvent(overrideRequest *bean3.Value
 	}
 }
 
-func (impl *TriggerServiceImpl) markImageScanDeployed(appId int, envId int, imageDigest string, clusterId int, isScanEnabled bool) error {
+func (impl *TriggerServiceImpl) markImageScanDeployed(appId int, envId int, imageDigest string, clusterId int, isScanEnabled bool, image string) error {
 	impl.logger.Debugw("mark image scan deployed for normal app, from cd auto or manual trigger", "imageDigest", imageDigest)
-	executionHistory, err := impl.imageScanHistoryRepository.FindByImageDigest(imageDigest)
+	executionHistory, err := impl.imageScanHistoryRepository.FindByImageAndDigest(imageDigest, image)
 	if err != nil && err != pg.ErrNoRows {
 		impl.logger.Errorw("error in fetching execution history", "err", err)
 		return err

pkg/security/ImageScanService.go

@@ -321,7 +321,7 @@ func (impl ImageScanServiceImpl) FetchExecutionDetailResult(request *ImageScanRe
 			impl.Logger.Errorw("error while fetching scan execution result", "err", err)
 			return nil, err
 		}
-		scanExecution, err := impl.scanHistoryRepository.FindByImageDigest(ciArtifact.ImageDigest)
+		scanExecution, err := impl.scanHistoryRepository.FindByImageAndDigest(ciArtifact.ImageDigest, ciArtifact.Image)
 		if err != nil {
 			impl.Logger.Errorw("error while fetching scan execution result", "err", err)
 			return nil, err