Address review comments

Signed-off-by: Tushar Goel <[email protected]>

Author: TG1999

vulnerabilities/improvers/valid_versions.py

@@ -56,133 +56,6 @@
 
 logger = logging.getLogger(__name__)
 
-APACHE_HTTPD_IGNORABLE_TAGS = {
-    "AGB_BEFORE_AAA_CHANGES",
-    "APACHE_1_2b1",
-    "APACHE_1_2b10",
-    "APACHE_1_2b11",
-    "APACHE_1_2b2",
-    "APACHE_1_2b3",
-    "APACHE_1_2b4",
-    "APACHE_1_2b5",
-    "APACHE_1_2b6",
-    "APACHE_1_2b7",
-    "APACHE_1_2b8",
-    "APACHE_1_2b9",
-    "APACHE_1_3_PRE_NT",
-    "APACHE_1_3a1",
-    "APACHE_1_3b1",
-    "APACHE_1_3b2",
-    "APACHE_1_3b3",
-    "APACHE_1_3b5",
-    "APACHE_1_3b6",
-    "APACHE_1_3b7",
-    "APACHE_2_0_2001_02_09",
-    "APACHE_2_0_52_WROWE_RC1",
-    "APACHE_2_0_ALPHA",
-    "APACHE_2_0_ALPHA_2",
-    "APACHE_2_0_ALPHA_3",
-    "APACHE_2_0_ALPHA_4",
-    "APACHE_2_0_ALPHA_5",
-    "APACHE_2_0_ALPHA_6",
-    "APACHE_2_0_ALPHA_7",
-    "APACHE_2_0_ALPHA_8",
-    "APACHE_2_0_ALPHA_9",
-    "APACHE_2_0_BETA_CANDIDATE_1",
-    "APACHE_BIG_SYMBOL_RENAME_POST",
-    "APACHE_BIG_SYMBOL_RENAME_PRE",
-    "CHANGES",
-    "HTTPD_LDAP_1_0_0",
-    "INITIAL",
-    "MOD_SSL_2_8_3",
-    "PCRE_3_9",
-    "POST_APR_SPLIT",
-    "PRE_APR_CHANGES",
-    "STRIKER_2_0_51_RC1",
-    "STRIKER_2_0_51_RC2",
-    "STRIKER_2_1_0_RC1",
-    "WROWE_2_0_43_PRE1",
-    "apache-1_3-merge-1-post",
-    "apache-1_3-merge-1-pre",
-    "apache-1_3-merge-2-post",
-    "apache-1_3-merge-2-pre",
-    "apache-apr-merge-3",
-    "apache-doc-split-01",
-    "dg_last_1_2_doc_merge",
-    "djg-apache-nspr-07",
-    "djg_nspr_split",
-    "moving_to_httpd_module",
-    "mpm-3",
-    "mpm-merge-1",
-    "mpm-merge-2",
-    "post_ajp_proxy",
-    "pre_ajp_proxy",
-}
-
-GITHUB_IGNORABLE_VERSIONS = frozenset(
-    [
-        "0.1-bulbasaur",
-        "0.1-charmander",
-        "0.3m1",
-        "0.3m2",
-        "0.3m3",
-        "0.3m4",
-        "0.3m5",
-        "0.4m1",
-        "0.4m2",
-        "0.4m3",
-        "0.4m4",
-        "0.4m5",
-        "0.5m1",
-        "0.5m2",
-        "0.5m3",
-        "0.5m4",
-        "0.5m5",
-        "0.6m1",
-        "0.6m2",
-        "0.6m3",
-        "0.6m4",
-        "0.6m5",
-        "0.6m6",
-        "0.7.10p1",
-        "0.7.11p1",
-        "0.7.11p2",
-        "0.7.11p3",
-        "0.8.1p1",
-        "0.8.3p1",
-        "0.8.4p1",
-        "0.8.4p2",
-        "0.8.6p1",
-        "0.8.7p1",
-        "0.9-doduo",
-        "0.9-eevee",
-        "0.9-fearow",
-        "0.9-gyarados",
-        "0.9-horsea",
-        "0.9-ivysaur",
-        "2013-01-21T20:33:09+0100",
-        "2013-01-23T17:11:52+0100",
-        "2013-02-01T20:50:46+0100",
-        "2013-02-02T19:59:03+0100",
-        "2013-02-02T20:23:17+0100",
-        "2013-02-08T17:40:57+0000",
-        "2013-03-27T16:32:26+0100",
-        "2013-05-09T12:47:53+0200",
-        "2013-05-10T17:55:56+0200",
-        "2013-05-14T20:16:05+0200",
-        "2013-06-01T10:32:51+0200",
-        "2013-07-19T09:11:08+0000",
-        "2013-08-12T21:48:56+0200",
-        "2013-09-11T19-27-10",
-        "2013-12-23T17-51-15",
-        "2014-01-12T15-52-10",
-        "2.0.1rc2-git",
-        "3.0.0b3-",
-        "3.0b6dev-r41684",
-        "-class.-jw.util.version.Version-",
-    ]
-)
-
 
 @dataclasses.dataclass(order=True)
 class ValidVersionImprover(Improver):
@@ -430,7 +303,68 @@ def fetch_nginx_version_from_git_tags(self):
 
 class ApacheHTTPDImprover(ValidVersionImprover):
     importer = ApacheHTTPDImporter
-    ignorable_versions = APACHE_HTTPD_IGNORABLE_TAGS
+    ignorable_versions = {
+        "AGB_BEFORE_AAA_CHANGES",
+        "APACHE_1_2b1",
+        "APACHE_1_2b10",
+        "APACHE_1_2b11",
+        "APACHE_1_2b2",
+        "APACHE_1_2b3",
+        "APACHE_1_2b4",
+        "APACHE_1_2b5",
+        "APACHE_1_2b6",
+        "APACHE_1_2b7",
+        "APACHE_1_2b8",
+        "APACHE_1_2b9",
+        "APACHE_1_3_PRE_NT",
+        "APACHE_1_3a1",
+        "APACHE_1_3b1",
+        "APACHE_1_3b2",
+        "APACHE_1_3b3",
+        "APACHE_1_3b5",
+        "APACHE_1_3b6",
+        "APACHE_1_3b7",
+        "APACHE_2_0_2001_02_09",
+        "APACHE_2_0_52_WROWE_RC1",
+        "APACHE_2_0_ALPHA",
+        "APACHE_2_0_ALPHA_2",
+        "APACHE_2_0_ALPHA_3",
+        "APACHE_2_0_ALPHA_4",
+        "APACHE_2_0_ALPHA_5",
+        "APACHE_2_0_ALPHA_6",
+        "APACHE_2_0_ALPHA_7",
+        "APACHE_2_0_ALPHA_8",
+        "APACHE_2_0_ALPHA_9",
+        "APACHE_2_0_BETA_CANDIDATE_1",
+        "APACHE_BIG_SYMBOL_RENAME_POST",
+        "APACHE_BIG_SYMBOL_RENAME_PRE",
+        "CHANGES",
+        "HTTPD_LDAP_1_0_0",
+        "INITIAL",
+        "MOD_SSL_2_8_3",
+        "PCRE_3_9",
+        "POST_APR_SPLIT",
+        "PRE_APR_CHANGES",
+        "STRIKER_2_0_51_RC1",
+        "STRIKER_2_0_51_RC2",
+        "STRIKER_2_1_0_RC1",
+        "WROWE_2_0_43_PRE1",
+        "apache-1_3-merge-1-post",
+        "apache-1_3-merge-1-pre",
+        "apache-1_3-merge-2-post",
+        "apache-1_3-merge-2-pre",
+        "apache-apr-merge-3",
+        "apache-doc-split-01",
+        "dg_last_1_2_doc_merge",
+        "djg-apache-nspr-07",
+        "djg_nspr_split",
+        "moving_to_httpd_module",
+        "mpm-3",
+        "mpm-merge-1",
+        "mpm-merge-2",
+        "post_ajp_proxy",
+        "pre_ajp_proxy",
+    }
 
 
 class ApacheTomcatImprover(ValidVersionImprover):
@@ -455,7 +389,69 @@ class GitLabBasicImprover(ValidVersionImprover):
 
 class GitHubBasicImprover(ValidVersionImprover):
     importer = GitHubAPIImporter
-    ignorable_versions = GITHUB_IGNORABLE_VERSIONS
+    ignorable_versions = frozenset(
+        [
+            "0.1-bulbasaur",
+            "0.1-charmander",
+            "0.3m1",
+            "0.3m2",
+            "0.3m3",
+            "0.3m4",
+            "0.3m5",
+            "0.4m1",
+            "0.4m2",
+            "0.4m3",
+            "0.4m4",
+            "0.4m5",
+            "0.5m1",
+            "0.5m2",
+            "0.5m3",
+            "0.5m4",
+            "0.5m5",
+            "0.6m1",
+            "0.6m2",
+            "0.6m3",
+            "0.6m4",
+            "0.6m5",
+            "0.6m6",
+            "0.7.10p1",
+            "0.7.11p1",
+            "0.7.11p2",
+            "0.7.11p3",
+            "0.8.1p1",
+            "0.8.3p1",
+            "0.8.4p1",
+            "0.8.4p2",
+            "0.8.6p1",
+            "0.8.7p1",
+            "0.9-doduo",
+            "0.9-eevee",
+            "0.9-fearow",
+            "0.9-gyarados",
+            "0.9-horsea",
+            "0.9-ivysaur",
+            "2013-01-21T20:33:09+0100",
+            "2013-01-23T17:11:52+0100",
+            "2013-02-01T20:50:46+0100",
+            "2013-02-02T19:59:03+0100",
+            "2013-02-02T20:23:17+0100",
+            "2013-02-08T17:40:57+0000",
+            "2013-03-27T16:32:26+0100",
+            "2013-05-09T12:47:53+0200",
+            "2013-05-10T17:55:56+0200",
+            "2013-05-14T20:16:05+0200",
+            "2013-06-01T10:32:51+0200",
+            "2013-07-19T09:11:08+0000",
+            "2013-08-12T21:48:56+0200",
+            "2013-09-11T19-27-10",
+            "2013-12-23T17-51-15",
+            "2014-01-12T15-52-10",
+            "2.0.1rc2-git",
+            "3.0.0b3-",
+            "3.0b6dev-r41684",
+            "-class.-jw.util.version.Version-",
+        ]
+    )
 
 
 class NpmImprover(ValidVersionImprover):