From c5731e6cd28dfc230631c52d9ce7af3b165d518f Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sun, 25 Jun 2023 13:11:10 -0700 Subject: [PATCH] tailcfg: redefine Location.CountryCode as upper case Because other than TLDs, it's traditionally upper case: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 Updates #cleanup Signed-off-by: Brad Fitzpatrick --- tailcfg/tailcfg.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tailcfg/tailcfg.go b/tailcfg/tailcfg.go index d344e2bd4..2c3a735dc 100644 --- a/tailcfg/tailcfg.go +++ b/tailcfg/tailcfg.go @@ -535,10 +535,10 @@ type Service struct { // Tailscale host. Location is optional and only set if // explicitly declared by a node. type Location struct { - Country string `json:",omitempty"` // User friendly country name, with proper capitalization, e.g "Canada" - CountryCode string `json:",omitempty"` // ISO 3166-1 alpha-2 in lower case, e.g "ca" - City string `json:",omitempty"` // User friendly city name, with proper capitalization, e.g. "Squamish" - CityCode string `json:",omitempty"` + Country string `json:",omitempty"` // User friendly country name, with proper capitalization ("Canada") + CountryCode string `json:",omitempty"` // ISO 3166-1 alpha-2 in upper case ("CA") + City string `json:",omitempty"` // User friendly city name, with proper capitalization ("Squamish") + CityCode string `json:",omitempty"` // TODO(charlotte): document // Priority determines the priority an exit node is given when the // location data between two or more nodes is tied.