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.

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 configuration interpolation #5403

Merged
merged 2 commits into from
Sep 9, 2024
Merged

Fix configuration interpolation #5403

merged 2 commits into from
Sep 9, 2024

Conversation

rdettai
Copy link
Contributor

@rdettai rdettai commented Sep 9, 2024

Description

The regex for env variable interpolation in configs doesn't capture properly multiple variables in the same line.

Closes #5403

How was this PR tested?

Unit test + tests in the lambda package

@rdettai rdettai self-assigned this Sep 9, 2024
@@ -30,7 +30,7 @@ use tracing::debug;
// `ENV_VAR` or `ENV_VAR:DEFAULT`
// Ignores whitespaces in curly braces
static TEMPLATE_ENV_VAR_CAPTURE: Lazy<Regex> = Lazy::new(|| {
Regex::new(r"\$\{\s*([A-Za-z0-9_]+)\s*(?::\-\s*([\S]+)\s*)?}")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the only code change of this PR, the rest are tests

@rdettai rdettai linked an issue Sep 9, 2024 that may be closed by this pull request
Copy link
Contributor

@trinity-1686a trinity-1686a left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Copy link

github-actions bot commented Sep 9, 2024

On SSD:

Average search latency is 1.01x that of the reference (lower is better).
Ref run id: 3310, ref commit: 79acfe4
Link

On GCS:

Average search latency is 1.03x that of the reference (lower is better).
Ref run id: 3311, ref commit: 79acfe4
Link

@rdettai rdettai enabled auto-merge (squash) September 9, 2024 14:06
@rdettai rdettai merged commit 4ed7995 into main Sep 9, 2024
5 checks passed
@rdettai rdettai deleted the fix-conf-templating branch September 9, 2024 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Lambda searcher: default metastore_uri breaks search
2 participants