Skip to content

Commit 4cc9ddf

Browse files
authored
fixing plugin version (#5876)
1 parent aff5f63 commit 4cc9ddf

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

pkg/eventProcessor/in/WorkflowEventProcessorService.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDStageCompleteEvent() error {
189189
pluginArtifacts := make(map[string][]string)
190190
if cdStageCompleteEvent.PluginArtifacts != nil {
191191
pluginArtifacts = cdStageCompleteEvent.PluginArtifacts.GetRegistryToUniqueContainerArtifactDataMapping()
192-
globalUtil.MergeMaps(pluginArtifacts, cdStageCompleteEvent.PluginRegistryArtifactDetails)
193192
}
193+
globalUtil.MergeMaps(pluginArtifacts, cdStageCompleteEvent.PluginRegistryArtifactDetails)
194194

195195
impl.logger.Debugw("received post stage success event for workflow runner ", "wfId", strconv.Itoa(wfr.Id))
196196
err = impl.workflowDagExecutor.HandlePostStageSuccessEvent(triggerContext, wfr, wfr.CdWorkflowId, cdStageCompleteEvent.CdPipelineId, cdStageCompleteEvent.TriggeredBy, pluginArtifacts)
@@ -646,8 +646,8 @@ func (impl *WorkflowEventProcessorImpl) BuildCiArtifactRequest(event bean.CiComp
646646
pluginArtifacts := make(map[string][]string)
647647
if event.PluginArtifacts != nil {
648648
pluginArtifacts = event.PluginArtifacts.GetRegistryToUniqueContainerArtifactDataMapping()
649-
globalUtil.MergeMaps(pluginArtifacts, event.PluginRegistryArtifactDetails)
650649
}
650+
globalUtil.MergeMaps(pluginArtifacts, event.PluginRegistryArtifactDetails)
651651

652652
request := &wrokflowDagBean.CiArtifactWebhookRequest{
653653
Image: event.DockerImage,

pkg/pipeline/pipelineStageVariableParser.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ type RefPluginName = string
3434

3535
const (
3636
COPY_CONTAINER_IMAGE RefPluginName = "Copy container image"
37-
COPY_CONTAINER_IMAGE_VERSION_V1 = "v1.0.0"
38-
COPY_CONTAINER_IMAGE_VERSION_V2 = "v1.1.0"
37+
COPY_CONTAINER_IMAGE_VERSION_V1 = "1.0.0"
3938
EMPTY_STRING = " "
4039
)
4140

pkg/workflow/dag/WorkflowDagExecutor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,8 @@ func (impl *WorkflowDagExecutorImpl) HandlePreStageSuccessEvent(triggerContext t
538538
pluginArtifacts := make(map[string][]string)
539539
if cdStageCompleteEvent.PluginArtifacts != nil {
540540
pluginArtifacts = cdStageCompleteEvent.PluginArtifacts.GetRegistryToUniqueContainerArtifactDataMapping()
541-
util4.MergeMaps(pluginArtifacts, cdStageCompleteEvent.PluginRegistryArtifactDetails)
542541
}
542+
util4.MergeMaps(pluginArtifacts, cdStageCompleteEvent.PluginRegistryArtifactDetails)
543543

544544
err = impl.deactivateUnusedPaths(wfRunner.ImagePathReservationIds, pluginArtifacts)
545545
if err != nil {

0 commit comments

Comments
 (0)