Skip to content

Commit 130f363

Browse files
deployment release counter exposed (#2555)
1 parent 1e87676 commit 130f363

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

pkg/pipeline/CdWorkflowService.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ type CdWorkflowRequest struct {
104104
DefaultAddressPoolSize int `json:"defaultAddressPoolSize"`
105105
DeploymentTriggeredBy string `json:"deploymentTriggeredBy,omitempty"`
106106
DeploymentTriggerTime time.Time `json:"deploymentTriggerTime,omitempty"`
107+
DeploymentReleaseCounter int `json:"deploymentReleaseCounter,omitempty"`
107108
}
108109

109110
const PRE = "PRE"

pkg/pipeline/WorkflowDagExecutor.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,21 +572,29 @@ func (impl *WorkflowDagExecutorImpl) buildWFRequest(runner *pipelineConfig.CdWor
572572
var stageYaml string
573573
var deployStageWfr pipelineConfig.CdWorkflowRunner
574574
deployStageTriggeredByUser := &bean.UserInfo{}
575+
var pipelineReleaseCounter int
575576
if runner.WorkflowType == bean.CD_WORKFLOW_TYPE_PRE {
576577
stageYaml = cdPipeline.PreStageConfig
577578
} else if runner.WorkflowType == bean.CD_WORKFLOW_TYPE_POST {
578579
stageYaml = cdPipeline.PostStageConfig
579580
//getting deployment pipeline latest wfr by pipelineId
580-
deployStageWfr, err = impl.cdWorkflowRepository.FindLastStatusByPipelineIdAndRunnerType(cdPipeline.Id, bean.CD_WORKFLOW_TYPE_DEPLOY)
581+
pipelineId := cdPipeline.Id
582+
deployStageWfr, err = impl.cdWorkflowRepository.FindLastStatusByPipelineIdAndRunnerType(pipelineId, bean.CD_WORKFLOW_TYPE_DEPLOY)
581583
if err != nil {
582-
impl.logger.Errorw("error in getting latest status of deploy type wfr by pipelineId", "err", err, "pipelineId", cdPipeline.Id)
584+
impl.logger.Errorw("error in getting latest status of deploy type wfr by pipelineId", "err", err, "pipelineId", pipelineId)
583585
return nil, err
584586
}
585587
deployStageTriggeredByUser, err = impl.user.GetById(deployStageWfr.TriggeredBy)
586588
if err != nil {
587589
impl.logger.Errorw("error in getting userDetails by id", "err", err, "userId", deployStageWfr.TriggeredBy)
588590
return nil, err
589591
}
592+
pipelineReleaseCounter, err = impl.pipelineOverrideRepository.GetCurrentPipelineReleaseCounter(pipelineId)
593+
if err != nil {
594+
impl.logger.Errorw("error occurred while fetching latest release counter for pipeline", "pipelineId", pipelineId, "err", err)
595+
return nil, err
596+
}
597+
590598
} else {
591599
return nil, fmt.Errorf("unsupported workflow triggerd")
592600
}
@@ -632,6 +640,9 @@ func (impl *WorkflowDagExecutorImpl) buildWFRequest(runner *pipelineConfig.CdWor
632640
cdStageWorkflowRequest.DeploymentTriggerTime = deployStageWfr.StartedOn
633641
cdStageWorkflowRequest.DeploymentTriggeredBy = deployStageTriggeredByUser.EmailId
634642
}
643+
if pipelineReleaseCounter > 0 {
644+
cdStageWorkflowRequest.DeploymentReleaseCounter = pipelineReleaseCounter
645+
}
635646
if cdWorkflowConfig.CdCacheRegion == "" {
636647
cdWorkflowConfig.CdCacheRegion = impl.cdConfig.DefaultCdLogsBucketRegion
637648
}

0 commit comments

Comments
 (0)