[8.12](backport #38407) Filebeat gcs input addFiledJobs panic protect…

…ion (#38474) * Filebeat gcs input addFiledJobs panic protection (#38407) * Filebeat gcs input addFiledJobs panic protection In case `obj, err := s.bucket.Object(name).Attrs(ctx)` return an error, obj will be probably `nil` in consequence the code below will panic `objectURI := "gs://" + s.src.BucketName + "/" + obj.Name` * Update CHANGELOG-developer.next.asciidoc (cherry picked from commit c6fd99c) * Update CHANGELOG-developer.next.asciidoc --------- Co-authored-by: Adam Sowiński <[email protected]> Co-authored-by: ShourieG <[email protected]>
elastic · Mar 21, 2024 · 262ae24 · 262ae24
1 parent 04bf860
commit 262ae24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc
@@ -91,6 +91,7 @@ The list below covers the major changes between 7.0.0-rc2 and main only.
 - Make winlogbeat/sys/wineventlog follow the unsafe.Pointer rules. {pull}36650[36650]
 - Cleaned up documentation errors & fixed a minor bug in Filebeat Azure blob storage input. {pull}36714[36714]
 - Fix copy arguments for strict aligned architectures. {pull}36976[36976]
+- Fix filebeat gcs input panic {pull}38407[38407]
 
 ==== Added
 

diff --git a/x-pack/filebeat/input/gcs/scheduler.go b/x-pack/filebeat/input/gcs/scheduler.go
@@ -233,6 +233,7 @@ func (s *scheduler) addFailedJobs(ctx context.Context, jobs []*job) []*job {
 			obj, err := s.bucket.Object(name).Attrs(ctx)
 			if err != nil {
 				s.log.Errorf("adding failed job %s to job list caused an error: %w", err)
+				continue
 			}
 
 			objectURI := "gs://" + s.src.BucketName + "/" + obj.Name