Merge pull request #414 from crocs-muni/fix/ci-nvd

Fix NVD tests.

3 files changed, 9 insertions, 6 deletions

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 51b13b90..a8ae7d6c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,6 +8,8 @@ env:
 jobs:
   test:
     runs-on: ubuntu-22.04
+    env:
+      SECCERTS_NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
     steps:
       - name: apt-get update
         run: sudo apt-get update
@@ -31,4 +33,6 @@ jobs:
       - name: Run tests
         run: pytest --cov=sec_certs tests
       - name: Code coverage upload
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/src/sec_certs/utils/nvd_dataset_builder.py b/src/sec_certs/utils/nvd_dataset_builder.py
index fe43bcb3..55132339 100644
--- a/src/sec_certs/utils/nvd_dataset_builder.py
+++ b/src/sec_certs/utils/nvd_dataset_builder.py
@@ -323,7 +323,7 @@ class CveNvdDatasetBuilder(NvdDatasetBuilder[CVEDataset]):
 class CpeMatchNvdDatasetBuilder(NvdDatasetBuilder[dict]):
     _ENDPOINT: Final[str] = "CPEMatch"
     _ENDPOINT_URL: Final[str] = "https://services.nvd.nist.gov/rest/json/cpematch/2.0"
-    _RESULTS_PER_PAGE: Final[int] = 5000
+    _RESULTS_PER_PAGE: Final[int] = 500
     _VERSION_KEYS: Final[list[str]] = [
         "versionStartIncluding",
         "versionStartExcluding",
diff --git a/tests/test_nvd_dataset_builder.py b/tests/test_nvd_dataset_builder.py
index 4868bfa7..fda94d1f 100644
--- a/tests/test_nvd_dataset_builder.py
+++ b/tests/test_nvd_dataset_builder.py
@@ -1,10 +1,9 @@
 from datetime import date, datetime, timedelta
-from importlib import resources
+from importlib.resources import files
 from typing import Any
 
 import pytest
 
-import tests.data.common
 from sec_certs.configuration import config
 from sec_certs.dataset import CCDataset, CPEDataset, CVEDataset
 from sec_certs.utils.nvd_dataset_builder import (
@@ -17,7 +16,7 @@ from sec_certs.utils.nvd_dataset_builder import (
 
 @pytest.fixture(autouse=True)
 def load_test_config():
-    with resources.path(tests.data.common, "settings_tests.yml") as path:
+    with files("tests.data.common") / "settings_tests.yml" as path:
         config.load_from_yaml(path)
 
 
@@ -62,7 +61,7 @@ def test_build_dataset(default_dataset: Any, builder_class: type[NvdDatasetBuild
         return len(dset["match_strings"])
 
     config.preferred_source_nvd_datasets = "api"
-    with builder_class() as dataset_builder:
+    with builder_class(api_key=config.nvd_api_key) as dataset_builder:
         dataset = dataset_builder._init_new_dataset()
         assert dataset == default_dataset
         last_update = dataset_builder._get_last_update_from_previous_data(dataset)