Skip to content

Commit bf2b3c5

Browse files
committed
ci pipeline get change
1 parent f53b58a commit bf2b3c5

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

api/restHandler/app/pipeline/configure/BuildPipelineRestHandler.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -565,26 +565,15 @@ func (handler *PipelineConfigRestHandlerImpl) GetCiPipeline(w http.ResponseWrite
565565
common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
566566
return
567567
}
568-
ciConf, err := handler.getCiPipelineRespResolved(appId)
568+
ciConf, err := handler.pipelineBuilder.GetCiPipelineRespResolved(appId)
569569
if err != nil {
570-
handler.Logger.Errorw("service err, GetCiPipeline", "err", err, "appId", appId)
570+
handler.Logger.Errorw("service err, GetCiPipelineRespResolved", "appId", appId, "err", err)
571571
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
572572
return
573573
}
574574
common.WriteJsonResp(w, err, ciConf, http.StatusOK)
575575
}
576576

577-
func (handler *PipelineConfigRestHandlerImpl) getCiPipelineRespResolved(appId int) (*bean.CiConfigRequest, error) {
578-
ciConf, err := handler.pipelineBuilder.GetCiPipeline(appId)
579-
if err != nil {
580-
return nil, err
581-
}
582-
if ciConf == nil || ciConf.Id == 0 {
583-
err = &util.ApiError{Code: "404", HttpStatusCode: 200, UserMessage: "no data found"}
584-
}
585-
return ciConf, err
586-
}
587-
588577
func (handler *PipelineConfigRestHandlerImpl) GetExternalCi(w http.ResponseWriter, r *http.Request) {
589578
vars := mux.Vars(r)
590579
appId, err := strconv.Atoi(vars["appId"])

pkg/pipeline/BuildPipelineConfigService.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ import (
5555
)
5656

5757
type CiPipelineConfigService interface {
58+
// GetCiPipelineRespResolved : gets the ci pipeline get response after resolving empty data response as expected by FE
59+
GetCiPipelineRespResolved(appId int) (*bean.CiConfigRequest, error)
5860
//GetCiPipeline : retrieves CI pipeline configuration (CiConfigRequest) for a specific application (appId).
5961
// It fetches CI pipeline data, including pipeline materials, scripts, and associated configurations.
6062
// It returns a detailed CiConfigRequest.
@@ -511,6 +513,17 @@ func (impl *CiPipelineConfigServiceImpl) getCiTemplateVariables(appId int) (ciCo
511513
return ciConfig, err
512514
}
513515

516+
func (impl *CiPipelineConfigServiceImpl) GetCiPipelineRespResolved(appId int) (*bean.CiConfigRequest, error) {
517+
ciConf, err := impl.GetCiPipeline(appId)
518+
if err != nil {
519+
return nil, err
520+
}
521+
if ciConf == nil || ciConf.Id == 0 {
522+
err = &util.ApiError{Code: "404", HttpStatusCode: 200, UserMessage: "no data found"}
523+
}
524+
return ciConf, err
525+
}
526+
514527
func (impl *CiPipelineConfigServiceImpl) GetCiPipeline(appId int) (ciConfig *bean.CiConfigRequest, err error) {
515528
ciConfig, err = impl.getCiTemplateVariables(appId)
516529
if err != nil {

0 commit comments

Comments
 (0)