Skip to content

fix: return nil,err on git material fetch error #4857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 2, 2024
Merged

fix: return nil,err on git material fetch error #4857

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d1c7d9
return nil,err on git material fetch error
prakash100198 Mar 28, 2024
48066f1
Merge branch 'main' into return-nil-on-fetch-err
prakash100198 Apr 1, 2024
58fee73
Merge branch 'main' into return-nil-on-fetch-err
prakash100198 Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/pipeline/CiHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ func (impl *CiHandlerImpl) FetchMaterialsByPipelineId(pipelineId int, showAll bo
impl.Logger.Debugw("commits for material ", "m", m, "commits: ", changesResp)
if apiErr != nil {
impl.Logger.Warnw("git sensor FetchChanges failed for material", "id", m.Id)
return []pipelineConfig.CiPipelineMaterialResponse{}, apiErr
return nil, apiErr
}
ciMaterialHistoryMap[m] = changesResp
}
Expand Down Expand Up @@ -459,7 +459,7 @@ func (impl *CiHandlerImpl) FetchMaterialsByPipelineId(pipelineId int, showAll bo
regexMaterials, err := impl.ciPipelineMaterialRepository.GetRegexByPipelineId(pipelineId)
if err != nil {
impl.Logger.Errorw("regex ciMaterials fetch failed", "err", err)
return []pipelineConfig.CiPipelineMaterialResponse{}, err
return nil, err
}
for _, k := range regexMaterials {
r := pipelineConfig.CiPipelineMaterialResponse{
Expand Down