fixup! [WIP] Update the ZGWAPIsConfigurationStep configuration step

Author: swrichards

src/open_inwoner/configurations/bootstrap/utils.py

@@ -1,5 +1,7 @@
 import logging
 
+from zgw_consumers.models import Service
+
 RED = "\033[31m"
 NORMAL = "\033[0m"
 
@@ -17,3 +19,14 @@ def log_form_errors(config_step, form):
     )
     for field, errors in form.errors.items():
         logger.error("%s : %s" % (field, "; ".join(errors)))
+
+
+def get_service(slug: str) -> Service:
+    """
+    Try to find a Service and re-raise DoesNotExist with the identifier to make debugging
+    easier
+    """
+    try:
+        return Service.objects.get(slug=slug)
+    except Service.DoesNotExist as e:
+        raise Service.DoesNotExist(f"{str(e)} (identifier = {slug})")

src/open_inwoner/configurations/bootstrap/zgw.py

@@ -1,11 +1,9 @@
-from django.conf import settings
-
 from django_setup_configuration import ConfigurationModel, DjangoModelRef
 from django_setup_configuration.configuration import BaseConfigurationStep
 from django_setup_configuration.exceptions import ConfigurationRunFailed
-from zgw_consumers.api_models.constants import VertrouwelijkheidsAanduidingen
 from zgw_consumers.models import Service
 
+from open_inwoner.configurations.bootstrap.utils import get_service
 from open_inwoner.openzaak.models import OpenZaakConfig, ZGWApiGroupConfig
 
 
@@ -51,11 +49,6 @@ class ZGWAPIsConfigurationStep(BaseConfigurationStep):
     namespace = "openzaak_config"
     config_model = ZGWAPIsConfigurationModel
 
-    # def is_configured(self) -> bool:
-    #     """Verify that at least 1 ZGW API set is configured."""
-    #     zgw_config = OpenZaakConfig.get_solo()
-    #     return ZGWApiGroupConfig.objects.filter(open_zaak_config=zgw_config).exists()
-
     def execute(self, model: ZGWAPIsConfigurationModel):
         if len(model.api_groups) < 1:
             raise ConfigurationRunFailed("Configure at least one `api_groups` item")
@@ -65,19 +58,19 @@ def execute(self, model: ZGWAPIsConfigurationModel):
         for api_group in model.api_groups:
 
             try:
-                zrc_service = Service.objects.get(
-                    slug=api_group.zaken_api_identifier,
+                zrc_service = get_service(
+                    api_group.zaken_api_identifier,
                 )
-                ztc_service = Service.objects.get(
-                    slug=api_group.catalogi_api_identifier,
+                ztc_service = get_service(
+                    api_group.catalogi_api_identifier,
                 )
-                drc_service = Service.objects.get(
-                    slug=api_group.documenten_api_identifier,
+                drc_service = get_service(
+                    api_group.documenten_api_identifier,
                 )
                 # Not required
                 form_service = (
-                    Service.objects.get(
-                        slug=api_group.form_api_identifier,
+                    get_service(
+                        api_group.form_api_identifier,
                     )
                     if api_group.form_api_identifier
                     else None

src/open_inwoner/configurations/tests/bootstrap/test_setup_zgw_config.py

@@ -1,42 +1,26 @@
-import tempfile
 from pathlib import Path
 
-from django.conf import settings
-from django.test import TestCase, override_settings
-from django.utils.translation import gettext as _
+from django.test import TestCase
 
-import requests
-import requests_mock
 from django_setup_configuration.exceptions import (
     ConfigurationRunFailed,
     PrerequisiteFailed,
 )
 from django_setup_configuration.test_utils import execute_single_step
 from privates.test import temp_private_root
-from pydantic import ValidationError
-from simple_certmanager.constants import CertificateTypes
 from zgw_consumers.api_models.constants import VertrouwelijkheidsAanduidingen
 from zgw_consumers.constants import APITypes
 from zgw_consumers.models import Service
 
-from open_inwoner.openzaak.models import (
-    OpenZaakConfig,
-    generate_default_file_extensions,
-)
+from open_inwoner.configurations.bootstrap.zgw import ZGWAPIsConfigurationStep
+from open_inwoner.openzaak.models import OpenZaakConfig
 from open_inwoner.openzaak.tests.factories import ServiceFactory
 
-from ...bootstrap.zgw import ZGWAPIsConfigurationStep
-
 ZAAK_SERVICE_API_ROOT = "https://openzaak.local/zaken/api/v1/"
 CATALOGI_SERVICE_API_ROOT = "https://openzaak.local/catalogi/api/v1/"
 DOCUMENTEN_SERVICE_API_ROOT = "https://openzaak.local/documenten/api/v1/"
 FORM_SERVICE_API_ROOT = "https://esuite.local.net/formulieren-provider/api/v1/"
 
-PUBLIC_CERT_FILE = tempfile.NamedTemporaryFile()
-PRIVATE_KEY_FILE = tempfile.NamedTemporaryFile()
-
-with open(PUBLIC_CERT_FILE.name, "w") as f:
-    f.write("cert")
 
 BASE_DIR = Path(__file__).parent / "files"
 ZGW_API_STEP_YAML_FULL = str(BASE_DIR / "zgw_api_step_full.yaml")