From 4cc9ddf549abf581131afcc86cecd1b52aa69ad6 Mon Sep 17 00:00:00 2001
From: iamayushm <32041961+iamayushm@users.noreply.github.com>
Date: Fri, 20 Sep 2024 19:19:03 +0530
Subject: [PATCH] fixing plugin version (#5876)

---
 pkg/eventProcessor/in/WorkflowEventProcessorService.go | 4 ++--
 pkg/pipeline/pipelineStageVariableParser.go            | 3 +--
 pkg/workflow/dag/WorkflowDagExecutor.go                | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkg/eventProcessor/in/WorkflowEventProcessorService.go b/pkg/eventProcessor/in/WorkflowEventProcessorService.go
index afd03182486..619e196217b 100644
--- a/pkg/eventProcessor/in/WorkflowEventProcessorService.go
+++ b/pkg/eventProcessor/in/WorkflowEventProcessorService.go
@@ -189,8 +189,8 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDStageCompleteEvent() error {
 			pluginArtifacts := make(map[string][]string)
 			if cdStageCompleteEvent.PluginArtifacts != nil {
 				pluginArtifacts = cdStageCompleteEvent.PluginArtifacts.GetRegistryToUniqueContainerArtifactDataMapping()
-				globalUtil.MergeMaps(pluginArtifacts, cdStageCompleteEvent.PluginRegistryArtifactDetails)
 			}
+			globalUtil.MergeMaps(pluginArtifacts, cdStageCompleteEvent.PluginRegistryArtifactDetails)
 
 			impl.logger.Debugw("received post stage success event for workflow runner ", "wfId", strconv.Itoa(wfr.Id))
 			err = impl.workflowDagExecutor.HandlePostStageSuccessEvent(triggerContext, wfr, wfr.CdWorkflowId, cdStageCompleteEvent.CdPipelineId, cdStageCompleteEvent.TriggeredBy, pluginArtifacts)
@@ -646,8 +646,8 @@ func (impl *WorkflowEventProcessorImpl) BuildCiArtifactRequest(event bean.CiComp
 	pluginArtifacts := make(map[string][]string)
 	if event.PluginArtifacts != nil {
 		pluginArtifacts = event.PluginArtifacts.GetRegistryToUniqueContainerArtifactDataMapping()
-		globalUtil.MergeMaps(pluginArtifacts, event.PluginRegistryArtifactDetails)
 	}
+	globalUtil.MergeMaps(pluginArtifacts, event.PluginRegistryArtifactDetails)
 
 	request := &wrokflowDagBean.CiArtifactWebhookRequest{
 		Image:                         event.DockerImage,
diff --git a/pkg/pipeline/pipelineStageVariableParser.go b/pkg/pipeline/pipelineStageVariableParser.go
index 3dc9a9150d1..9afe8b17725 100644
--- a/pkg/pipeline/pipelineStageVariableParser.go
+++ b/pkg/pipeline/pipelineStageVariableParser.go
@@ -34,8 +34,7 @@ type RefPluginName = string
 
 const (
 	COPY_CONTAINER_IMAGE            RefPluginName = "Copy container image"
-	COPY_CONTAINER_IMAGE_VERSION_V1               = "v1.0.0"
-	COPY_CONTAINER_IMAGE_VERSION_V2               = "v1.1.0"
+	COPY_CONTAINER_IMAGE_VERSION_V1               = "1.0.0"
 	EMPTY_STRING                                  = " "
 )
 
diff --git a/pkg/workflow/dag/WorkflowDagExecutor.go b/pkg/workflow/dag/WorkflowDagExecutor.go
index 15a71c104b3..3f1be4ca4f1 100644
--- a/pkg/workflow/dag/WorkflowDagExecutor.go
+++ b/pkg/workflow/dag/WorkflowDagExecutor.go
@@ -538,8 +538,8 @@ func (impl *WorkflowDagExecutorImpl) HandlePreStageSuccessEvent(triggerContext t
 		pluginArtifacts := make(map[string][]string)
 		if cdStageCompleteEvent.PluginArtifacts != nil {
 			pluginArtifacts = cdStageCompleteEvent.PluginArtifacts.GetRegistryToUniqueContainerArtifactDataMapping()
-			util4.MergeMaps(pluginArtifacts, cdStageCompleteEvent.PluginRegistryArtifactDetails)
 		}
+		util4.MergeMaps(pluginArtifacts, cdStageCompleteEvent.PluginRegistryArtifactDetails)
 
 		err = impl.deactivateUnusedPaths(wfRunner.ImagePathReservationIds, pluginArtifacts)
 		if err != nil {