wip: adding variable id (#5844)

devtron-labs · Sep 13, 2024 · 68934d7 · 68934d7
1 parent 395d659
commit 68934d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go b/api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go
@@ -2023,13 +2023,13 @@ func (handler *PipelineConfigRestHandlerImpl) GetCdPipelineById(w http.ResponseW
 		return
 	}
 
-	ciConf, err := handler.pipelineBuilder.GetCdPipelineById(pipelineId)
+	cdPipeline, err := handler.pipelineBuilder.GetCdPipelineById(pipelineId)
 	if err != nil {
 		handler.Logger.Errorw("service err, GetCdPipelineById", "err", err, "appId", appId, "pipelineId", pipelineId)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
-	cdResp, err := pipeline.CreatePreAndPostStageResponse(ciConf, version)
+	cdResp, err := pipeline.CreatePreAndPostStageResponse(cdPipeline, version)
 	if err != nil {
 		handler.Logger.Errorw("service err, CheckForVersionAndCreatePreAndPostStagePayload", "err", err, "appId", appId, "pipelineId", pipelineId)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

diff --git a/pkg/pipeline/PipelineStageService.go b/pkg/pipeline/PipelineStageService.go
@@ -349,6 +349,7 @@ func (impl *PipelineStageServiceImpl) BuildVariableAndConditionDataByStepIdDeepC
 	for _, variable := range variables {
 		variableNameIdMap[variable.Id] = variable.Name
 		variableDto := &bean.StepVariableDto{
+			Id:                        variable.Id,
 			Name:                      variable.Name,
 			Format:                    variable.Format,
 			Description:               variable.Description,