You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This PR is auto-generated from hashicorp#20583 to be assessed for backporting due to the inclusion of the label backport/1.18.
🚨
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: @jmurret
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.
Description
Fixes tests:
TestDNS_Lookup_TaggedIPAddresses (passing). part of NET-7644.
TestDNS_ServiceLookup_WanTranslation (not passing). part of NET-7634.
Notes
this logic requires addtional data from the database in the TaggedAddresses collection on nodes and services, as well as it also requires whether you are asking for IPV6, IPV4 or ANY,
since it requires data from the database, there needs to be a change to DiscoveryResult.
Right now it is just TaggedAddresses on the Discovery Result level.
Also, the Tagged Address on the service has address and PortNumber, so I hacked around with moving PortName and PortNumber to the Location struct and then making Tagged Addresses a map[string]*Location on the discovery result.
This is still a WIP and it looks like both Node and Service will need tagged addresses, so we will consider moving TaggedAddresses into DiscoveryResult.Node and DiscoveryResult.Service.
On the translation end of things, rather than copying all of the address translation code, I opted to ust inject the function from the agent as we did with various rpc functions.
Since the return type is in the agent package, I had to move the TranslateAccept enum in internal/dnsutil/dns.go to avoid import cycles.
Backport
This PR is auto-generated from hashicorp#20583 to be assessed for backporting due to the inclusion of the label backport/1.18.
🚨
The person who merged in the original PR is:
@jmurret
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.
Description
Fixes tests:
Notes
map[string]*Location
on the discovery result.DiscoveryResult.Node
andDiscoveryResult.Service
.internal/dnsutil/dns.go
to avoid import cycles.Testing & Reproduction steps
Links
PR Checklist
[ ] external facing docs updatedOverview of commits
The text was updated successfully, but these errors were encountered: