Merge branch 'plugin-loading-apps' into 'main'

Rename plugin app.py to apps.py to be consistent with django See merge request reportcreator/reportcreator!830
Syslifters · Jan 16, 2025 · 7a1274c · 7a1274c
2 parents 19ee927 + 4df2f05
commit 7a1274c
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 12 deletions.
diff --git a/api/src/reportcreator_api/conf/plugins.py b/api/src/reportcreator_api/conf/plugins.py
@@ -225,13 +225,13 @@ def load_plugins(plugin_dirs: list[Path], enabled_plugins: list[str]):
             continue
 
         init_file = module_dir / '__init__.py'
-        app_file = module_dir / 'app.py'
-        if not init_file.is_file() or not app_file.is_file():
+        apps_file = module_dir / 'apps.py'
+        if not init_file.is_file() or not apps_file.is_file():
             continue
 
         module_name = f"sysreptor_plugins.{module_dir.name}"
         try:
-            plugin_app_module = import_module(module_name + '.app')
+            plugin_app_module = import_module(module_name + '.apps')
         except ImportError:
             continue
         plugin_config_class = next(filter(lambda c: issubclass(c, PluginConfig) and c != PluginConfig, map(lambda c: getattr(plugin_app_module, c), dir(plugin_app_module))), None)

diff --git a/api/src/reportcreator_api/tests/test_plugins.py b/api/src/reportcreator_api/tests/test_plugins.py
@@ -25,7 +25,7 @@
 def enable_demoplugin():
     # Import config to check if plugin exists
     try:
-        from sysreptor_plugins.demoplugin.app import DemoPluginConfig  # type: ignore
+        from sysreptor_plugins.demoplugin.apps import DemoPluginConfig  # type: ignore
     except ImportError:
         pytest.skip('DemoPlugin not found')
 
@@ -45,7 +45,7 @@ def enable_demoplugin():
 def disable_demoplugin():
     with override_settings(
         ENABLED_PLUGINS=[plugin for plugin in settings.ENABLED_PLUGINS if plugin not in ['demoplugin', DEMOPLUGIN_ID]],
-        INSTALLED_APPS=[app for app in settings.INSTALLED_APPS if app != 'sysreptor_plugins.demoplugin.app.DemoPluginConfig'],
+        INSTALLED_APPS=[app for app in settings.INSTALLED_APPS if app != 'sysreptor_plugins.demoplugin.apps.DemoPluginConfig'],
     ):
         yield
 
@@ -89,7 +89,7 @@ def test_plugin_loading(self):
         assert omit_keys(demoplugin_config, ['frontend_entry']) == {'id': DEMOPLUGIN_ID, 'name': 'demoplugin', 'frontend_settings': {}}
 
     def test_load_professional_only(self):
-        from sysreptor_plugins.demoplugin.app import DemoPluginConfig  # type: ignore
+        from sysreptor_plugins.demoplugin.apps import DemoPluginConfig  # type: ignore
 
         try:
             DemoPluginConfig.professional_only = True

diff --git a/plugins/checkthehash/app.py → plugins/checkthehash/apps.py b/plugins/checkthehash/app.py → plugins/checkthehash/apps.py
diff --git a/plugins/customizetheme/app.py → plugins/customizetheme/apps.py b/plugins/customizetheme/app.py → plugins/customizetheme/apps.py
diff --git a/plugins/cyberchef/app.py → plugins/cyberchef/apps.py b/plugins/cyberchef/app.py → plugins/cyberchef/apps.py
diff --git a/plugins/demoplugin/app.py → plugins/demoplugin/apps.py b/plugins/demoplugin/app.py → plugins/demoplugin/apps.py
diff --git a/plugins/demoplugin/tests/test_plugin_api.py b/plugins/demoplugin/tests/test_plugin_api.py
@@ -19,7 +19,7 @@
     websocket_client,
 )
 
-from ..app import DemoPluginConfig
+from ..apps import DemoPluginConfig
 from ..models import DemoPluginModel
 
 PLUGIN_ID = DemoPluginConfig.plugin_id

diff --git a/plugins/graphqlvoyager/app.py → plugins/graphqlvoyager/apps.py b/plugins/graphqlvoyager/app.py → plugins/graphqlvoyager/apps.py
diff --git a/plugins/projectnumber/app.py → plugins/projectnumber/apps.py b/plugins/projectnumber/app.py → plugins/projectnumber/apps.py
diff --git a/plugins/projectnumber/signals.py b/plugins/projectnumber/signals.py
@@ -13,7 +13,7 @@
     ReportSection,
 )
 
-from .app import ProjectNumberPluginConfig
+from .apps import ProjectNumberPluginConfig
 from .models import ProjectNumber
 
 log = logging.getLogger(__name__)

diff --git a/plugins/projectnumber/tests/test_plugin_api.py b/plugins/projectnumber/tests/test_plugin_api.py
@@ -19,7 +19,7 @@
     create_user,
 )
 
-from ..app import ProjectNumberPluginConfig
+from ..apps import ProjectNumberPluginConfig
 from ..management.commands import resetprojectnumber
 from ..models import ProjectNumber
 

diff --git a/plugins/renderfindings/app.py → plugins/renderfindings/apps.py b/plugins/renderfindings/app.py → plugins/renderfindings/apps.py
diff --git a/plugins/renderfindings/tests/test_renderfindings.py b/plugins/renderfindings/tests/test_renderfindings.py
@@ -15,7 +15,7 @@
     create_user,
 )
 
-from ..app import RenderFindingsPluginConfig
+from ..apps import RenderFindingsPluginConfig
 
 URL_NAMESPACE = RenderFindingsPluginConfig.label
 

diff --git a/plugins/webhooks/app.py → plugins/webhooks/apps.py b/plugins/webhooks/app.py → plugins/webhooks/apps.py
diff --git a/plugins/webhooks/tests/test_webhooks.py b/plugins/webhooks/tests/test_webhooks.py
@@ -8,7 +8,7 @@
 from reportcreator_api.tests.mock import create_finding, create_project, create_user
 from reportcreator_api.utils import utils
 
-from ..app import WebhooksPluginConfig
+from ..apps import WebhooksPluginConfig
 from ..models import WebhookEventType
 
 

diff --git a/plugins/webhooks/utils.py b/plugins/webhooks/utils.py
@@ -6,7 +6,7 @@
 from django.apps import apps
 from reportcreator_api.utils.utils import run_in_background
 
-from .app import WebhooksPluginConfig
+from .apps import WebhooksPluginConfig
 from .models import WebhookEventType