Merge branch 'main' into 1079-create-suse-oval-importer #1079

Reference: #1079 Signed-off-by: John M. Horan johnmhoran@gmail.com
aboutcode-org · Dec 12, 2023 · d674f20 · d674f20
2 parents 6ce72b9 + 5092a79
commit d674f20
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 2 deletions.
diff --git a/docs/source/_static/theme_overrides.css b/docs/source/_static/theme_overrides.css
@@ -29,3 +29,7 @@ div.rst-content {
             margin-left: 0px;
         }
 }
+
+.with-shadow {
+    box-shadow: 1px 1px 5px 3px #cccccc;
+}
diff --git a/docs/source/images/vcio-db-admin-2023-11-27-01.png b/docs/source/images/vcio-db-admin-2023-11-27-01.png
diff --git a/docs/source/images/vcio-db-application-2023-11-27-01.png b/docs/source/images/vcio-db-application-2023-11-27-01.png
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -36,6 +36,7 @@ In this documentation you will find information on:
     reference_importer_overview
     reference_improver_overview
     reference_framework_overview
+    reference_model_overview
     command-line-interface
     importers_link
 

diff --git a/docs/source/reference_model_overview.rst b/docs/source/reference_model_overview.rst
@@ -0,0 +1,25 @@
+.. _reference_model_overview:
+
+Model Overview
+=================
+
+This is a set of Graphviz-based graph diagrams of the application and admin models as of 2023-11-27:
+
+Application
+-----------
+
+.. figure:: images/vcio-db-application-2023-11-27-01.png
+    :alt: alternate text
+    :width: 100%
+    :class: with-shadow
+
+.. rst-class::  clear-both
+
+
+Admin
+-----
+
+.. figure:: images/vcio-db-admin-2023-11-27-01.png
+    :alt: alternate text
+    :width: 70%
+    :class: with-shadow
diff --git a/setup.cfg b/setup.cfg
@@ -58,6 +58,7 @@ install_requires =
     Django>=4.0.0
     psycopg2-binary>=2.8.6
     djangorestframework>=3.12.4
+    django-extensions>=3.2.3
     django-filter>=2.4.0
     django-widget-tweaks>=1.4.8
     django-crispy-forms>=1.10.0

diff --git a/...ests/test_data/redhat/RHSA-2022:1439.json → ...st_data/redhat/RHSA_openjdk11_update.json b/...ests/test_data/redhat/RHSA-2022:1439.json → ...st_data/redhat/RHSA_openjdk11_update.json
diff --git a/...ests/test_data/redhat/RHSA-2022:1437.json → ...st_data/redhat/RHSA_openjdk17_update.json b/...ests/test_data/redhat/RHSA-2022:1437.json → ...st_data/redhat/RHSA_openjdk17_update.json
diff --git a/vulnerabilities/tests/test_redhat_importer.py b/vulnerabilities/tests/test_redhat_importer.py
@@ -42,8 +42,8 @@ def test_redhat_importer(get_data_from_url, fetcher):
         fetcher.return_value = [json.load(f)]
     bugzilla_2075788_response_file = os.path.join(TEST_DATA, "bugzilla-2075788.json")
     bugzilla_2077736_response_file = os.path.join(TEST_DATA, "bugzilla-2077736.json")
-    rhsa_1437 = os.path.join(TEST_DATA, "RHSA-2022:1437.json")
-    rhsa_1439 = os.path.join(TEST_DATA, "RHSA-2022:1439.json")
+    rhsa_1437 = os.path.join(TEST_DATA, "RHSA_openjdk17_update.json")
+    rhsa_1439 = os.path.join(TEST_DATA, "RHSA_openjdk11_update.json")
     get_data_from_url.side_effect = [
         json.load(open(bugzilla_2075788_response_file)),
         json.load(open(bugzilla_2077736_response_file)),

diff --git a/vulnerablecode/settings.py b/vulnerablecode/settings.py
@@ -70,6 +70,7 @@
     "django.contrib.admin",
     "django.contrib.humanize",
     # Third-party apps
+    "django_extensions",
     "django_filters",
     "rest_framework",
     "rest_framework.authtoken",