Assign predator bug component id even when missing suspected components (#5065)

Recently, a possible issue in predator was making testcases miss the
`suspected_components` field in predator result, even though the correct
`suspected_buganizer_component_id` was set. However, the logic in
cleanup was preventing the bugs to be assigned with this component ID.
This PR fixes by allowing this case.

Context: b/464899796

---------

Co-authored-by: Titouan Rigoudy <[email protected]>

Author: ViniciustCosta

src/clusterfuzz/_internal/cron/cleanup.py

@@ -1100,6 +1100,14 @@ def update_fuzz_blocker_label(policy, testcase, issue,
   issue.save(new_comment=update_message, notify=True)
 
 
+def _should_update_component_id(issue, component_id):
+  """Check whether updating the issue component id is needed."""
+  if not hasattr(issue, 'component_id'):
+    return False
+
+  return component_id and issue.component_id != component_id
+
+
 def update_component_labels_and_id(policy, testcase, issue):
   """Add components to the issue if needed."""
   if not issue:
@@ -1132,9 +1140,10 @@ def update_component_labels_and_id(policy, testcase, issue):
     if not found_component_in_issue:
       filtered_components.append(component)
 
-  if not filtered_components:
-    # If there are no new components to add, then we shouldn't make any changes
-    # to issue.
+  if not (filtered_components or
+          _should_update_component_id(issue, component_id)):
+    # If there are no new components to add and neither a component ID to
+    # update, then we shouldn't make any changes to issue.
     return
 
   # Don't run on issues we've already applied automatic components to in case

src/clusterfuzz/_internal/tests/appengine/handlers/cron/cleanup_test.py

@@ -1450,22 +1450,66 @@ def test_components_added(self):
     self.assertIn('Test-Predator-Auto-Components', self.issue.labels)
 
   def test_component_id_added(self):
-    """Ensure that we a component_id when applicable."""
+    """Ensure that we set a component_id when applicable."""
     self.testcase.set_metadata(
         'predator_result', {
             'result': {
                 'suspected_components': ['A', 'B>C'],
-                'suspected_buganizer_component_id': 123456,
+                'suspected_buganizer_component_id': '123456',
             }
         })
 
     cleanup.update_component_labels_and_id(self.policy, self.testcase,
                                            self.issue)
     self.assertIn('A', self.issue.components)
     self.assertIn('B>C', self.issue.components)
-    self.assertEqual(123456, self.issue.component_id)
+    self.assertEqual('123456', self.issue.component_id)
     self.assertIn('Test-Predator-Auto-Components', self.issue.labels)
 
+  def test_component_id_without_suspected_components(self):
+    """Ensure we set a component_id even when missing suspected components."""
+    self.testcase.set_metadata(
+        'predator_result',
+        {'result': {
+            'suspected_buganizer_component_id': '123456'
+        }})
+
+    cleanup.update_component_labels_and_id(self.policy, self.testcase,
+                                           self.issue)
+    self.assertEqual('123456', self.issue.component_id)
+    self.assertIn('Test-Predator-Auto-Components', self.issue.labels)
+
+  def test_component_id_changed(self):
+    """Ensure we update the component_id if it has changed."""
+    self.testcase.set_metadata(
+        'predator_result',
+        {'result': {
+            'suspected_buganizer_component_id': '111111'
+        }})
+    setattr(self.issue, 'component_id', '123456')
+    cleanup.update_component_labels_and_id(self.policy, self.testcase,
+                                           self.issue)
+    self.assertEqual('111111', self.issue.component_id)
+    self.assertIn('Test-Predator-Auto-Components', self.issue.labels)
+
+  def test_component_id_already_set(self):
+    """Ensure we do not make an API call if the component ID has not changed."""
+    helpers.patch(
+        self,
+        ['clusterfuzz._internal.issue_management.monorail.issue.Issue.save'])
+    self.testcase.set_metadata(
+        'predator_result',
+        {'result': {
+            'suspected_buganizer_component_id': '123456'
+        }})
+    setattr(self.issue, 'component_id', '123456')
+
+    cleanup.update_component_labels_and_id(self.policy, self.testcase,
+                                           self.issue)
+    self.assertNotIn('Test-Predator-Auto-Components', self.issue.labels)
+    self.assertEqual('123456', self.issue.component_id)
+    self.mock.save.assert_not_called()
+
   def test_components_not_reapplied(self):
     """Ensure that we don't re-add components once applied."""
     self.testcase.set_metadata(