Merge pull request #97 from ethpandaops/fix/registered-country

fix(server): maxmind geoip country
ethpandaops · Mar 8, 2023 · 3f2e6d5 · 3f2e6d5
2 parents a5d4c0b + 6aeb4c1
commit 3f2e6d5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@ server.yaml
 discovery.yaml
 mimicry.yaml
 dist
+GeoLite2-ASN.mmdb
+GeoLite2-City.mmdb
diff --git a/pkg/server/geoip/maxmind/database/city.go b/pkg/server/geoip/maxmind/database/city.go
@@ -16,12 +16,12 @@ type City struct {
 }
 
 type LookupCity struct {
-	RegisteredCountry struct {
+	Country struct {
 		ISOCode string `maxminddb:"iso_code"`
 		Names   struct {
 			EN string `maxminddb:"en"`
 		} `maxminddb:"names"`
-	} `maxminddb:"registered_country"`
+	} `maxminddb:"country"`
 	Continent struct {
 		Code string `maxminddb:"code"`
 	} `maxminddb:"continent"`

diff --git a/pkg/server/geoip/maxmind/maxmind.go b/pkg/server/geoip/maxmind/maxmind.go
@@ -83,8 +83,8 @@ func (m *Maxmind) LookupIP(ctx context.Context, ip net.IP) (*lookup.Result, erro
 
 		if city != nil {
 			result.CityName = city.City.Names.EN
-			result.CountryName = city.RegisteredCountry.Names.EN
-			result.CountryCode = city.RegisteredCountry.ISOCode
+			result.CountryName = city.Country.Names.EN
+			result.CountryCode = city.Country.ISOCode
 			result.ContinentCode = city.Continent.Code
 			result.Latitude = city.Location.Latitude
 			result.Longitude = city.Location.Longitude