some minor refactoring

Author: prakash100198

pkg/pipeline/PipelineStageService.go

@@ -2180,7 +2180,7 @@ func (impl *PipelineStageServiceImpl) IsScanPluginConfiguredAtPipelineStage(pipe
 		return false, nil
 	}
 	isScanPluginConfigured, err := impl.pipelineStageRepository.CheckIfPluginExistsInPipelineStage(pipelineId, pipelineStage, plugin[0].Id)
-	if err != nil && !util.IsErrNoRows(err) {
+	if err != nil {
 		impl.logger.Errorw("error in getting ci pipeline plugin", "err", err, "pipelineId", pipelineId, "pluginId", plugin[0].Id)
 		return false, err
 	}

pkg/security/ImageScanService.go

@@ -19,7 +19,6 @@ package security
 import (
 	"context"
 	securityBean "github.com/devtron-labs/devtron/internal/sql/repository/security/bean"
-	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/cluster/environment"
 	"github.com/devtron-labs/devtron/pkg/cluster/environment/bean"
 	bean2 "github.com/devtron-labs/devtron/pkg/deployment/trigger/devtronApps/bean"
@@ -651,7 +650,7 @@ func (impl ImageScanServiceImpl) updateCount(severity securityBean.Severity, cri
 func (impl ImageScanServiceImpl) IsImageScanExecutionCompleted(image, imageDigest string) (bool, error) {
 	var isScanningCompleted bool
 	allScanHistoryMappings, err := impl.scanToolExecutionHistoryMappingRepository.FetchScanHistoryMappingsUsingImageAndImageDigest(image, imageDigest)
-	if err != nil && !util.IsErrNoRows(err) {
+	if err != nil {
 		impl.Logger.Errorw("error in fetching all scan execution history mapping", "image", image, "imageDigest", imageDigest, "err", err)
 		return false, err
 	}

pkg/workflow/dag/WorkflowDagExecutor.go

@@ -573,15 +573,11 @@ func (impl *WorkflowDagExecutorImpl) HandlePreStageSuccessEvent(triggerContext t
 		scanEnabled, scanned := ciArtifact.ScanEnabled, ciArtifact.Scanned
 		isScanPluginConfigured, isScanningDoneViaPlugin, err := impl.isArtifactScannedByPluginForPipeline(ciArtifact, cdStageCompleteEvent.CdPipelineId, repository4.PIPELINE_STAGE_TYPE_PRE_CD, bean2.ImageScanningPluginToCheckInPipelineStageStep)
 		if err != nil {
-			impl.logger.Errorw("error in handling scanning event for ci artifact", "ciArtifact", ciArtifact, "err", err)
+			impl.logger.Errorw("error in checking if artifact scanned by plugin for a pipeline or not", "ciArtifact", ciArtifact, "err", err)
 			return err
 		}
-		if isScanPluginConfigured {
-			ciArtifact.ScanEnabled = true
-		}
-		if isScanningDoneViaPlugin {
-			ciArtifact.Scanned = true
-		}
+		helper.UpdateScanStatusInCiArtifact(ciArtifact, isScanPluginConfigured, isScanningDoneViaPlugin)
+
 		// if ciArtifact scanEnabled and scanned state changed from above func then update ciArtifact
 		if scanEnabled != ciArtifact.ScanEnabled || scanned != ciArtifact.Scanned {
 			err = impl.ciArtifactRepository.Update(ciArtifact)
@@ -686,15 +682,11 @@ func (impl *WorkflowDagExecutorImpl) HandlePostStageSuccessEvent(triggerContext
 	scanEnabled, scanned := ciArtifact.ScanEnabled, ciArtifact.Scanned
 	isScanPluginConfigured, isScanningDoneViaPlugin, err := impl.isArtifactScannedByPluginForPipeline(ciArtifact, cdPipelineId, repository4.PIPELINE_STAGE_TYPE_POST_CD, bean2.ImageScanningPluginToCheckInPipelineStageStep)
 	if err != nil {
-		impl.logger.Errorw("error in handling scanning event for ci artifact", "ciArtifact", ciArtifact, "err", err)
+		impl.logger.Errorw("error in checking if artifact scanned by plugin for a pipeline or not", "ciArtifact", ciArtifact, "err", err)
 		return err
 	}
-	if isScanPluginConfigured {
-		ciArtifact.ScanEnabled = true
-	}
-	if isScanningDoneViaPlugin {
-		ciArtifact.Scanned = true
-	}
+	helper.UpdateScanStatusInCiArtifact(ciArtifact, isScanPluginConfigured, isScanningDoneViaPlugin)
+
 	// if ciArtifact scanEnabled and scanned state changed from above func then update ciArtifact
 	if scanEnabled != ciArtifact.ScanEnabled || scanned != ciArtifact.Scanned {
 		err = impl.ciArtifactRepository.Update(ciArtifact)
@@ -814,15 +806,10 @@ func (impl *WorkflowDagExecutorImpl) HandleCiSuccessEvent(triggerContext trigger
 	} else {
 		isScanPluginConfigured, isScanningDoneViaPlugin, err := impl.isArtifactScannedByPluginForPipeline(buildArtifact, pipelineModal.Id, pipelineStage, bean2.ImageScanningPluginToCheckInPipelineStageStep)
 		if err != nil {
-			impl.logger.Errorw("error in handling scanning event for this ci artifact", "ciArtifact", buildArtifact, "err", err)
+			impl.logger.Errorw("error in checking if artifact scanned by plugin for a pipeline or not", "ciArtifact", buildArtifact, "err", err)
 			return 0, err
 		}
-		if isScanPluginConfigured {
-			buildArtifact.ScanEnabled = true
-		}
-		if isScanningDoneViaPlugin {
-			buildArtifact.Scanned = true
-		}
+		helper.UpdateScanStatusInCiArtifact(buildArtifact, isScanPluginConfigured, isScanningDoneViaPlugin)
 	}
 
 	if err = impl.ciArtifactRepository.Save(buildArtifact); err != nil {

pkg/workflow/dag/helper/helper.go

@@ -3,6 +3,7 @@ package helper
 import (
 	"bytes"
 	"encoding/json"
+	"github.com/devtron-labs/devtron/internal/sql/repository"
 )
 
 func GetMaterialInfoJson(materialInfo json.RawMessage) ([]byte, error) {
@@ -19,3 +20,12 @@ func GetMaterialInfoJson(materialInfo json.RawMessage) ([]byte, error) {
 	matJson = dst.Bytes()
 	return matJson, nil
 }
+
+func UpdateScanStatusInCiArtifact(ciArtifact *repository.CiArtifact, isScanPluginConfigured, isScanningDoneViaPlugin bool) {
+	if isScanPluginConfigured {
+		ciArtifact.ScanEnabled = true
+	}
+	if isScanningDoneViaPlugin {
+		ciArtifact.Scanned = true
+	}
+}