introduce isScanEnabled in ciCompleteEvent with scanned and scan_enabled logic based on ciCompleteEvent not on the current state of ci_pipeline.scan_enabled

Author: prakash100198

pkg/eventProcessor/bean/workflowEventBean.go

@@ -82,6 +82,7 @@ type CiCompleteEvent struct {
 	ImageDetailsFromCR            json.RawMessage          `json:"imageDetailsFromCR"`
 	PluginRegistryArtifactDetails map[string][]string      `json:"PluginRegistryArtifactDetails"`
 	PluginArtifactStage           string                   `json:"pluginArtifactStage"`
+	IsScanEnabled                 bool                     `json:"isScanEnabled"`
 	pluginImageDetails            *registry.ImageDetailsFromCR
 	PluginArtifacts               *PluginArtifacts `json:"pluginArtifacts"`
 }

pkg/eventProcessor/in/WorkflowEventProcessorService.go

@@ -678,6 +678,7 @@ func (impl *WorkflowEventProcessorImpl) BuildCiArtifactRequest(event bean.CiComp
 		IsArtifactUploaded:            event.IsArtifactUploaded,
 		PluginRegistryArtifactDetails: pluginArtifacts,
 		PluginArtifactStage:           event.PluginArtifactStage,
+		IsScanEnabled:                 event.IsScanEnabled,
 	}
 	// if DataSource is empty, repository.WEBHOOK is considered as default
 	if request.DataSource == "" {

pkg/workflow/dag/WorkflowDagExecutor.go

@@ -50,6 +50,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/workflow/cd"
 	bean4 "github.com/devtron-labs/devtron/pkg/workflow/cd/bean"
 	bean2 "github.com/devtron-labs/devtron/pkg/workflow/dag/bean"
+	"github.com/devtron-labs/devtron/pkg/workflow/dag/helper"
 	error2 "github.com/devtron-labs/devtron/util/error"
 	util2 "github.com/devtron-labs/devtron/util/event"
 	"strings"
@@ -710,6 +711,22 @@ func (impl *WorkflowDagExecutorImpl) UpdateCiWorkflowForCiSuccess(request *bean2
 	return nil
 }
 
+func (impl *WorkflowDagExecutorImpl) isImageScanningPluginConfiguredInCiPipeline(ciPipelineId int) (bool, error) {
+	var isScanPluginConfigured bool
+	var err error
+	plugin, err := impl.globalPluginRepository.GetPluginByName(bean3.VULNERABILITY_SCANNING_PLUGIN)
+	if err != nil || len(plugin) == 0 {
+		impl.logger.Errorw("error in getting image scanning plugin", "err", err)
+		return isScanPluginConfigured, err
+	}
+	isScanPluginConfigured, err = impl.pipelineStageRepository.CheckPluginExistsInCiPipeline(ciPipelineId, string(repository4.PIPELINE_STAGE_TYPE_POST_CI), plugin[0].Id)
+	if err != nil {
+		impl.logger.Errorw("error in getting ci pipelineModal plugin", "err", err, "ciPipelineId", ciPipelineId, "pluginId", plugin[0].Id)
+		return isScanPluginConfigured, err
+	}
+	return isScanPluginConfigured, nil
+}
+
 func (impl *WorkflowDagExecutorImpl) HandleCiSuccessEvent(triggerContext triggerBean.TriggerContext, ciPipelineId int, request *bean2.CiArtifactWebhookRequest, imagePushedAt time.Time) (id int, err error) {
 	impl.logger.Infow("webhook for artifact save", "req", request)
 	pipelineModal, err := impl.ciPipelineRepository.FindByCiAndAppDetailsById(ciPipelineId)
@@ -720,45 +737,25 @@ func (impl *WorkflowDagExecutorImpl) HandleCiSuccessEvent(triggerContext trigger
 	if request.PipelineName == "" {
 		request.PipelineName = pipelineModal.Name
 	}
-	materialJson, err := request.MaterialInfo.MarshalJSON()
+	materialJson, err := helper.GetMaterialInfoJson(request.MaterialInfo)
 	if err != nil {
-		impl.logger.Errorw("unable to marshal material metadata", "err", err)
+		impl.logger.Errorw("unable to get materialJson", "materialInfo", request.MaterialInfo, "err", err)
 		return 0, err
 	}
-	dst := new(bytes.Buffer)
-	err = json.Compact(dst, materialJson)
-	if err != nil {
-		return 0, err
-	}
-	materialJson = dst.Bytes()
 	createdOn := time.Now()
 	updatedOn := time.Now()
 	if !imagePushedAt.IsZero() {
 		createdOn = imagePushedAt
 	}
-	buildArtifact := &repository.CiArtifact{
-		Image:              request.Image,
-		ImageDigest:        request.ImageDigest,
-		MaterialInfo:       string(materialJson),
-		DataSource:         request.DataSource,
-		PipelineId:         pipelineModal.Id,
-		WorkflowId:         request.WorkflowId,
-		ScanEnabled:        pipelineModal.ScanEnabled,
-		IsArtifactUploaded: request.IsArtifactUploaded, // for backward compatibility
-		Scanned:            false,
-		AuditLog:           sql.AuditLog{CreatedBy: request.UserId, UpdatedBy: request.UserId, CreatedOn: createdOn, UpdatedOn: updatedOn},
-	}
-	plugin, err := impl.globalPluginRepository.GetPluginByName(bean3.VULNERABILITY_SCANNING_PLUGIN)
-	if err != nil || len(plugin) == 0 {
-		impl.logger.Errorw("error in getting image scanning plugin", "err", err)
-		return 0, err
-	}
-	isScanPluginConfigured, err := impl.pipelineStageRepository.CheckPluginExistsInCiPipeline(pipelineModal.Id, string(repository4.PIPELINE_STAGE_TYPE_POST_CI), plugin[0].Id)
+	buildArtifact := helper.GetBuildArtifact(request, pipelineModal.Id, materialJson, createdOn, updatedOn)
+
+	isScanPluginConfigured, err := impl.isImageScanningPluginConfiguredInCiPipeline(pipelineModal.Id)
 	if err != nil {
-		impl.logger.Errorw("error in getting ci pipelineModal plugin", "err", err, "pipelineId", pipelineModal.Id, "pluginId", plugin[0].Id)
+		impl.logger.Errorw("error in checking isImageScanningPluginConfiguredInCiPipeline", "ciPipelineId", ciPipelineId, "err", err)
 		return 0, err
 	}
-	if pipelineModal.ScanEnabled || isScanPluginConfigured {
+
+	if request.IsScanEnabled || isScanPluginConfigured {
 		buildArtifact.Scanned = true
 		buildArtifact.ScanEnabled = true
 	}
@@ -815,11 +812,11 @@ func (impl *WorkflowDagExecutorImpl) HandleCiSuccessEvent(triggerContext trigger
 			PipelineId:         ci.Id,
 			ParentCiArtifact:   buildArtifact.Id,
 			IsArtifactUploaded: request.IsArtifactUploaded, // for backward compatibility
-			ScanEnabled:        ci.ScanEnabled,
+			ScanEnabled:        request.IsScanEnabled,
 			Scanned:            false,
 			AuditLog:           sql.AuditLog{CreatedBy: request.UserId, UpdatedBy: request.UserId, CreatedOn: time.Now(), UpdatedOn: time.Now()},
 		}
-		if ci.ScanEnabled {
+		if request.IsScanEnabled {
 			ciArtifact.Scanned = true
 		}
 		ciArtifactArr = append(ciArtifactArr, ciArtifact)

pkg/workflow/dag/bean/bean.go

@@ -33,4 +33,5 @@ type CiArtifactWebhookRequest struct {
 	FailureReason                 string                         `json:"failureReason"`                 // FailureReason is used for notifying the failure reason to the user. Should be short and user-friendly
 	PluginRegistryArtifactDetails map[string][]string            `json:"PluginRegistryArtifactDetails"` //map of registry and array of images generated by Copy container image plugin
 	PluginArtifactStage           string                         `json:"pluginArtifactStage"`           // at which stage of CI artifact was generated by plugin ("pre_ci/post_ci")
+	IsScanEnabled                 bool                           `json:"isScanEnabled"`
 }

pkg/workflow/dag/helper/helper.go

@@ -0,0 +1,40 @@
+package helper
+
+import (
+	"bytes"
+	"encoding/json"
+	"github.com/devtron-labs/devtron/internal/sql/repository"
+	"github.com/devtron-labs/devtron/pkg/sql"
+	bean2 "github.com/devtron-labs/devtron/pkg/workflow/dag/bean"
+	"time"
+)
+
+func GetBuildArtifact(request *bean2.CiArtifactWebhookRequest, ciPipelineId int, materialJson []byte, createdOn, updatedOn time.Time) *repository.CiArtifact {
+	return &repository.CiArtifact{
+		Image:              request.Image,
+		ImageDigest:        request.ImageDigest,
+		MaterialInfo:       string(materialJson),
+		DataSource:         request.DataSource,
+		PipelineId:         ciPipelineId,
+		WorkflowId:         request.WorkflowId,
+		ScanEnabled:        request.IsScanEnabled,
+		IsArtifactUploaded: request.IsArtifactUploaded, // for backward compatibility
+		Scanned:            false,
+		AuditLog:           sql.AuditLog{CreatedBy: request.UserId, UpdatedBy: request.UserId, CreatedOn: createdOn, UpdatedOn: updatedOn},
+	}
+}
+
+func GetMaterialInfoJson(materialInfo json.RawMessage) ([]byte, error) {
+	var matJson []byte
+	materialJson, err := materialInfo.MarshalJSON()
+	if err != nil {
+		return matJson, err
+	}
+	dst := new(bytes.Buffer)
+	err = json.Compact(dst, materialJson)
+	if err != nil {
+		return matJson, err
+	}
+	matJson = dst.Bytes()
+	return matJson, nil
+}