🚚 [#200] Move setup_config files to setup_configuration directory

open-zaak · Dec 10, 2024 · e222634 · e222634
1 parent e495567
commit e222634
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 10 deletions.
diff --git a/src/nrc/conf/includes/base.py b/src/nrc/conf/includes/base.py
@@ -20,7 +20,7 @@
     # Project applications.
     "nrc.accounts",
     "nrc.api",
-    "nrc.config",
+    "nrc.setup_configuration",
     "nrc.datamodel",
     "nrc.utils",
 ]
@@ -134,7 +134,7 @@
 SETUP_CONFIGURATION_STEPS = [
     "zgw_consumers.contrib.setup_configuration.steps.ServiceConfigurationStep",
     "vng_api_common.contrib.setup_configuration.steps.JWTSecretsConfigurationStep",
-    "nrc.config.authorization.AuthorizationStep",
+    "nrc.setup_configuration.authorization.AuthorizationStep",
     # TODO these need to be implemented later
     # "notifications_api_common.contrib.setup_configuration.steps.NotificationConfigurationStep",
     # TODO this should be moved to `django-setup-configuration`

diff --git a/src/nrc/config/__init__.py → src/nrc/setup_configuration/__init__.py b/src/nrc/config/__init__.py → src/nrc/setup_configuration/__init__.py
diff --git a/src/nrc/config/authorization.py → src/nrc/setup_configuration/authorization.py b/src/nrc/config/authorization.py → src/nrc/setup_configuration/authorization.py
diff --git a/src/nrc/config/models.py → src/nrc/setup_configuration/models.py b/src/nrc/config/models.py → src/nrc/setup_configuration/models.py
diff --git a/src/nrc/config/site.py → src/nrc/setup_configuration/site.py b/src/nrc/config/site.py → src/nrc/setup_configuration/site.py
diff --git a/src/nrc/tests/commands/test_setup_configuration.py b/src/nrc/tests/commands/test_setup_configuration.py
@@ -9,18 +9,13 @@
 
 import requests_mock
 from jwt import decode
-from notifications_api_common.contrib.setup_configuration.steps import (
-    NotificationConfigurationStep,
-)
-from notifications_api_common.models import NotificationsConfig
 from rest_framework import status
 from vng_api_common.authorizations.models import AuthorizationsConfig
 from vng_api_common.authorizations.utils import generate_jwt
 from vng_api_common.contrib.setup_configuration.steps import JWTSecretsConfigurationStep
 from zgw_consumers.contrib.setup_configuration.steps import ServiceConfigurationStep
 
-from nrc.config.authorization import AuthorizationStep
-from nrc.config.site import SiteConfigurationStep
+from nrc.setup_configuration.authorization import AuthorizationStep
 
 CONFIG_FILE_PATH = Path("src/nrc/tests/commands/files/setup_config_full.yaml").resolve()
 

diff --git a/src/nrc/tests/config/test_authorization_configuration.py b/src/nrc/tests/config/test_authorization_configuration.py
@@ -4,7 +4,7 @@
 from vng_api_common.authorizations.models import AuthorizationsConfig, ComponentTypes
 from zgw_consumers.test.factories import ServiceFactory
 
-from nrc.config.authorization import AuthorizationStep
+from nrc.setup_configuration.authorization import AuthorizationStep
 
 CONFIG_FILE_PATH = "src/nrc/tests/config/files/setup_config_auth_config.yaml"
 

diff --git a/src/nrc/tests/config/test_site_configuration.py b/src/nrc/tests/config/test_site_configuration.py
@@ -3,7 +3,7 @@
 
 from django_setup_configuration.test_utils import execute_single_step
 
-from nrc.config.site import SiteConfigurationStep
+from nrc.setup_configuration.site import SiteConfigurationStep
 
 CONFIG_FILE_PATH = "src/nrc/tests/config/files/setup_config_sites.yaml"