fixup! Remove flask-admin based Plugins

kaxil · kaxil · commit 0af388dfb6f9 · 2020-10-14T11:16:37.000+01:00
diff --git a/airflow/plugins_manager.py b/airflow/plugins_manager.py
@@ -45,7 +45,9 @@
 executors_modules: Optional[List[Any]] = None
 
 # Plugin components to integrate directly
+admin_views: Optional[List[Any]] = None
 flask_blueprints: Optional[List[Any]] = None
+menu_links: Optional[List[Any]] = None
 flask_appbuilder_views: Optional[List[Any]] = None
 flask_appbuilder_menu_links: Optional[List[Any]] = None
 global_operator_extra_links: Optional[List[Any]] = None
@@ -71,7 +73,9 @@ class AirflowPlugin:
     hooks: List[Any] = []
     executors: List[Any] = []
     macros: List[Any] = []
+    admin_views: List[Any] = []
     flask_blueprints: List[Any] = []
+    menu_links: List[Any] = []
     appbuilder_views: List[Any] = []
     appbuilder_menu_items: List[Any] = []
 
@@ -230,7 +234,6 @@ def initialize_web_ui_plugins():
     """Collect extension points for WEB UI"""
     # pylint: disable=global-statement
     global plugins
-
     global flask_blueprints
     global flask_appbuilder_views
     global flask_appbuilder_menu_links
@@ -260,6 +263,14 @@ def initialize_web_ui_plugins():
             'blueprint': bp
         } for bp in plugin.flask_blueprints])
 
+        if (plugin.admin_views and not plugin.appbuilder_views) or (
+                plugin.menu_links and not plugin.appbuilder_menu_items):
+            log.warning(
+                "Plugin \'%s\' may not be compatible with the current Airflow version. "
+                "Please contact the author of the plugin.",
+                plugin.name
+            )
+
 
 def initialize_extra_operators_links_plugins():
     """Creates modules for loaded extension from extra operators links plugins"""
diff --git a/tests/plugins/test_plugins_manager.py b/tests/plugins/test_plugins_manager.py
@@ -120,3 +120,77 @@ class TestNonPropertyHook(BaseHook):
             self.assertIn('AirflowTestPropertyPlugin', str(plugins_manager.plugins))
             self.assertIn('PluginPropertyOperator', str(plugins_manager.operators_modules[0].__dict__))
             self.assertIn("TestNonPropertyHook", str(plugins_manager.hooks_modules[0].__dict__))
+
+    def test_should_warning_about_incompatible_plugins(self):
+        class AirflowAdminViewsPlugin(AirflowPlugin):
+            name = "test_admin_views_plugin"
+
+            admin_views = [mock.MagicMock()]
+
+        class AirflowAdminMenuLinksPlugin(AirflowPlugin):
+            name = "test_menu_links_plugin"
+
+            menu_links = [mock.MagicMock()]
+
+        with mock_plugin_manager(plugins=[
+            AirflowAdminViewsPlugin(),
+            AirflowAdminMenuLinksPlugin()
+        ]):
+            from airflow import plugins_manager
+
+            # assert not logs
+            with self.assertLogs(plugins_manager.log) as cm:
+                plugins_manager.initialize_web_ui_plugins()
+
+        self.assertEqual(cm.output, [
+            'WARNING:airflow.plugins_manager:Plugin \'test_admin_views_plugin\' may not be '
+            'compatible with the current Airflow version. Please contact the author of '
+            'the plugin.',
+            'WARNING:airflow.plugins_manager:Plugin \'test_menu_links_plugin\' may not be '
+            'compatible with the current Airflow version. Please contact the author of '
+            'the plugin.'
+        ])
+
+    def test_should_not_warning_about_fab_plugins(self):
+        class AirflowAdminViewsPlugin(AirflowPlugin):
+            name = "test_admin_views_plugin"
+
+            appbuilder_views = [mock.MagicMock()]
+
+        class AirflowAdminMenuLinksPlugin(AirflowPlugin):
+            name = "test_menu_links_plugin"
+
+            appbuilder_menu_items = [mock.MagicMock()]
+
+        with mock_plugin_manager(plugins=[
+            AirflowAdminViewsPlugin(),
+            AirflowAdminMenuLinksPlugin()
+        ]):
+            from airflow import plugins_manager
+
+            # assert not logs
+            with self.assertRaises(AssertionError), self.assertLogs(plugins_manager.log):
+                plugins_manager.initialize_web_ui_plugins()
+
+    def test_should_not_warning_about_fab_and_flask_admin_plugins(self):
+        class AirflowAdminViewsPlugin(AirflowPlugin):
+            name = "test_admin_views_plugin"
+
+            admin_views = [mock.MagicMock()]
+            appbuilder_views = [mock.MagicMock()]
+
+        class AirflowAdminMenuLinksPlugin(AirflowPlugin):
+            name = "test_menu_links_plugin"
+
+            menu_links = [mock.MagicMock()]
+            appbuilder_menu_items = [mock.MagicMock()]
+
+        with mock_plugin_manager(plugins=[
+            AirflowAdminViewsPlugin(),
+            AirflowAdminMenuLinksPlugin()
+        ]):
+            from airflow import plugins_manager
+
+            # assert not logs
+            with self.assertRaises(AssertionError), self.assertLogs(plugins_manager.log):
+                plugins_manager.initialize_web_ui_plugins()
diff --git a/tests/test_utils/mock_plugins.py b/tests/test_utils/mock_plugins.py
@@ -25,7 +25,9 @@
     "hooks_modules",
     "macros_modules",
     "executors_modules",
+    "admin_views",
     "flask_blueprints",
+    "menu_links",
     "flask_appbuilder_views",
     "flask_appbuilder_menu_links",
     "global_operator_extra_links",
