Skip to content

Commit

Permalink
Backport of add a conditional around setting LANFilter.AllSegments to…
Browse files Browse the repository at this point in the history
… make sure it is valid into release/1.16.x (#18146)

* no-op commit due to failed cherry-picking

* add a conditional around setting LANFilter.AllSegments to make sure it is valid (#18139)

This is to correct a code problem because this assumes all segments, but
when you get to Enterprise, you can be in partition that is not the
default partition, in which case specifying all segments does not
validate and fails. This is to correct the setting of this filter with
`AllSegments` to `true` to only occur when in the the `default`
partition.

<!--

* In the case of bugs, describe how to replicate
* If any manual tests were done, document the steps and the conditions
to replicate
* Call out any important/ relevant unit tests, e2e tests or integration
tests you have added or are adding

-->

<!--

Include any links here that might be helpful for people reviewing your
PR (Tickets, GH issues, API docs, external benchmarks, tools docs, etc).
If there are none, feel free to delete this section.

Please be mindful not to leak any customer or confidential information.
HashiCorp employees may want to use our internal URL shortener to
obfuscate links.

-->

* [ ] updated test coverage
* [ ] external facing docs updated
* [ ] appropriate backport labels added
* [ ] not a security concern

---------

Co-authored-by: temp <[email protected]>
Co-authored-by: John Murret <[email protected]>
  • Loading branch information
3 people committed Jul 17, 2023
1 parent d6f57fc commit fedb250
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion agent/ui_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,11 @@ func AgentMembersMapAddrVer(s *HTTPHandlers, req *http.Request) (map[string]stri
filter := consul.LANMemberFilter{
Partition: entMeta.PartitionOrDefault(),
}
filter.AllSegments = true

if acl.IsDefaultPartition(filter.Partition) {
filter.AllSegments = true
}

lanMembers, err := s.agent.delegate.LANMembers(filter)
if err != nil {
return nil, err
Expand Down

0 comments on commit fedb250

Please sign in to comment.