add --rules option

Author: gravitypriest

etc/redhat-access-insights.spec

@@ -4,7 +4,7 @@
 Name:                   redhat-access-insights
 Summary:                Uploads Insights information to Red Hat on a periodic basis
 Version:                1.0.8
-Release:                0%{?dist}
+Release:                1%{?dist}
 Source0:                https://github.com/redhataccess/insights-client/archive/redhat-access-insights-%{version}.tar.gz
 Epoch:                  0
 License:                GPLv2+

redhat_access_insights/__init__.py

@@ -176,7 +176,7 @@ def collect_data_and_upload(config, options, rc=0):
     except LookupError:
         branch_info = handle_branch_info_error(
             "Could not determine branch information", options)
-    pc = InsightsConfig(config, pconn)
+    pc = InsightsConfig(config, pconn, custom_rules=options.rules)
     archive = InsightsArchive(compressor=options.compressor)
     dc = DataCollector(archive)
 
@@ -186,7 +186,7 @@ def collect_data_and_upload(config, options, rc=0):
     stdin_config = json.load(sys.stdin) if options.from_stdin else {}
 
     start = time.clock()
-    collection_rules, rm_conf = pc.get_conf(options.update, stdin_config)
+    collection_rules, rm_conf = pc.get_conf(options.update, stdin_config=stdin_config)
     elapsed = (time.clock() - start)
     logger.debug("Collection Rules Elapsed Time: %s", elapsed)
 
@@ -359,6 +359,10 @@ def set_up_options(parser):
                       help="Pass a custom config file",
                       dest="conf",
                       default=constants.default_conf_file)
+    parser.add_option('-r', '--rules',
+                      help="Pass a custom rules json file",
+                      dest="rules",
+                      default=None)
     parser.add_option('--to-stdout',
                       help='print archive to stdout; '
                            'sets --silent and --no-upload',

redhat_access_insights/collection_rules.py

@@ -20,13 +20,14 @@ class InsightsConfig(object):
     Insights configuration
     """
 
-    def __init__(self, config, conn):
+    def __init__(self, config, conn, custom_rules=None):
         """
         Load config from parent
         """
         self.fallback_file = constants.collection_fallback_file
         self.remove_file = constants.collection_remove_file
         self.collection_rules_file = constants.collection_rules_file
+        self.custom_rules = custom_rules
         protocol = "https://"
         insecure_connection = config.getboolean(APP_NAME, "insecure_connection")
         if insecure_connection:
@@ -181,6 +182,14 @@ def get_conf(self, update, stdin_config=None):
             else:
                 logger.error("Unable to validate GPG signature in from_stdin mode.")
                 raise Exception("from_stdin mode failed to validate GPG sig")
+        elif self.custom_rules:
+            logger.debug('Using custom rules file...')
+            if os.path.isfile(self.custom_rules):
+                with open(self.custom_rules) as rule_json:
+                    return json.load(rule_json), rm_conf
+            else:
+                logger.error('File %s does not exist' % self.custom_rules)
+                sys.exit(1)
         elif update:
             dyn_conf = self.get_collection_rules()
             version = dyn_conf.get('version', None)