envoy.dependency.check: Catch NIST exceptions

Signed-off-by: Ryan Northey <ryan@synca.io>
envoyproxy · Oct 28, 2023 · 2660970 · 2660970
1 parent e5fa902
commit 2660970
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ pypi: https://pypi.org/project/aio.api.github
 
 #### [aio.api.nist](aio.api.nist)
 
-version: 0.0.4
+version: 0.0.5.dev0
 
 pypi: https://pypi.org/project/aio.api.nist
 
@@ -186,15 +186,15 @@ pypi: https://pypi.org/project/envoy.code.check
 
 #### [envoy.dependency.check](envoy.dependency.check)
 
-version: 0.1.11.dev0
+version: 0.1.11
 
 pypi: https://pypi.org/project/envoy.dependency.check
 
 ##### requirements:
 
 - [abstracts](https://pypi.org/project/abstracts) >=0.0.12
 - [aio.api.github](https://pypi.org/project/aio.api.github) >=0.1.6
-- [aio.api.nist](https://pypi.org/project/aio.api.nist) >=0.0.3
+- [aio.api.nist](https://pypi.org/project/aio.api.nist) >=0.0.4
 - [aio.core](https://pypi.org/project/aio.core) >=0.9.1
 - [aio.run.checker](https://pypi.org/project/aio.run.checker) >=0.5.7
 - [aiohttp](https://pypi.org/project/aiohttp) >=3.8.1

diff --git a/aio.api.nist/VERSION b/aio.api.nist/VERSION
@@ -1 +1 @@
-0.0.4
+0.0.5-dev
diff --git a/deps/requirements.txt b/deps/requirements.txt
@@ -1,7 +1,7 @@
 abstracts>=0.0.12
 aio.api.bazel>=0.0.2
 aio.api.github>=0.2.5
-aio.api.nist>=0.0.3
+aio.api.nist>=0.0.4
 aio.core>=0.10.0
 aio.run.checker>=0.5.7
 aio.run.runner>=0.3.3

diff --git a/envoy.dependency.check/VERSION b/envoy.dependency.check/VERSION
@@ -1 +1 @@
-0.1.11-dev
+0.1.11
diff --git a/envoy.dependency.check/envoy/dependency/check/abstract/checker.py b/envoy.dependency.check/envoy/dependency/check/abstract/checker.py
@@ -16,7 +16,7 @@
 
 import abstracts
 
-from aio.api import github as _github
+from aio.api import github as _github, nist
 from aio.run import checker
 from aio.core.tasks import ConcurrentError, inflate
 
@@ -397,7 +397,7 @@ async def on_checks_complete(self) -> int:
 
     @checker.preload(
         when=["cves"],
-        catches=[exceptions.CVECheckError])
+        catches=[exceptions.CVECheckError, nist.exceptions.NISTError])
     async def preload_cves(self) -> None:
         async for download in self.cves.downloads:
             self.log.debug(f"Preloaded cve data: {download}")

diff --git a/envoy.dependency.check/setup.cfg b/envoy.dependency.check/setup.cfg
@@ -30,7 +30,7 @@ packages = find_namespace:
 install_requires =
     abstracts>=0.0.12
     aio.api.github>=0.1.6
-    aio.api.nist>=0.0.3
+    aio.api.nist>=0.0.4
     aio.core>=0.9.1
     aio.run.checker>=0.5.7
     aiohttp>=3.8.1

diff --git a/envoy.dependency.check/tests/test_abstract_checker.py b/envoy.dependency.check/tests/test_abstract_checker.py
@@ -9,7 +9,7 @@
 
 import abstracts
 
-from aio.api import github
+from aio.api import github, nist
 from aio.core.functional import async_property
 from aio.core.tasks import ConcurrentError
 from aio.run.checker import Checker
@@ -1205,7 +1205,7 @@ async def iter_downloads():
         == ())
     assert (
         ADependencyChecker.preload_cves.catches
-        == (exceptions.CVECheckError,))
+        == (exceptions.CVECheckError, nist.exceptions.NISTError))
 
 
 @pytest.mark.parametrize(