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(lambda-promtail): Remove s3 bucket ownership verification #15383

Merged
merged 8 commits into from
Dec 23, 2024
Merged

fix(lambda-promtail): Remove s3 bucket ownership verification #15383

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
86c946b
lambda-promtail: remove s3 bucket ownership verification
milenpankov-bosch Dec 12, 2024
b71d832
Update tools/lambda-promtail/lambda-promtail/s3.go
milenpankov-bosch Dec 13, 2024
ad0ec5c
lambda-promtail: remove s3 bucket_owner label from tests
milenpankov-bosch Dec 13, 2024
2bb9fd7
Merge branch 'main' into lambda-promtail-remove-s3-ownership-verifica…
milenpankov-bosch Dec 13, 2024
ff48e52
Merge branch 'main' into lambda-promtail-remove-s3-ownership-verifica…
milenpankov-bosch Dec 14, 2024
2bd32f2
Revert "lambda-promtail: remove s3 bucket_owner label from tests"
milenpankov-bosch Dec 20, 2024
0ddf2b7
Revert the bucket_owner label in s3 event
milenpankov-bosch Dec 20, 2024
5bd91e2
Merge branch 'main' into lambda-promtail-remove-s3-ownership-verifica…
milenpankov-bosch Dec 20, 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: 1 addition & 3 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 @@ -252,7 +252,6 @@ func getLabels(record events.S3EventRecord) (map[string]string, error) {

labels["key"] = record.S3.Object.Key
labels["bucket"] = record.S3.Bucket.Name
labels["bucket_owner"] = record.S3.Bucket.OwnerIdentity.PrincipalID
milenpankov-bosch marked this conversation as resolved.
Show resolved Hide resolved
labels["bucket_region"] = record.AWSRegion
for key, p := range parsers {
if p.filenameRegex.MatchString(labels["key"]) {
Expand Down Expand Up @@ -292,10 +291,9 @@ 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["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["bucket_owner"], err)
return fmt.Errorf("failed to get object %s from bucket %s on account %s, %s", labels["key"], labels["bucket"], err)
milenpankov-bosch marked this conversation as resolved.
Show resolved Hide resolved
}
err = parseS3Log(ctx, batch, labels, obj.Body, log)
if err != nil {
Expand Down
Loading