Skip to content

fix: Prevent panic in import.git when update fails #5198

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
dehaansa merged 1 commit into from
Jan 7, 2026
Merged

fix: Prevent panic in import.git when update fails #5198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion internal/nodeconf/importsource/import_git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,9 @@ func (im *ImportGit) Update(args component.Arguments) (err error) {
if err != nil {
if errors.As(err, &vcs.UpdateFailedError{}) {
level.Error(im.log).Log("msg", "failed to update repository", "err", err)
if im.repo == nil && r == nil {
return err
}
im.updateHealth(err)
} else {
return err
Expand All @@ -222,7 +225,7 @@ func (im *ImportGit) Update(args component.Arguments) (err error) {
im.repoOpts = repoOpts
}

if err := im.pollFile(context.Background(), newArgs); err != nil {
if err = im.pollFile(context.Background(), newArgs); err != nil {
if errors.As(err, &vcs.UpdateFailedError{}) {
level.Error(im.log).Log("msg", "failed to poll file from repository", "err", err)
// We don't update the health here because it will be updated via the defer call.
Expand Down
Loading