|
 |
dd2c9c |
From 663ae08a2374df76e93d007551fa5e143425d064 Mon Sep 17 00:00:00 2001
|
|
|
dd2c9c |
From: Rob Crittenden <rcritten@redhat.com>
|
|
|
dd2c9c |
Date: Thu, 28 Apr 2022 08:33:35 -0400
|
|
|
dd2c9c |
Subject: Validate that a known output-type has been selected
|
|
|
dd2c9c |
|
|
|
dd2c9c |
A user may pass an unknown value in via the configuration file.
|
|
|
dd2c9c |
|
|
|
dd2c9c |
https://bugzilla.redhat.com/show_bug.cgi?id=2079698
|
|
|
dd2c9c |
|
|
|
dd2c9c |
Signed-off-by: Rob Crittenden <rcritten@redhat.com>
|
|
|
dd2c9c |
---
|
|
|
dd2c9c |
src/ipahealthcheck/core/constants.py | 2 --
|
|
|
dd2c9c |
src/ipahealthcheck/core/core.py | 5 ++++-
|
|
|
dd2c9c |
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
dd2c9c |
|
|
|
dd2c9c |
diff --git a/src/ipahealthcheck/core/constants.py b/src/ipahealthcheck/core/constants.py
|
|
|
dd2c9c |
index b6ee029..806bd46 100644
|
|
|
dd2c9c |
--- a/src/ipahealthcheck/core/constants.py
|
|
|
dd2c9c |
+++ b/src/ipahealthcheck/core/constants.py
|
|
|
dd2c9c |
@@ -2,8 +2,6 @@
|
|
|
dd2c9c |
# Copyright (C) 2019 FreeIPA Contributors see COPYING for license
|
|
|
dd2c9c |
#
|
|
|
dd2c9c |
|
|
|
dd2c9c |
-DEFAULT_OUTPUT = 'json'
|
|
|
dd2c9c |
-
|
|
|
dd2c9c |
# Error reporting result
|
|
|
dd2c9c |
SUCCESS = 0
|
|
|
dd2c9c |
WARNING = 10
|
|
|
dd2c9c |
diff --git a/src/ipahealthcheck/core/core.py b/src/ipahealthcheck/core/core.py
|
|
|
dd2c9c |
index 092bab9..84aa8a4 100644
|
|
|
dd2c9c |
--- a/src/ipahealthcheck/core/core.py
|
|
|
dd2c9c |
+++ b/src/ipahealthcheck/core/core.py
|
|
|
dd2c9c |
@@ -256,7 +256,7 @@ class RunChecks:
|
|
|
dd2c9c |
def run_healthcheck(self):
|
|
|
dd2c9c |
framework = object()
|
|
|
dd2c9c |
plugins = []
|
|
|
dd2c9c |
- output = constants.DEFAULT_OUTPUT
|
|
|
dd2c9c |
+ output = None
|
|
|
dd2c9c |
|
|
|
dd2c9c |
logger.setLevel(logging.WARNING)
|
|
|
dd2c9c |
|
|
|
dd2c9c |
@@ -334,6 +334,9 @@ class RunChecks:
|
|
|
dd2c9c |
if out.__name__.lower() == options.output_type:
|
|
|
dd2c9c |
output = out(options)
|
|
|
dd2c9c |
break
|
|
|
dd2c9c |
+ if output is None:
|
|
|
dd2c9c |
+ print(f"Unknown output-type '{options.output_type}'")
|
|
|
dd2c9c |
+ return 1
|
|
|
dd2c9c |
|
|
|
dd2c9c |
if options.list_sources:
|
|
|
dd2c9c |
return list_sources(plugins)
|
|
|
dd2c9c |
--
|
|
|
dd2c9c |
2.31.1
|
|
|
dd2c9c |
|