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

Backport of Fix a bug that wrongly trims domains when there is an overlap with DC name into release/1.15.x #17872

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #17160 to be assessed for backporting due to the inclusion of the label backport/1.15.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

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.

merge conflict error: unable to process merge commit: "a1d0fa45017373f32b387fe0ea67675164778ac1", automatic backport requires rebase workflow

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 trimming test.consul instead of just .consul

This change, fixes the issue by adding dot (.) before trimming


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix_altdomain_dcname_overlap/mistakenly-ready-hog branch 2 times, most recently from 121ea50 to de17dd3 Compare June 26, 2023 14:57
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix_altdomain_dcname_overlap/mistakenly-ready-hog branch from 24ee4b4 to 5f415b0 Compare June 26, 2023 14:57
Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging June 26, 2023 15:01 Inactive
@vercel vercel bot temporarily deployed to Preview – consul June 26, 2023 15:03 Inactive
@david-yu david-yu marked this pull request as ready for review June 30, 2023 03:26
@dhiaayachi
Copy link
Collaborator

Manually backported

@dhiaayachi dhiaayachi closed this Aug 21, 2023
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.

None yet

5 participants