Do not try to remove password plugin reported secrets even if other plugins report that same line, change PotentialSecret .type back to a single string

Author: KevinHock

detect_secrets/core/potential_secret.py

@@ -23,10 +23,10 @@ def __init__(
         is_secret=None,
     ):
         """
-        :type typ: list(str)
+        :type typ: str
         :param typ: human-readable secret types, defined by the plugins
                     that generated this PotentialSecret.
-                    e.g. ["High Entropy String"]
+                    e.g. "High Entropy String"
 
         :type filename: str
         :param filename: name of file that this secret was found
@@ -41,7 +41,7 @@ def __init__(
         :type is_secret: bool|None
         :param is_secret: whether or not the secret is a true- or false- positive
         """
-        self.type = [typ]
+        self.type = typ
         self.filename = filename
         self.lineno = lineno
         self.secret_hash = self.hash_secret(secret)

detect_secrets/core/secrets_collection.py

@@ -259,41 +259,11 @@ def _results_accumulator(self, filename):
         if not file_results:
             return
 
-        self._remove_keyword_secrets_if_line_reported_already(
-            file_results,
-        )
-
         if filename not in self.data:
             self.data[filename] = file_results
         else:
             self.data[filename].update(file_results)
 
-    def _remove_keyword_secrets_if_line_reported_already(
-        self,
-        file_results,
-    ):
-        """
-        It is often the case that e.g.
-            SUPER_SECRET_VALUE = 'c3VwZXIgbG9uZyBzdHJ'
-        is reported both by the KeywordDetector and another plugin.
-
-        To minimize diff size, we will simply not report findings from
-        the KeywordDetector if another plugin reports a secret on the
-        same line.
-        """
-        password_secrets = list()
-        line_numbers_of_other_plugins = set()
-
-        for secret in file_results:
-            if secret.type == 'Password':
-                password_secrets.append(secret)
-            else:
-                line_numbers_of_other_plugins.add(secret.lineno)
-
-        for password_secret in password_secrets:
-            if password_secret.lineno in line_numbers_of_other_plugins:
-                del file_results[password_secret]
-
     def _extract_secrets_from_file(self, f, filename):
         """Extract secrets from a given file object.