Backport of Fix a bug that wrongly trims domains when there is an overlap with DC name into release/1.16.x #17873
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.
Backport
This PR is auto-generated from #17160 to be assessed for backporting due to the inclusion of the label backport/1.16.
🚨
The person who merged in the original PR is:
@dhiaayachi
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.
The below text is copied from the body of the original PR.
Fixes #17156
Before this change, when DC name and
domain
/alt-domain
overlap, the domain name incorrectly trimmed from the query.Example:
Given:
datacenter = dc-test
,alt-domain = test.consul.
Querying for
test-node.node.dc-test.consul
will fail, because the code was trimmingtest.consul
instead of just.consul
This change, fixes the issue by adding dot (
.
) before trimmingOverview of commits