Merge branch 'release-0.0.1.dev5'

CHANGELOG.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+0.0.1.dev5 (2018-08-09)
+-----------------------
+
+Changes
+~~~~~~~
+
+Import plugins_loader from Gordon to obtain metrics client
+
 0.0.1.dev3 (2018-03-22)
 -----------------------
 

MANIFEST.in

@@ -1,6 +1,6 @@
 include *.txt LICENSE tox.ini .coveragerc *.rst *.toml.example OWNERS
 recursive-include gordon_janitor *.py
-recursive-include tests *.py
+recursive-include tests *.py *.toml
 
 # Exclude service-specific config
 exclude gordon-janitor*.toml

docs/api.rst

@@ -16,6 +16,6 @@ main
 plugins_loader
 --------------
 
-.. automodule:: gordon_janitor.plugins_loader
+.. automodule:: gordon.plugins_loader
 
-.. autofunction:: gordon_janitor.plugins_loader.load_plugins
+.. autofunction:: gordon.plugins_loader.load_plugins

docs/plugins.rst

@@ -1,7 +1,7 @@
 Gordon Janitor's Plugin System
 ==============================
 
-.. automodule:: gordon_janitor.plugins_loader
+.. automodule:: gordon.plugins_loader
     :noindex:
 
 Writing a Plugin

gordon_janitor/__init__.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 __author__ = 'Lynn Root'
-__version__ = '0.0.1.dev4'
+__version__ = '0.0.1.dev5'
 __license__ = 'Apache 2.0'
 __email__ = 'lynn@spotify.com'
 __description__ = 'DNS record reconciliation for Gordon: Event-driven Cloud DNS'

gordon_janitor/main.py

@@ -39,11 +39,14 @@
 import click
 import toml
 import ulogger
+from gordon import plugins_loader
 
 from gordon_janitor import __version__ as version
 from gordon_janitor import exceptions
 from gordon_janitor import interfaces
-from gordon_janitor import plugins_loader
+
+
+plugins_loader.PLUGIN_NAMESPACE = 'gordon_janitor.plugins'
 
 
 def _load_config(root=''):
@@ -161,8 +164,9 @@ def run(config_root):
         'changes_channel': asyncio.Queue(),
     }
 
-    plugin_names, plugins, errors = plugins_loader.load_plugins(config,
-                                                                plugin_kwargs)
+    plugin_names, plugins, errors, plugin_kwargs = plugins_loader.load_plugins(
+        config, plugin_kwargs)
+
     if errors:
         base_msg = 'Plugin was not loaded:'
         _log_or_exit_on_exceptions(base_msg, errors, debug_mode)

requirements.txt

@@ -1,4 +1,5 @@
 click==6.7
+gordon-dns==0.0.1.dev7
 setuptools==38.2.5
 toml==0.9.3.1
 ulogger==1.0.1

tests/unit/conftest.py

@@ -17,6 +17,8 @@
 Module for reusable pytest fixtures.
 """
 
+import os
+
 import pkg_resources
 import pytest
 
@@ -42,60 +44,48 @@ class FakePluginException(Exception):
 
 @pytest.fixture(scope='session')
 def config_file():
-    plugins = '["authority.plugin", "reconciler.plugin", "publisher.plugin"]'
-    return ('[core]\n'
-            f'plugins = {plugins}\n'
-            'debug = true\n'
-            '[core.logging]\n'
-            'level = "debug"\n'
-            'handlers = ["stream"]\n'
-            '[authority]\n'
-            'a_key = "a_value"\n'
-            'b_key = "b_value"\n'
-            '[authority.plugin]\n'
-            'a_key = "another_value"\n'
-            '[reconciler.plugin]\n'
-            'd_key = "d_value"\n'
-            '[publisher.plugin]\n'
-            'e_key = "e_value"')
+    here = os.path.dirname(os.path.realpath(__file__))
+    filepath = os.path.join(here, 'fixtures/test-gordon-janitor.toml')
+    with open(filepath, 'r') as f:
+        return f.read()
 
 
 @pytest.fixture
 def loaded_config():
     return {
         'core': {
             'plugins': [
-                'authority.plugin', 'reconciler.plugin', 'publisher.plugin'],
+                'xyz.authority',
+                'xyz.reconciler',
+                'xyz.publisher'],
             'debug': True,
             'logging': {
                 'level': 'debug',
                 'handlers': ['stream'],
+                'format': '%(created)f %(levelno)d %(message)s',
+                'date_format': '%Y-%m-%dT%H:%M:%S',
             }
         },
-        'authority': {
+        'xyz': {
             'a_key': 'a_value',
             'b_key': 'b_value',
-            'plugin': {
+            'authority': {
                 'a_key': 'another_value',
             },
-        },
-        'reconciler': {
-            'plugin': {
+            'reconciler': {
                 'd_key': 'd_value',
             },
-        },
-        'publisher': {
-            'plugin': {
-                'e_key': 'e_value',
-            },
-        },
+            'publisher': {
+                'c_key': 'c_value',
+            }
+        }
     }
 
 
 @pytest.fixture
 def plugins(mocker):
     plugins = {}
-    names = ['authority.plugin', 'reconciler.plugin', 'publisher.plugin']
+    names = ['xyz.authority', 'xyz.reconciler', 'xyz.publisher']
     for name in names:
         plugin_mock = mocker.MagicMock(pkg_resources.EntryPoint, autospec=True)
         plugin_mock.name = name