From ab8457f897b698b49031000ce91470f95b574cde Mon Sep 17 00:00:00 2001 From: Xiangce Liu Date: Fri, 20 Dec 2024 16:08:39 +0800 Subject: [PATCH] fix: do not print collection messages for compliance apiv2 options - RHINENG-14959 - When any compliance apiv2 options is specified nothing will be collected, hence data collection relevant messages should not be printed to console. The rm_conf which includes the file/content redaction is also cleared for compliance apiv2 for this reason. Signed-off-by: Xiangce Liu --- insights/client/client.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/insights/client/client.py b/insights/client/client.py index 4c7a102e2c..74d623e94d 100644 --- a/insights/client/client.py +++ b/insights/client/client.py @@ -326,11 +326,15 @@ def collect(config): pc = InsightsUploadConf(config) dc = CoreCollector(config) - logger.info('Starting to collect Insights data for %s' % determine_hostname(config.display_name)) - - dc.run_collection(pc.get_rm_conf(), - get_branch_info(config), - pc.create_report()) + rm_conf = {} + # Do not print collection relevant messages for compliance apiv2 options + if not (config.compliance_policies or config.compliance_assign or config.compliance_unassign): + rm_conf = pc.get_rm_conf() + logger.info( + 'Starting to collect Insights data for %s' % determine_hostname(config.display_name) + ) + + dc.run_collection(rm_conf, get_branch_info(config), pc.create_report()) return dc.done()