Skip to content

api: ensure empty locality field is not transmitted to Consul #17137

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.

Sign up for GitHub

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

Merged
rboyer merged 3 commits into from
Apr 26, 2023
Merged

api: ensure empty locality field is not transmitted to Consul #17137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d185fdb
api: ensure empty locality field is not transmitted to Consul
rboyer Apr 25, 2023
867f4b2
changelog
rboyer Apr 25, 2023
f20ed34
don't need the changelog; wasn't released yet
rboyer Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ type CatalogRegistration struct {
Check *AgentCheck
Checks HealthChecks
SkipNodeUpdate bool
Partition string `json:",omitempty"`
Locality *Locality
Partition string `json:",omitempty"`
Locality *Locality `json:",omitempty"`
}

type CatalogDeregistration struct {
Expand Down
2 changes: 1 addition & 1 deletion api/peering.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ type PeeringRemoteInfo struct {
Partition string
// Datacenter is the remote peer's datacenter.
Datacenter string
Locality *Locality
Locality *Locality `json:",omitempty"`
}

// Locality identifies where a given entity is running.
Expand Down