[FIX] intelmqsetup correct bot-module names & BOT_FILE removed in test_conf

Signed-off-by: Sebastian Waldbauer <[email protected]>

Author: waldbauer-certat

intelmq/bin/intelmqsetup.py

@@ -120,13 +120,6 @@ def intelmqsetup_core(ownership=True, state_file=STATE_FILE_PATH):
         if ownership:
             change_owner(destination_file, owner='intelmq', group='intelmq', log=log_ownership_change)
 
-    if Path(BOTS_FILE).is_symlink():
-        print('Skip writing BOTS file as it is a link.')
-    else:
-        print('Writing BOTS file.')
-        shutil.copy(pkg_resources.resource_filename('intelmq', 'bots/BOTS'),
-                    BOTS_FILE)
-
     if ownership:
         print('Setting intelmq as owner for it\'s directories.')
         for obj in (CONFIG_DIR, DEFAULT_LOGGING_PATH, ROOT_DIR, VAR_RUN_PATH,

intelmq/lib/upgrades.py

@@ -608,7 +608,7 @@ def v300_bots_file_removal(defaults, runtime, harmonization, dry_run):
     ((2, 2, 1), (v221_feed_changes, )),
     ((2, 2, 2), (v222_feed_changes, )),
     ((2, 2, 3), ()),
-    ((2, 3, 0), (v230_csv_parser_parameter_fix_1, v230_feed_changes, v230_deprecations,)),
+    ((2, 3, 0), (v230_csv_parser_parameter_fix, v230_feed_changes, v230_deprecations,)),
     ((3, 0, 0), (v300_bots_file_removal, ))
 ])
 

intelmq/tests/test_conf.py

@@ -98,51 +98,6 @@ def test_runtime_syntax(self):
         interpreted = json.loads(fcontent)
         self.assertEqual(to_json(interpreted), fcontent)
 
-    def test_bots(self):
-        """ Test if BOTS has correct syntax and consistent content. """
-        with open(pkg_resources.resource_filename('intelmq',
-                                                  'bots/BOTS')) as fhandle:
-            fcontent = fhandle.read()
-
-        interpreted = json.loads(fcontent,
-                                 object_pairs_hook=collections.OrderedDict)
-        self.assertEqual(to_unsorted_json(interpreted), fcontent)
-
-        for groupname, group in interpreted.items():
-            for bot_name, bot_config in group.items():
-                for field in ['description', 'module', 'parameters']:
-                    self.assertIn(field, bot_config)
-                importlib.import_module(bot_config['module'])
-
-    def test_modules_in_bots(self):
-        """ Test if all bot modules are mentioned BOTS file. """
-        with open(pkg_resources.resource_filename('intelmq',
-                                                  'bots/BOTS')) as fhandle:
-            fcontent = fhandle.read()
-
-        interpreted = json.loads(fcontent,
-                                 object_pairs_hook=collections.OrderedDict)
-        modules = set()
-
-        for groupname, group in interpreted.items():
-            for bot_name, bot_config in group.items():
-                modules.add(bot_config['module'])
-
-        for _, groupname, _ in pkgutil.iter_modules(path=intelmq.bots.__path__):
-            group = importlib.import_module('intelmq.bots.%s' % groupname)
-            for _, providername, _ in pkgutil.iter_modules(path=group.__path__):
-                modulename = 'intelmq.bots.%s.%s' % (groupname, providername)
-                provider = importlib.import_module(modulename)
-                for _, botname, _ in pkgutil.iter_modules(path=provider.__path__):
-                    classname = 'intelmq.bots.%s.%s.%s' % (groupname, providername, botname)
-                    self.assertFalse(classname not in modules and '_' in botname,
-                                    msg="Bot %r not found in BOTS file." % classname)
-
-        for module in modules:
-            bot = importlib.import_module(module)
-            self.assertTrue(hasattr(bot, 'BOT'),
-                            msg='Module %r has no variable BOT.' % module)
-
 
 class CerberusTests(unittest.TestCase):
 

setup.py

@@ -24,6 +24,7 @@
 base_path = Path(__file__).parent / 'intelmq/bots'
 botfiles = [botfile for botfile in Path(base_path).glob('**/*.py') if botfile.is_file() and not botfile.name.startswith('_')]
 for file in botfiles:
+    file = Path(str(file).replace(str(base_path), 'intelmq/bots'))
     module = '.'.join(file.with_suffix('').parts)
     BOTS.append('{0} = {0}:BOT.run'.format(module))