DEP: rt collector: removed parameter unzip_attachment

compatibility with the deprecated parameter `unzip_attachment` (removed in 2.1.0) was removed. #1404
certtools · Jun 21, 2021 · 4d5fe4f · 4d5fe4f
1 parent 6a65451
commit 4d5fe4f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -73,6 +73,8 @@ Update allowed classification fields to 2020-01-28 version (#1409, #1476).
 - `intelmq.bots.collectors.api.collector_api` (PR#1987 by Mikk Margus Möll, fixes #1986):
   - Added UNIX socket capability.
   - Correctly close the IOLoop in the shutdown method to fix reload.
+- `intelmq.bots.collectors.rt.collector_rt` (PR#1997 by Sebastian Wagner, #1404):
+  - compatibility with the deprecated parameter `unzip_attachment` (removed in 2.1.0) was removed.
 
 #### Parsers
 - Added `intelmq.bots.parsers.fireeye`: A bot that parses hashes and URLs from Fireeye MAS indicators (PR#1745 by Christopher Schappelwein).

diff --git a/NEWS.md b/NEWS.md
@@ -92,6 +92,7 @@ The `runtime.conf` file was replaced by a `runtime.yaml` file. IntelMQ moves the
 #### Removal of deprecated bots and behaviour
 - The bot `intelmq.bots.experts.ripencc_abuse_contact.expert` has been removed. It was replaced by `intelmq.bots.experts.ripe.expert` and marked as deprecated in 2.0.0.beta1.
 - Modify expert: Compatibility with the deprecated configuration format (before 1.0.0.dev7) was removed.
+- RT collector: compatibility with the deprecated parameter `unzip_attachment` (removed in 2.1.0) was removed.
 
 
 ### Libraries

diff --git a/intelmq/bots/collectors/rt/collector_rt.py b/intelmq/bots/collectors/rt/collector_rt.py
@@ -71,18 +71,6 @@ def init(self):
         self._parse_extract_file_parameter('extract_attachment')
         self._parse_extract_file_parameter('extract_download')
 
-        if hasattr(self, 'unzip_attachment'):
-            self.logger.warning("The parameter 'unzip_attachment' is deprecated and "
-                                "will be removed in version 3.0 in favor of the "
-                                "more generic and powerful 'extract_attachment'. "
-                                "Look at the Bots documentation for more details.")
-            if not self.extract_attachment:
-                self.extract_attachment = self.unzip_attachment
-            else:
-                self.logger.warn("Both 'extract_attachment' and the deprecated "
-                                 "'unzip_attachment' parameter are in use. Ignoring "
-                                 "the latter one.")
-
     def process(self):
         RT = rt.Rt(self.uri, self.user,
                    self.password)

diff --git a/intelmq/tests/bots/collectors/rt/test_collector.py b/intelmq/tests/bots/collectors/rt/test_collector.py
@@ -62,7 +62,6 @@ def set_bot(cls):
                          'search_status': 'new',
                          'attachment_regex': '.*.zip',
                          'url_regex': None,
-                         'unzip_attachment': True,
                          'name': 'Example feed',
                          'extract_attachment': True,
                          }
@@ -73,7 +72,6 @@ def test_attachment_zip(self):
         """
         Test a zipped attachment
         """
-        self.allowed_warning_count = 2
         self.run_bot(iterations=1)
         self.assertMessageEqual(0, REPORT)
 
@@ -83,7 +81,6 @@ def test_attachment_gz(self):
         """
         Test a gzipped attachment
         """
-        self.allowed_warning_count = 2
         self.prepare_bot(parameters={'attachment_regex': r'.*\.gz'})
         self.run_bot(iterations=1, prepare=False)
         self.assertMessageEqual(0, REPORT)
@@ -94,7 +91,6 @@ def test_url_zip(self):
         """
         Test a zipped URL
         """
-        self.allowed_warning_count = 2
         self.prepare_bot(parameters={'attachment_regex': None,
                                      'url_regex': r'http://localhost/.*\.zip',
                                      'extract_download': True})