Merge branch 'master' into master

Author: chait-slim

gcp/workers/importer/importer.py

@@ -514,7 +514,7 @@ def _convert_blob_to_vuln(
     ndb_ctx = ndb.context.get_context(False)
     if ndb_ctx is None:
       # Production. Use the NDB client passed in.
-      ndb_ctx = ndb_client.context()
+      ndb_ctx = ndb_client.context(cache_policy=False)
     else:
       # Unit testing. Reuse the unit test's existing NDB client to avoid
       # "RuntimeError: Context is already created for this thread."
@@ -1306,5 +1306,5 @@ def main():
   atexit.register(log_run_duration, time.time())
   osv.logs.setup_gcp_logging('importer')
   _ndb_client = ndb.Client()
-  with _ndb_client.context():
+  with _ndb_client.context(cache_policy=False):
     main()

osv/ecosystems/_ecosystems.py

@@ -28,7 +28,7 @@
 from .pypi import PyPI
 from .redhat import RPM
 from .rubygems import RubyGems
-from .semver_ecosystem_helper import SemverEcosystem
+from .semver_ecosystem_helper import SemverEcosystem, SemverLike
 from .ubuntu import Ubuntu
 
 _ecosystems = {
@@ -64,6 +64,7 @@
     'SUSE': RPM,
     'SwiftURL': SemverEcosystem,
     'Ubuntu': Ubuntu,
+    'VSCode': SemverLike,
     'Wolfi': APK,
 
     # Ecosystems known in the schema, but without implementations.
@@ -72,6 +73,7 @@
     'ConanCenter': None,
     'GIT': None,
     'GitHub Actions': None,
+    'Kubernetes': None,
     'Linux': None,
     'OSS-Fuzz': None,
     'Photon OS': None,

tools/apitester/__snapshots__/cassette_single_query.snap

@@ -42,32 +42,32 @@
           "ranges": [
             {
               "type": "GIT",
-              "repo": "https://github.com/behdad/harfbuzz",
+              "repo": "https://github.com/harfbuzz/harfbuzz",
               "events": [
                 {
                   "introduced": "0"
+                },
+                {
+                  "fixed": "d3e09bf4654fe5478b6dbf2b26ebab6271317d81"
                 }
               ]
             }
           ],
+          "versions": 138,
           "database_specific": "<Any value>"
         },
         {
           "ranges": [
             {
               "type": "GIT",
-              "repo": "https://github.com/harfbuzz/harfbuzz",
+              "repo": "https://github.com/behdad/harfbuzz",
               "events": [
                 {
                   "introduced": "0"
-                },
-                {
-                  "fixed": "d3e09bf4654fe5478b6dbf2b26ebab6271317d81"
                 }
               ]
             }
           ],
-          "versions": 138,
           "database_specific": "<Any value>"
         }
       ],