Merge Android ignore pattern into a single (#2440)

This wasn't working as intended as multiple https://xkcd.com/1171/
google · Aug 1, 2024 · d66c268 · d66c268
1 parent 111b6cf
commit d66c268
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/docker/importer/importer_test.py b/docker/importer/importer_test.py
@@ -386,6 +386,12 @@ def test_ignore(self, mock_publish):  # pylint: disable=unused-argument
         ignore_patterns=['(^(?!USN-).*$)'])
     self.assertTrue(
         source_repo_ignore_negative.ignore_file('/tmp/foo/CVE-2024-1234.json'))
+    source_repo_ignore_multiple = osv.SourceRepository(
+        ignore_patterns=['^(?!MAL-).*$', 'MAL-0000.*'])
+    self.assertTrue(
+        source_repo_ignore_multiple.ignore_file('/tmp/foo/CVE-2024-1234.json'))
+    self.assertTrue(
+        source_repo_ignore_multiple.ignore_file('/tmp/foo/MAL-0000-0001.json'))
 
 
 @mock.patch('importer.utcnow', lambda: datetime.datetime(2021, 1, 1))

diff --git a/source_test.yaml b/source_test.yaml
@@ -44,7 +44,7 @@
 - name: 'android'
   versions_from_repo: False
   type: 1
-  ignore_patterns: ['^(?!A-).*$', '^(?!ASB-A-).*$', '^(?!PUB-ASB-A-).*$']
+  ignore_patterns: ['^(?!(PUB-)?ASB-A-).*$']
   detect_cherrypicks: False
   extension: '.json'
   bucket: 'android-osv-test'