remove cache from other authenticated endpoints (#5528)

Author: codeEmpress1

tests/endpoints/cve/test_has_cve_api.py

@@ -1,6 +1,5 @@
 from unittest.mock import patch
 from tests.endpoints.endpoint_testing import TestEndpoints
-from cache.cache_utility import redis_cache
 
 
 class TestCveEndpoints(TestEndpoints):
@@ -25,14 +24,6 @@ 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,21 +3,11 @@
 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"}
 
         self.file_content = {

tests/publisher/cve/test_has_cve.py

@@ -3,21 +3,9 @@
 
 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/endpoints/models.py

@@ -20,14 +20,6 @@
 )
 
 
-def get_models_cache_key(store_id: str) -> str:
-    return f"models:{store_id}"
-
-
-def get_policies_cache_key(store_id: str, model_name: str) -> str:
-    return f"policies:{store_id}:{model_name}"
-
-
 @models.route("/api/store/<store_id>/models")
 @login_required
 @exchange_required

webapp/endpoints/signing_keys.py

@@ -10,8 +10,6 @@
 from webapp.decorators import login_required, exchange_required
 from webapp.helpers import api_publisher_session, get_brand_id
 from webapp.endpoints.models import get_models, get_policies
-from cache.cache_utility import redis_cache
-
 
 publisher_gateway = PublisherGW("snap", api_publisher_session)
 
@@ -32,15 +30,9 @@ def get_signing_keys(store_id: str):
     brand_id = get_brand_id(flask.session, store_id)
     res = {}
     try:
-        signing_keys_cache_key = get_signing_keys_cache_key(store_id)
-        signing_keys = redis_cache.get(
-            signing_keys_cache_key, expected_type=list
+        signing_keys = publisher_gateway.get_store_signing_keys(
+            flask.session, brand_id
         )
-        if not signing_keys:
-            signing_keys = publisher_gateway.get_store_signing_keys(
-                flask.session, brand_id
-            )
-            redis_cache.set(signing_keys_cache_key, signing_keys, ttl=3600)
         res["data"] = signing_keys
         res["success"] = True
         response = make_response(res, 200)
@@ -71,8 +63,6 @@ def create_signing_key(store_id: str):
             publisher_gateway.create_store_signing_key(
                 flask.session, store_id, name
             )
-            signing_keys_cache_key = get_signing_keys_cache_key(store_id)
-            redis_cache.delete(signing_keys_cache_key)
             res["success"] = True
             return make_response(res, 200)
         else:
@@ -117,8 +107,6 @@ def delete_signing_key(store_id: str, signing_key_sha3_384: str):
 
         if response.status_code == 204:
             res["success"] = True
-            signing_keys_cache_key = get_signing_keys_cache_key(store_id)
-            redis_cache.delete(signing_keys_cache_key)
             return make_response(res, 200)
         elif response.status_code == 404:
             res["success"] = False

webapp/endpoints/validation_sets.py

@@ -5,7 +5,6 @@
 
 from webapp.decorators import login_required
 from webapp.helpers import api_session
-from cache.cache_utility import redis_cache
 
 dashboard = Dashboard(api_session)
 
@@ -25,14 +24,7 @@ def get_validation_sets():
     res = {}
 
     try:
-        cached_validation_sets = redis_cache.get(
-            "validation_sets", expected_type=dict
-        )
-        if cached_validation_sets:
-            validation_sets_data = cached_validation_sets
-        else:
-            validation_sets_data = dashboard.get_validation_sets(flask.session)
-            redis_cache.set("validation_sets", validation_sets_data, ttl=3600)
+        validation_sets_data = dashboard.get_validation_sets(flask.session)
         res["success"] = True
 
         if len(validation_sets_data["assertions"]) > 0:
@@ -64,18 +56,9 @@ def get_validation_set(validation_set_id):
     res = {}
 
     try:
-        cached_validation_set = redis_cache.get(
-            f"validation_set:{validation_set_id}", expected_type=dict
+        validation_set = dashboard.get_validation_set(
+            flask.session, validation_set_id
         )
-        if cached_validation_set:
-            validation_set = cached_validation_set
-        else:
-            validation_set = dashboard.get_validation_set(
-                flask.session, validation_set_id
-            )
-            redis_cache.set(
-                f"validation_set:{validation_set_id}", validation_set, ttl=3600
-            )
         res["success"] = True
 
         if len(validation_set["assertions"]) > 0:

webapp/publisher/cve/cve_helper.py

@@ -8,7 +8,6 @@
 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")
@@ -119,12 +118,6 @@ 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}"
@@ -138,23 +131,13 @@ 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)
         )
@@ -163,9 +146,6 @@ def get_cve_with_revision(snap_name, revision):
             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 []