Merge pull request #3543 from open-formulieren/feature/upgrade-certma…

…nager ⬆️ Upgrade django-simplecertmanager to 1.4.1
open-formulieren · Oct 19, 2023 · dd45e7f · dd45e7f
2 parents 953245a + e2034b4
commit dd45e7f
Show file tree

Hide file tree

Showing 25 changed files with 28 additions and 152 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -55,6 +55,7 @@ django-modeltranslation
 django-ordered-model
 django-privates
 django-redis
+django-simple-certmanager
 django-solo
 django-tinymce
 django-treebeard

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -195,8 +195,9 @@ django-sendfile2==0.7.0
     # via django-privates
 django-sessionprofile==2.0.0
     # via django-digid-eherkenning
-django-simple-certmanager==1.3.0
+django-simple-certmanager==1.4.1
     # via
+    #   -r requirements/base.in
     #   django-digid-eherkenning
     #   zgw-consumers
 django-solo==2.1.0

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -333,10 +333,11 @@ django-sessionprofile==2.0.0
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   django-digid-eherkenning
-django-simple-certmanager==1.3.0
+django-simple-certmanager[testutils]==1.4.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   -r requirements/test-tools.in
     #   django-digid-eherkenning
     #   zgw-consumers
 django-solo==2.1.0
@@ -424,7 +425,9 @@ face==20.1.1
     #   -r requirements/base.txt
     #   glom
 factory-boy==3.0.1
-    # via -r requirements/test-tools.in
+    # via
+    #   -r requirements/test-tools.in
+    #   django-simple-certmanager
 faker==7.0.1
     # via
     #   -c requirements/base.txt

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -372,7 +372,7 @@ django-sessionprofile==2.0.0
     #   django-digid-eherkenning
 django-silk==5.0.1
     # via -r requirements/dev.in
-django-simple-certmanager==1.3.0
+django-simple-certmanager[testutils]==1.4.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -472,6 +472,7 @@ factory-boy==3.0.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   django-simple-certmanager
 faker==7.0.1
     # via
     #   -c requirements/ci.txt

diff --git a/requirements/extensions.txt b/requirements/extensions.txt
@@ -191,7 +191,6 @@ django-axes[ipware]==6.0.5
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
-    #   django-axes
 django-better-admin-arrayfield==1.4.2
     # via
     #   -c requirements/base.in
@@ -291,8 +290,9 @@ django-sessionprofile==2.0.0
     # via
     #   -r requirements/base.txt
     #   django-digid-eherkenning
-django-simple-certmanager==1.3.0
+django-simple-certmanager==1.4.1
     # via
+    #   -c requirements/base.in
     #   -r requirements/base.txt
     #   django-digid-eherkenning
     #   zgw-consumers

diff --git a/requirements/test-tools.in b/requirements/test-tools.in
@@ -3,6 +3,7 @@
 # Dependencies only relevant for (unit) testing
 coverage
 django-jenkins
+django-simple-certmanager[testutils]
 django-webtest
 factory-boy
 freezegun

diff --git a/src/openforms/appointments/contrib/jcc/tests/test_client.py b/src/openforms/appointments/contrib/jcc/tests/test_client.py
@@ -3,9 +3,9 @@
 from django.test import TestCase
 
 from privates.test import temp_private_root
+from simple_certmanager.test.factories import CertificateFactory
 from zeep.client import Client as ZeepClient
 
-from simple_certmanager_ext.tests.factories import CertificateFactory
 from soap.tests.factories import SoapServiceFactory
 
 from ..client import get_client

diff --git a/src/openforms/appointments/contrib/qmatic/tests/test_client.py b/src/openforms/appointments/contrib/qmatic/tests/test_client.py
@@ -3,9 +3,9 @@
 import requests_mock
 from privates.test import temp_private_root
 from simple_certmanager.constants import CertificateTypes
+from simple_certmanager.test.factories import CertificateFactory
 
 from openforms.utils.tests.logging import disable_logging
-from simple_certmanager_ext.tests.factories import CertificateFactory
 
 from ..client import QmaticClient
 from .utils import MockConfigMixin

diff --git a/src/openforms/authentication/contrib/digid/tests/test_auth_procedure.py b/src/openforms/authentication/contrib/digid/tests/test_auth_procedure.py
@@ -14,6 +14,7 @@
 from lxml import etree
 from privates.test import temp_private_root
 from rest_framework import status
+from simple_certmanager.test.factories import CertificateFactory
 
 from openforms.forms.tests.factories import (
     FormDefinitionFactory,
@@ -23,7 +24,6 @@
 from openforms.submissions.tests.factories import SubmissionFactory
 from openforms.submissions.tests.mixins import SubmissionsMixin
 from openforms.utils.tests.cache import clear_caches
-from simple_certmanager_ext.tests.factories import CertificateFactory
 
 from ....constants import CO_SIGN_PARAMETER, FORM_AUTH_SESSION_KEY, AuthAttribute
 from ....contrib.tests.saml_utils import create_test_artifact, get_artifact_response

diff --git a/src/openforms/authentication/contrib/digid/tests/test_signicat_integration.py b/src/openforms/authentication/contrib/digid/tests/test_signicat_integration.py
@@ -12,14 +12,14 @@
 from freezegun import freeze_time
 from furl import furl
 from privates.test import temp_private_root
+from simple_certmanager.test.factories import CertificateFactory
 from webtest.forms import Form as WTForm
 
 from openforms.forms.tests.factories import FormStepFactory
 from openforms.submissions.tests.factories import SubmissionFactory
 from openforms.submissions.tokens import submission_resume_token_generator
 from openforms.utils.tests.cache import clear_caches
 from openforms.utils.tests.vcr import OFVCRMixin
-from simple_certmanager_ext.tests.factories import CertificateFactory
 
 from ....constants import FORM_AUTH_SESSION_KEY
 from ..constants import PLUGIN_ID

diff --git a/src/openforms/authentication/contrib/eherkenning/tests/test_eherkenning_auth.py b/src/openforms/authentication/contrib/eherkenning/tests/test_eherkenning_auth.py
@@ -16,13 +16,13 @@
 from furl import furl
 from lxml import etree
 from privates.test import temp_private_root
+from simple_certmanager.test.factories import CertificateFactory
 
 from openforms.forms.tests.factories import FormFactory
 from openforms.submissions.tests.factories import SubmissionFactory
 from openforms.submissions.tests.mixins import SubmissionsMixin
 from openforms.tests.utils import supress_output
 from openforms.utils.tests.cache import clear_caches
-from simple_certmanager_ext.tests.factories import CertificateFactory
 
 from ....constants import CO_SIGN_PARAMETER, FORM_AUTH_SESSION_KEY, AuthAttribute
 from ....contrib.tests.saml_utils import (

diff --git a/src/openforms/authentication/contrib/eherkenning/tests/test_eidas_auth.py b/src/openforms/authentication/contrib/eherkenning/tests/test_eidas_auth.py
@@ -15,13 +15,13 @@
 from furl import furl
 from lxml import etree
 from privates.test import temp_private_root
+from simple_certmanager.test.factories import CertificateFactory
 
 from openforms.forms.tests.factories import FormFactory
 from openforms.submissions.tests.factories import SubmissionFactory
 from openforms.submissions.tests.mixins import SubmissionsMixin
 from openforms.tests.utils import supress_output
 from openforms.utils.tests.cache import clear_caches
-from simple_certmanager_ext.tests.factories import CertificateFactory
 
 from ....constants import CO_SIGN_PARAMETER, FORM_AUTH_SESSION_KEY, AuthAttribute
 from ....contrib.tests.saml_utils import (

diff --git a/src/openforms/authentication/contrib/eherkenning/tests/test_signicat_integration.py b/src/openforms/authentication/contrib/eherkenning/tests/test_signicat_integration.py
@@ -12,14 +12,14 @@
 from freezegun import freeze_time
 from furl import furl
 from privates.test import temp_private_root
+from simple_certmanager.test.factories import CertificateFactory
 from webtest.forms import Form as WTForm
 
 from openforms.forms.tests.factories import FormStepFactory
 from openforms.submissions.tests.factories import SubmissionFactory
 from openforms.submissions.tokens import submission_resume_token_generator
 from openforms.utils.tests.cache import clear_caches
 from openforms.utils.tests.vcr import OFVCRMixin
-from simple_certmanager_ext.tests.factories import CertificateFactory
 
 from ....constants import FORM_AUTH_SESSION_KEY
 from .utils import TEST_FILES

diff --git a/src/openforms/contrib/kvk/tests/base.py b/src/openforms/contrib/kvk/tests/base.py
@@ -4,10 +4,10 @@
 from unittest.mock import patch
 
 from simple_certmanager.constants import CertificateTypes
+from simple_certmanager.test.factories import CertificateFactory
 from zgw_consumers.constants import APITypes, AuthTypes
 
 from openforms.contrib.kvk.models import KVKConfig
-from simple_certmanager_ext.tests.factories import CertificateFactory
 from zgw_consumers_ext.tests.factories import ServiceFactory
 
 TEST_FILES = Path(__file__).parent.resolve() / "files"

diff --git a/src/simple_certmanager_ext/__init__.py b/src/simple_certmanager_ext/__init__.py
diff --git a/src/simple_certmanager_ext/tests/__init__.py b/src/simple_certmanager_ext/tests/__init__.py
diff --git a/src/simple_certmanager_ext/tests/data/README.md b/src/simple_certmanager_ext/tests/data/README.md
diff --git a/src/simple_certmanager_ext/tests/data/test.certificate b/src/simple_certmanager_ext/tests/data/test.certificate
diff --git a/src/simple_certmanager_ext/tests/data/test.key b/src/simple_certmanager_ext/tests/data/test.key
diff --git a/src/simple_certmanager_ext/tests/factories.py b/src/simple_certmanager_ext/tests/factories.py
diff --git a/src/soap/tests/factories.py b/src/soap/tests/factories.py
@@ -13,13 +13,13 @@ class Meta:
     class Params:
         with_server_cert = factory.Trait(
             server_certificate=factory.SubFactory(
-                "simple_certmanager_ext.tests.factories.CertificateFactory",
+                "simple_certmanager.test.factories.CertificateFactory",
                 public_certificate__filename="server.cert",
             ),
         )
         with_client_cert = factory.Trait(
             client_certificate=factory.SubFactory(
-                "simple_certmanager_ext.tests.factories.CertificateFactory",
+                "simple_certmanager.test.factories.CertificateFactory",
                 public_certificate__filename="client.cert",
             ),
         )
diff --git a/src/soap/tests/test_client.py b/src/soap/tests/test_client.py
@@ -7,8 +7,7 @@
 
 import requests_mock
 from ape_pie import InvalidURLError
-
-from simple_certmanager_ext.tests.factories import CertificateFactory
+from simple_certmanager.test.factories import CertificateFactory
 
 from ..client import SOAPSession, build_client
 from ..constants import EndpointSecurity

diff --git a/src/stuf/stuf_zds/tests/test_client.py b/src/stuf/stuf_zds/tests/test_client.py
@@ -6,10 +6,10 @@
 
 import requests_mock
 from simple_certmanager.constants import CertificateTypes
+from simple_certmanager.test.factories import CertificateFactory
 
 from openforms.registrations.exceptions import RegistrationFailed
 from openforms.tests.utils import can_connect
-from simple_certmanager_ext.tests.factories import CertificateFactory
 
 from ...constants import EndpointType
 from ...tests.factories import StufServiceFactory

diff --git a/src/zgw_consumers_ext/tests/factories.py b/src/zgw_consumers_ext/tests/factories.py
@@ -25,13 +25,13 @@ class Meta:
     class Params:
         with_server_cert = factory.Trait(
             server_certificate=factory.SubFactory(
-                "simple_certmanager_ext.tests.factories.CertificateFactory",
+                "simple_certmanager.test.factories.CertificateFactory",
                 public_certificate__filename="server.cert",
             ),
         )
         with_client_cert = factory.Trait(
             client_certificate=factory.SubFactory(
-                "simple_certmanager_ext.tests.factories.CertificateFactory",
+                "simple_certmanager.test.factories.CertificateFactory",
                 public_certificate__filename="client.cert",
             ),
         )
diff --git a/src/zgw_consumers_ext/tests/test_client_factory.py b/src/zgw_consumers_ext/tests/test_client_factory.py
@@ -4,10 +4,9 @@
 from ape_pie import APIClient
 from privates.test import temp_private_root
 from simple_certmanager.constants import CertificateTypes
+from simple_certmanager.test.factories import CertificateFactory
 from zgw_consumers.constants import AuthTypes
 
-from simple_certmanager_ext.tests.factories import CertificateFactory
-
 from ..api_client import ServiceClientFactory
 from .factories import ServiceFactory