From eb87d277442dd1a1076ba9ae74c18ace8cc7dda8 Mon Sep 17 00:00:00 2001

From: Rob Crittenden <rcritten@redhat.com>

Date: Mon, 11 Nov 2019 10:29:53 -0500

Subject: [PATCH 2/5] Move main to run_healthcheck for abstraction purposes

Take as arguments the entry point name and the configuration

file.

---

 src/ipahealthcheck/core/config.py |  4 ++--

 src/ipahealthcheck/core/main.py   | 37 +++++++++++++++++--------------

 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/ipahealthcheck/core/config.py b/src/ipahealthcheck/core/config.py

index 46da507..0cb72b7 100644

--- a/src/ipahealthcheck/core/config.py

+++ b/src/ipahealthcheck/core/config.py

@@ -5,7 +5,7 @@

 import logging

 from configparser import ConfigParser, ParsingError

-from ipahealthcheck.core.constants import CONFIG_FILE, CONFIG_SECTION

+from ipahealthcheck.core.constants import CONFIG_SECTION

 from ipahealthcheck.core.constants import DEFAULT_CONFIG

 logger = logging.getLogger()

@@ -70,7 +70,7 @@ class Config:

             self.__d[key] = d[key]

-def read_config(config_file=CONFIG_FILE):

+def read_config(config_file):

     """

     Simple configuration file reader

diff --git a/src/ipahealthcheck/core/main.py b/src/ipahealthcheck/core/main.py

index b3fbe6a..f59a8a8 100644

--- a/src/ipahealthcheck/core/main.py

+++ b/src/ipahealthcheck/core/main.py

@@ -28,11 +28,14 @@ else:

     from ipahealthcheck.meta.services import ServiceCheck

-def find_registries():

-    return {

-        ep.name: ep.resolve()

-        for ep in pkg_resources.iter_entry_points('ipahealthcheck.registry')

-    }

+def find_registries(entry_points):

+    registries = {}

+    for entry_point in entry_points:

+        registries.update({

+            ep.name: ep.resolve()

+            for ep in pkg_resources.iter_entry_points(entry_point)

+        })

+    return registries

 def find_plugins(name, registry):

@@ -194,9 +197,7 @@ def limit_results(results, source, check):

     return new_results

-def main():

-    environ["KRB5_CLIENT_KTNAME"] = "/etc/krb5.keytab"

-    environ["KRB5CCNAME"] = "MEMORY:"

+def run_healthcheck(entry_points, configfile):

     framework = object()

     plugins = []

     output = constants.DEFAULT_OUTPUT

@@ -208,17 +209,11 @@ def main():

     if options.debug:

         logger.setLevel(logging.DEBUG)

-    config = read_config()

+    config = read_config(configfile)

     if config is None:

         sys.exit(1)

-    if not (

-        options.source or options.list_sources

-    ) and not is_ipa_configured():

-        logging.error("IPA is not configured on this system.")

-        sys.exit(1)

-

-    for name, registry in find_registries().items():

+    for name, registry in find_registries(entry_points).items():

         try:

             registry.initialize(framework)

         except Exception as e:

@@ -283,4 +278,12 @@ def main():

             return_value = 1

             break

-    sys.exit(return_value)

+    return return_value

+

+

+def main():

+    environ["KRB5_CLIENT_KTNAME"] = "/etc/krb5.keytab"

+    environ["KRB5CCNAME"] = "MEMORY:"

+

+    sys.exit(run_healthcheck(['ipahealthcheck.registry'],

+                             constants.CONFIG_FILE))

-- 

2.20.1