Merge ~ebarretto/ubuntu-cve-tracker:new-pkg-cache into ubuntu-cve-tracker:master

[Eduardo Barretto]

This PR alters `scripts/fetch-db` to add a new argument "dbtype" to allow us to fetch package cache from another server.
The way I added the new argument shouldn't affect current services using `fetch-db`.

[David Fernandez Gonzalez (litios)]

I would prefer the second approach so we only have one script.

We could make an optional flag for this so if this flag appears (something like ---pkg-cache), use https://security-metadata.canonical.com/pkg-cache/"$i".

This way, if we need a new endpoint in the future we can simply add more supported flags. As we are listing this in services/crons/etc, I feel like having to provide the whole URL is messier.

[Eduardo Barretto (ebarretto)]

> I would prefer the second approach so we only have one script.
>
> We could make an optional flag for this so if this flag appears (something
> like ---pkg-cache), use https://security-metadata.canonical.com/pkg-
> cache/"$i".
>
> This way, if we need a new endpoint in the future we can simply add more
> supported flags. As we are listing this in services/crons/etc, I feel like
> having to provide the whole URL is messier.

Ack, I've updated the description and rebased the changes to address it.

[David Fernandez Gonzalez (litios)]

LGTM, thanks!

review: Approve

diff --git a/scripts/fetch-db b/scripts/fetch-db
index 1577e75..5e02d1a 100755
--- a/scripts/fetch-db
+++ b/scripts/fetch-db
@@ -9,9 +9,10 @@
 set -e
 
 db="$1"
+dbtype="$2"
 
 if [ -z "$db" ]; then
-    echo "Must specify a db. Eg 'database.pickle.bz2'" >&2
+    echo "Must specify a db. Eg 'database.pickle.bz2' or 'jammy-pkg-cache.bz2'" >&2
     exit 1
 fi
 
@@ -20,7 +21,14 @@ for i in "$db" "$db".sha256 ; do
     # Fetch from people, instead of usn.ubuntu.com, because the version of the
     # USN database on usn.ubuntu.com isn't updated until the Jenkins deployment
     # job is executed to redeploy the site
-    wget -N https://people.canonical.com/~ubuntu-security/usn/"$i"
+    if [ -z "$dbtype" ]  || [ "$dbtype" = "usn" ]; then
+        wget -N https://people.canonical.com/~ubuntu-security/usn/"$i"
+    elif [ "$dbtype" = "pkg-cache" ]; then
+        wget -N https://security-metadata.canonical.com/pkg-cache/"$i"
+    else
+        echo "The types of db accepted are either 'usn' or 'pkg-cache'"
+        exit 1
+    fi
 done
 
 echo "= Verifiying $i ="