Fixing maxmind download script to new url (#683)

* Fixing maxmind download script to new url * Updating github actions to use new account id secret.
kentik · Mar 19, 2024 · f40c7ce · f40c7ce
1 parent 840a17b
commit f40c7ce
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -116,7 +116,7 @@ jobs:
 
       - name: Install MM DBs
         run: |
-          MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }} ./bin/get_mm.sh
+          YOUR_ACCOUNT_ID=${{ secrets.MM_ACCOUNT_ID }} MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }} ./bin/get_mm.sh
 
       - name: Create package
         id: package

diff --git a/.github/workflows/publish-develop.yml b/.github/workflows/publish-develop.yml
@@ -60,6 +60,7 @@ jobs:
           tags: kentik/ktranslate:develop
           build-args: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
+            YOUR_ACCOUNT_ID=${{ secrets.MM_ACCOUNT_ID }}
             KENTIK_KTRANSLATE_VERSION=${{ env.KENTIK_KTRANSLATE_VERSION }}
           secrets: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
@@ -74,6 +75,7 @@ jobs:
           tags: kentik/ktranslate:developarm64
           build-args: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
+            YOUR_ACCOUNT_ID=${{ secrets.MM_ACCOUNT_ID }}
             KENTIK_KTRANSLATE_VERSION=${{ env.KENTIK_KTRANSLATE_VERSION }}
           secrets: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
diff --git a/.github/workflows/publish-eapi.yml b/.github/workflows/publish-eapi.yml
@@ -60,6 +60,7 @@ jobs:
           tags: kentik/ktranslate:eapi
           build-args: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
+            YOUR_ACCOUNT_ID=${{ secrets.MM_ACCOUNT_ID }}
             KENTIK_KTRANSLATE_VERSION=${{ env.KENTIK_KTRANSLATE_VERSION }}
           secrets: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
diff --git a/.github/workflows/publish-kentik.yml b/.github/workflows/publish-kentik.yml
@@ -73,6 +73,7 @@ jobs:
           tags: kentik/ktranslate:${{ env.KENTIK_KTRANSLATE_VERSION }}, kentik/ktranslate:kentik, quay.io/kentik/ktranslate:kentik
           build-args: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
+            YOUR_ACCOUNT_ID=${{ secrets.MM_ACCOUNT_ID }}
             KENTIK_KTRANSLATE_VERSION=${{ env.KENTIK_KTRANSLATE_VERSION }}
             KENTIK_SNMP_PROFILE_REPO=https://github.com/kentik/collection-profiles
           secrets: |

diff --git a/.github/workflows/publish-next.yml b/.github/workflows/publish-next.yml
@@ -70,6 +70,7 @@ jobs:
           tags: kentik/ktranslate:${{ env.KENTIK_KTRANSLATE_VERSION }}, kentik/ktranslate:next, quay.io/kentik/ktranslate:next, quay.io/kentik/ktranslate:${{ env.KENTIK_KTRANSLATE_VERSION }}
           build-args: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
+            YOUR_ACCOUNT_ID=${{ secrets.MM_ACCOUNT_ID }}
             KENTIK_KTRANSLATE_VERSION=${{ env.KENTIK_KTRANSLATE_VERSION }}
           secrets: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}

diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
@@ -104,7 +104,7 @@ jobs:
 
       - name: Install MM DBs
         run: |
-          MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }} ./bin/get_mm.sh
+          YOUR_ACCOUNT_ID=${{ secrets.MM_ACCOUNT_ID }} MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }} ./bin/get_mm.sh
 
       - name: Create package
         id: package

diff --git a/.github/workflows/publish-prod.yml b/.github/workflows/publish-prod.yml
@@ -84,6 +84,7 @@ jobs:
           tags: kentik/ktranslate:${{ env.KENTIK_KTRANSLATE_VERSION }}, kentik/ktranslate:latest, kentik/ktranslate:v2, quay.io/kentik/ktranslate:v2, quay.io/kentik/ktranslate:latest, quay.io/kentik/ktranslate:${{ env.KENTIK_KTRANSLATE_VERSION }}
           build-args: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
+            YOUR_ACCOUNT_ID=${{ secrets.MM_ACCOUNT_ID }}
             KENTIK_KTRANSLATE_VERSION=${{ env.KENTIK_KTRANSLATE_VERSION }}
           secrets: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
@@ -98,6 +99,7 @@ jobs:
           tags: kentik/ktranslate:v2arm64
           build-args: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
+            YOUR_ACCOUNT_ID=${{ secrets.MM_ACCOUNT_ID }}
             KENTIK_KTRANSLATE_VERSION=${{ env.KENTIK_KTRANSLATE_VERSION }}
           secrets: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
@@ -113,6 +115,7 @@ jobs:
           tags: kentik/ktranslate:eu, quay.io/kentik/ktranslate:eu
           build-args: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
+            YOUR_ACCOUNT_ID=${{ secrets.MM_ACCOUNT_ID }}
             KENTIK_KTRANSLATE_VERSION=${{ env.KENTIK_KTRANSLATE_VERSION }}
           secrets: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}

diff --git a/.github/workflows/publish-staging.yml b/.github/workflows/publish-staging.yml
@@ -67,6 +67,7 @@ jobs:
           tags: kentik/ktranslate:staging, quay.io/kentik/ktranslate:staging
           build-args: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
+            YOUR_ACCOUNT_ID=${{ secrets.MM_ACCOUNT_ID }}
             KENTIK_KTRANSLATE_VERSION=${{ env.KENTIK_KTRANSLATE_VERSION }}
           secrets: |
             MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }}
diff --git a/.github/workflows/publish-windows.yml b/.github/workflows/publish-windows.yml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Install MM DBs
         run: |
-          MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }} ./bin/get_mm.sh
+          YOUR_ACCOUNT_ID=${{ secrets.MM_ACCOUNT_ID }} MAXMIND_LICENSE_KEY=${{ secrets.MM_DOWNLOAD_KEY }} ./bin/get_mm.sh
 
       - name: Install SNMP Profiles
         uses: actions/checkout@main

diff --git a/bin/get_mm.sh b/bin/get_mm.sh
@@ -11,13 +11,13 @@ if [ -z ${MAXMIND_LICENSE_KEY} ]; then
 fi
 
 mkdir -p config
-curl -o mm.tar.gz "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key=${MAXMIND_LICENSE_KEY}&suffix=tar.gz"
+curl -L -o mm.tar.gz -u ${YOUR_ACCOUNT_ID}:${MAXMIND_LICENSE_KEY} "https://download.maxmind.com/geoip/databases/GeoLite2-Country/download?suffix=tar.gz"
 tar -zxf mm.tar.gz
 mv GeoLite2-Country_*/GeoLite2-Country.mmdb config/GeoLite2-Country.mmdb
 rm mm.tar.gz
 rm -r GeoLite2-Country_*
 
-curl -o mm.tar.gz "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN&license_key=${MAXMIND_LICENSE_KEY}&suffix=tar.gz"
+curl -L -o mm.tar.gz -u ${YOUR_ACCOUNT_ID}:${MAXMIND_LICENSE_KEY} "https://download.maxmind.com/geoip/databases/GeoLite2-ASN/download?suffix=tar.gz"
 tar -zxf mm.tar.gz
 mv GeoLite2-ASN_*/GeoLite2-ASN.mmdb config/GeoLite2-ASN.mmdb
 rm mm.tar.gz