Merge pull request #150 from maxmind/horgh/update-dbs

Add a confidence value and another IP to GeoIP2-Enterprise
maxmind · Feb 6, 2025 · ddd177d · ddd177d
2 parents dac6727 + 34bfcc6
commit ddd177d
Show file tree

Hide file tree

Showing 41 changed files with 605 additions and 631 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.21.x, 1.22.x]
+        go-version: [1.22.x, 1.23.x]
         # We don't test on macOS and windows as the database builds aren't
         # repeatable there for some reason. As such, tests fail. It'd
         # probably be worth looking into this at some point.

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.23
       - uses: actions/checkout@v4
         with:
           persist-credentials: false

diff --git a/.perltidyallrc b/.perltidyallrc
diff --git a/.tidyallrc b/.tidyallrc
@@ -1,7 +1,2 @@
-[PerlTidy]
-select = **/*.{pl,pm,t,psgi}
-ignore = blib/**/*
-argv = --profile=$ROOT/.perltidyallrc
-
 [JSON]
 select = **/*.json
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ This repository contains the spec for that format as well as test databases.
 
 # Copyright and License
 
-This software is Copyright (c) 2013 - 2024 by MaxMind, Inc.
+This software is Copyright (c) 2013 - 2025 by MaxMind, Inc.
 
 This is free software, licensed under the [Apache License, Version
 2.0](LICENSE-APACHE) or the [MIT License](LICENSE-MIT), at your option.
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/maxmind/MaxMind-DB
 
-go 1.21
+go 1.23
 
 require (
 	github.com/maxmind/mmdbwriter v1.0.0

diff --git a/perltidyrc b/perltidyrc
diff --git a/source-data/GeoIP2-City-Test.json b/source-data/GeoIP2-City-Test.json
@@ -252,9 +252,9 @@
    },
    {
       "214.1.1.0/24" : {
-          "traits": {
-              "is_anycast": true
-          }
+         "traits" : {
+            "is_anycast" : true
+         }
       }
    },
    {

diff --git a/source-data/GeoIP2-Country-Test.json b/source-data/GeoIP2-Country-Test.json
@@ -15903,9 +15903,9 @@
    },
    {
       "214.1.1.0/24" : {
-          "traits": {
-              "is_anycast": true
-          }
+         "traits" : {
+            "is_anycast" : true
+         }
       }
    },
    {

diff --git a/source-data/GeoIP2-Enterprise-Test.json b/source-data/GeoIP2-Enterprise-Test.json
@@ -75,6 +75,7 @@
                }
             },
             {
+               "confidence" : 60,
                "geoname_id" : 3333217,
                "iso_code" : "WBK",
                "names" : {
@@ -780,9 +781,9 @@
    },
    {
       "214.1.1.0/24" : {
-          "traits": {
-              "is_anycast": true
-          }
+         "traits" : {
+            "is_anycast" : true
+         }
       }
    },
    {
@@ -1103,5 +1104,12 @@
             "user_type" : "hosting"
          }
       }
+   },
+   {
+      "214.214.214.221/32" : {
+         "traits" : {
+            "user_type" : "content_delivery_network"
+         }
+      }
    }
 ]
diff --git a/source-data/GeoIP2-IP-Risk-Test.json b/source-data/GeoIP2-IP-Risk-Test.json
@@ -1,31 +1,31 @@
 [
-    {
-        "::214.2.3.0/126": {
-            "ip_risk": 25,
-            "is_anonymous": true,
-            "is_anonymous_vpn": true
-        }
-    },
-    {
-        "::214.2.3.4/128": {
-            "ip_risk": 50,
-            "is_anonymous": true,
-            "is_anonymous_vpn": true,
-            "is_tor_exit_node": true
-        }
-    },
-    {
-        "::214.2.3.5/128": {
-            "ip_risk": 90,
-            "is_anonymous": true,
-            "is_anonymous_vpn": true,
-            "is_residential_proxy": true,
-            "is_tor_exit_node": true
-        }
-    },
-    {
-        "::214.2.3.6/128": {
-            "ip_risk": 85
-        }
-    }
+   {
+      "::214.2.3.0/126" : {
+         "ip_risk" : 25,
+         "is_anonymous" : true,
+         "is_anonymous_vpn" : true
+      }
+   },
+   {
+      "::214.2.3.4/128" : {
+         "ip_risk" : 50,
+         "is_anonymous" : true,
+         "is_anonymous_vpn" : true,
+         "is_tor_exit_node" : true
+      }
+   },
+   {
+      "::214.2.3.5/128" : {
+         "ip_risk" : 90,
+         "is_anonymous" : true,
+         "is_anonymous_vpn" : true,
+         "is_residential_proxy" : true,
+         "is_tor_exit_node" : true
+      }
+   },
+   {
+      "::214.2.3.6/128" : {
+         "ip_risk" : 85
+      }
+   }
 ]