Merge pull request #6411 from devtron-labs/panic-fixes-1

prakash100198 · web-flow · commit 3ca6dad9b174 · 2025-02-21T16:16:51.000+05:30
fix: panic fixes
diff --git a/pkg/pipeline/BuildPipelineConfigService.go b/pkg/pipeline/BuildPipelineConfigService.go
@@ -680,6 +680,8 @@ func (impl *CiPipelineConfigServiceImpl) GetCiPipelineById(pipelineId int) (ciPi
 	if err != nil && !util.IsErrNoRows(err) {
 		impl.logger.Errorw("error in fetching ci pipeline", "pipelineId", pipelineId, "err", err)
 		return nil, err
+	} else if util.IsErrNoRows(err) {
+		return nil, util.NewApiError(http.StatusNotFound, "ci pipeline not found", "ci pipeline not found ")
 	}
 	dockerArgs := make(map[string]string)
 	if len(pipeline.DockerArgs) > 0 {

Original file line number	Diff line number	Diff line change
`@@ -680,6 +680,8 @@ func (impl *CiPipelineConfigServiceImpl) GetCiPipelineById(pipelineId int) (ciPi`
`680`	`680`	`if err != nil && !util.IsErrNoRows(err) {`
`681`	`681`	`impl.logger.Errorw("error in fetching ci pipeline", "pipelineId", pipelineId, "err", err)`
`682`	`682`	`return nil, err`
	`683`	`+ } else if util.IsErrNoRows(err) {`
	`684`	`+ return nil, util.NewApiError(http.StatusNotFound, "ci pipeline not found", "ci pipeline not found ")`
`683`	`685`	`}`
`684`	`686`	`dockerArgs := make(map[string]string)`
`685`	`687`	`if len(pipeline.DockerArgs) > 0 {`