Merge branch 'master' into 🙃🙃🙃🙃🙃🙃🙃

Author: michaelkedar

gcp/api/integration_tests.py

@@ -732,8 +732,6 @@ def test_query_batch(self):
                 {},
                 {
                     'vulns': [{
-                        'id': 'CVE-2020-15866',
-                    }, {
                         'id': 'CVE-2020-36401',
                     }, {
                         'id': 'CVE-2021-4110',

go/cmd/relations/update.go

@@ -17,6 +17,7 @@ package main
 import (
 	"context"
 	"errors"
+	"fmt"
 	"log/slog"
 	"slices"
 	"strings"
@@ -86,7 +87,7 @@ func (u *Updater) run(ctx context.Context) {
 			// TODO: Parallelize these updates using a worker pool.
 			for id, updates := range allUpdates {
 				// Get the vulnerability from GCS
-				path := id + ".pb"
+				path := fmt.Sprintf("all/pb/%s.pb", id)
 				data, err := u.gcsClient.ReadObject(ctx, path)
 				if err != nil {
 					if errors.Is(err, clients.ErrNotFound) {

tools/apitester/__snapshots__/cassette_TestCommand.snap

@@ -113,7 +113,7 @@
         },
         {
           "id": "GO-2025-3420",
-          "modified": "<RFC3339 date with the year 2025>"
+          "modified": "<RFC3339 date with the year 2026>"
         },
         {
           "id": "GO-2025-3447",
@@ -273,7 +273,7 @@
         },
         {
           "id": "GO-2025-3420",
-          "modified": "<RFC3339 date with the year 2025>"
+          "modified": "<RFC3339 date with the year 2026>"
         },
         {
           "id": "GO-2025-3447",
@@ -425,7 +425,7 @@
         },
         {
           "id": "GO-2025-3420",
-          "modified": "<RFC3339 date with the year 2025>"
+          "modified": "<RFC3339 date with the year 2026>"
         },
         {
           "id": "GO-2025-3447",
@@ -585,7 +585,7 @@
         },
         {
           "id": "GO-2025-3420",
-          "modified": "<RFC3339 date with the year 2025>"
+          "modified": "<RFC3339 date with the year 2026>"
         },
         {
           "id": "GO-2025-3447",
@@ -3270,7 +3270,14 @@
         }
       ]
     },
-    {},
+    {
+      "vulns": [
+        {
+          "id": "GHSA-27jp-wm6q-gp25",
+          "modified": "<RFC3339 date with the year 2026>"
+        }
+      ]
+    },
     {},
     {},
     {
@@ -3768,7 +3775,14 @@
         }
       ]
     },
-    {},
+    {
+      "vulns": [
+        {
+          "id": "GHSA-27jp-wm6q-gp25",
+          "modified": "<RFC3339 date with the year 2026>"
+        }
+      ]
+    },
     {},
     {},
     {

tools/apitester/__snapshots__/cassette_batch_query.snap

@@ -8,10 +8,6 @@
           "id": "CVE-2021-22569",
           "modified": "<RFC3339 date with the year 2026>"
         },
-        {
-          "id": "CVE-2022-1941",
-          "modified": "<RFC3339 date with the year 2026>"
-        },
         {
           "id": "CVE-2022-3171",
           "modified": "<RFC3339 date with the year 2026>"