Skip to content
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

fix: correct S3 bucket owner label key to prevent retrieval errors #14913

Merged
merged 9 commits into from
Nov 21, 2024
Merged

fix: correct S3 bucket owner label key to prevent retrieval errors #14913

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4ea2a08
fix: correct S3 bucket owner label key to prevent retrieval errors
AmitRay9615 Nov 14, 2024
a43c24b
Merge branch 'main' into main
AmitRay9615 Nov 14, 2024
b41208c
Merge branch 'main' into main
AmitRay9615 Nov 15, 2024
f5f5a59
Merge branch 'main' into main
AmitRay9615 Nov 15, 2024
8a130c0
Merge branch 'main' into main
AmitRay9615 Nov 18, 2024
229f8cd
Merge branch 'main' into main
AmitRay9615 Nov 19, 2024
9b83785
Merge branch 'main' into main
AmitRay9615 Nov 19, 2024
2428803
Merge branch 'main' into main
AmitRay9615 Nov 20, 2024
b48615c
Merge branch 'main' into main
AmitRay9615 Nov 21, 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 tools/lambda-promtail/lambda-promtail/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,10 @@ func processS3Event(ctx context.Context, ev *events.S3Event, pc Client, log *log
&s3.GetObjectInput{
Bucket: aws.String(labels["bucket"]),
Key: aws.String(labels["key"]),
ExpectedBucketOwner: aws.String(labels["bucketOwner"]),
ExpectedBucketOwner: aws.String(labels["bucket_owner"]),
})
if err != nil {
return fmt.Errorf("failed to get object %s from bucket %s on account %s, %s", labels["key"], labels["bucket"], labels["bucketOwner"], err)
return fmt.Errorf("failed to get object %s from bucket %s on account %s, %s", labels["key"], labels["bucket"], labels["bucket_owner"], err)
}
err = parseS3Log(ctx, batch, labels, obj.Body, log)
if err != nil {
Expand Down
Loading