add cache to cves data (#5484)

* add cache to cves data

* fix failing tests

Author: codeEmpress1

tests/endpoints/cve/test_has_cve_api.py

@@ -1,5 +1,6 @@
 from unittest.mock import patch
 from tests.endpoints.endpoint_testing import TestEndpoints
+from cache.cache_utility import redis_cache
 
 
 class TestCveEndpoints(TestEndpoints):
@@ -24,6 +25,14 @@ def _set_user_is_canonical(self, value):
 
     def setUp(self):
         super().setUp()
+        # Clear cache before each test
+        if redis_cache.redis_available:
+            try:
+                redis_cache.client.flushdb()
+            except Exception:
+                pass
+        else:
+            redis_cache.fallback.clear()
         self._log_in_with_canonical_status(is_canonical=False)
 
 

tests/endpoints/test_cve_get_by_revision.py

@@ -3,11 +3,20 @@
 import json
 from webapp.publisher.cve.cve_helper import CveHelper
 from werkzeug.exceptions import NotFound
+from cache.cache_utility import redis_cache
 
 
 class CveHGetByRevisionTest(unittest.TestCase):
 
     def setUp(self):
+        # Clear cache before each test
+        if redis_cache.redis_available:
+            try:
+                redis_cache.client.flushdb()
+            except Exception:
+                pass
+        else:
+            redis_cache.fallback.clear()
 
         self.file_metadata = {"download_url": "https://example.com/file.json"}
 

tests/publisher/cve/test_has_cve.py

@@ -3,10 +3,21 @@
 
 from webapp.publisher.cve.cve_helper import CveHelper
 from werkzeug.exceptions import NotFound
+from cache.cache_utility import redis_cache
 
 
 class HasRevisionsWithCvesTest(unittest.TestCase):
 
+    def setUp(self):
+        # Clear cache before each test
+        if redis_cache.redis_available:
+            try:
+                redis_cache.client.flushdb()
+            except Exception:
+                pass
+        else:
+            redis_cache.fallback.clear()
+
     @patch("webapp.publisher.cve.cve_helper.CveHelper._get_cve_file_metadata")
     def test_returns_revision_numbers(self, mock_get_metadata):
         mock_get_metadata.return_value = [

webapp/publisher/cve/cve_helper.py

@@ -8,6 +8,7 @@
 from webapp.publisher.snaps import (
     logic,
 )
+from cache.cache_utility import redis_cache
 
 REST_API_URL = "https://api.github.com"
 GITHUB_SNAPCRAFT_BOT_USER_TOKEN = getenv("GITHUB_SNAPCRAFT_BOT_USER_TOKEN")
@@ -118,6 +119,12 @@ def _fetch_file_content(snap_name, revision, file_metadata):
 
     @staticmethod
     def get_revisions_with_cves(snap_name):
+        cve_with_revisions_cache_key = f"cve_revisions:{snap_name}"
+        cached_revision_files = redis_cache.get(
+            cve_with_revisions_cache_key, expected_type=list
+        )
+        if cached_revision_files:
+            return cached_revision_files
         try:
             contents = CveHelper._get_cve_file_metadata(
                 f"snap-cves/{snap_name}"
@@ -131,21 +138,35 @@ def get_revisions_with_cves(snap_name):
                 for item in contents
                 if (match := re.match(r"(\d+)\.yaml$", item["name"]))
             ]
+            redis_cache.set(
+                cve_with_revisions_cache_key, revision_files, ttl=3600
+            )
 
             return revision_files
         except NotFound:
             return []
 
     @staticmethod
     def get_cve_with_revision(snap_name, revision):
+        cve_with_revision_cache_key = f"cves:{snap_name}:{revision}"
+        cached_file_content = redis_cache.get(
+            cve_with_revision_cache_key, expected_type=list
+        )
+        if cached_file_content:
+            return cached_file_content
+
         file_metadata = CveHelper._get_cve_file_metadata(
             "snap-cves/{}.json".format(snap_name)
         )
 
         if file_metadata:
-            return CveHelper._fetch_file_content(
+            file_content = CveHelper._fetch_file_content(
                 snap_name, revision, file_metadata
             )
+            redis_cache.set(
+                cve_with_revision_cache_key, file_content, ttl=3600
+            )
+            return file_content
         return []
 
     @staticmethod