fix: lambda-promtail, update s3 filename regex to allow finding of log files from AWS GovCloud regions #12482
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
A broken regex prevents AWS GovCloud regions from properly being supported with Lambda Promtail. The regex matches only on regions with three parts in their filenames (e.g., us-east-1), and the GovCloud regions have four parts (e.g., us-gov-east-1).
Which issue(s) this PR fixes:
No issue found.
Special notes for your reviewer:
The fix is to add an additional, non-greedy, non-capturing group to match on the fourth parth. Initially, I attempted to use
(?:[\w-]+)
for its simplicity and to match on the region-parsing logic we already have. However, this breaks the tests for vpcflowlogs because of the greediness of the+
operator. As such, I opted to write something more verbose, but non-greedy.Tests have been added to prevent future breakages, as this tends to be an edge case.
Checklist
CONTRIBUTING.md
guide (required)docs/sources/setup/upgrade/_index.md
production/helm/loki/Chart.yaml
and updateproduction/helm/loki/CHANGELOG.md
andproduction/helm/loki/README.md
. Example PRdeprecated-config.yaml
anddeleted-config.yaml
files respectively in thetools/deprecated-config-checker
directory. Example PR