Remove unused ReleaseBlock custom field handling.

Author: letitz

src/clusterfuzz/_internal/issue_management/google_issue_tracker/issue_tracker.py

@@ -38,7 +38,6 @@
 # These custom fields use repeated enums.
 _CHROMIUM_OS_CUSTOM_FIELD_ID = '1223084'
 _CHROMIUM_COMPONENT_TAGS_CUSTOM_FIELD_ID = '1222907'
-_CHROMIUM_RELEASE_BLOCK_CUSTOM_FIELD_ID = '1223086'
 
 _OSS_FUZZ_REPORTED_CUSTOM_FIELD_ID = '1349561'
 _OSS_FUZZ_PROJECT_CUSTOM_FIELD_ID = '1349507'
@@ -483,17 +482,6 @@ def _os_custom_field_values(self) -> List[str]:
           return enum_values.get('values') or []
     return []
 
-  @property
-  def _releaseblock_custom_field_values(self):
-    """ReleaseBlock custom field values."""
-    custom_fields = self._data['issueState'].get('customFields', [])
-    for cf in custom_fields:
-      if cf.get('customFieldId') == _CHROMIUM_RELEASE_BLOCK_CUSTOM_FIELD_ID:
-        enum_values = cf.get('repeatedEnumValue')
-        if enum_values:
-          return enum_values.get('values') or []
-    return []
-
   @property
   def _foundin_versions(self):
     """FoundIn versions."""
@@ -612,21 +600,6 @@ def _update_issue(self, new_comment=None, notify=True):
     # hotlist IDs.
     self.labels.remove_by_prefix('OS-')
 
-    # Special case ReleaseBlock custom field.
-    added_releaseblocks = _get_labels(self.labels.added, 'ReleaseBlock-')
-    if added_releaseblocks:
-      releaseblocks = self._releaseblock_custom_field_values
-      releaseblocks.extend(added_releaseblocks)
-      custom_field_entries.append({
-          'customFieldId': _CHROMIUM_RELEASE_BLOCK_CUSTOM_FIELD_ID,
-          'repeatedEnumValue': {
-              'values': releaseblocks,
-          }
-      })
-    # Remove all ReleaseBlock labels or they will be attempted to be added as
-    # hotlist IDs.
-    self.labels.remove_by_prefix('ReleaseBlock-')
-
     # Special case: OSS-Fuzz "Reported" custom field.
     added_reported = _get_oss_fuzz_reported_value(self.labels)
     if added_reported:
@@ -765,14 +738,6 @@ def save(self, new_comment=None, notify=True, skip_emails=[]):  # pylint: disabl
                 'values': oses,
             },
         })
-      releaseblocks = _extract_all_labels(self.labels, 'ReleaseBlock-')
-      if releaseblocks:
-        custom_field_entries.append({
-            'customFieldId': _CHROMIUM_RELEASE_BLOCK_CUSTOM_FIELD_ID,
-            'repeatedEnumValue': {
-                'values': releaseblocks
-            },
-        })
 
       # Special case: OSS-Fuzz "Reported" custom field.
       added_reported = _get_oss_fuzz_reported_value(self.labels)

src/clusterfuzz/_internal/tests/appengine/libs/issue_management/google_issue_tracker/google_issue_tracker_test.py

@@ -314,78 +314,6 @@ def test_new_issue_with_limit_view_label(self):
         mock.call().execute(http=None, num_retries=3),
     ])
 
-  def test_new_issue_with_os_foundin_releaseblock_labels(self):
-    """Test new issue creation with os, foundin, releaseblock labels."""
-    issue = self.issue_tracker.new_issue()
-    issue.reporter = '[email protected]'
-    issue.assignee = '[email protected]'
-    issue.body = 'issue body'
-    issue.ccs.add('[email protected]')
-    issue.labels.add('12345')
-    issue.labels.add('OS-Linux')
-    issue.labels.add('OS-Android')
-    issue.labels.add('FoundIn-123')
-    issue.labels.add('FoundIn-789')
-    issue.labels.add('ReleaseBlock-Dev')
-    issue.labels.add('ReleaseBlock-Beta')
-    issue.status = 'ASSIGNED'
-    issue.title = 'issue title'
-    issue.save()
-    self.client.issues().create.assert_has_calls([
-        mock.call(
-            body={
-                'issueState': {
-                    'componentId':
-                        1337,
-                    'ccs': [{
-                        'emailAddress': '[email protected]'
-                    }],
-                    'collaborators': [],
-                    'hotlistIds': [12345],
-                    'accessLimit': {
-                        'accessLevel': issue_tracker.IssueAccessLevel.LIMIT_NONE
-                    },
-                    'reporter': {
-                        'emailAddress': '[email protected]'
-                    },
-                    'assignee': {
-                        'emailAddress': '[email protected]'
-                    },
-                    'status':
-                        'ASSIGNED',
-                    'title':
-                        'issue title',
-                    'type':
-                        'BUG',
-                    'customFields': [
-                        {
-                            'customFieldId': '1223084',
-                            'repeatedEnumValue': {
-                                'values': ['Android', 'Linux']
-                            }
-                        },
-                        {
-                            'customFieldId': '1223086',
-                            'repeatedEnumValue': {
-                                'values': ['Dev', 'Beta']
-                            }
-                        },
-                    ],
-                    'foundInVersions': ['123', '789'],
-                    'severity':
-                        'S4',
-                    'priority':
-                        'P4',
-                },
-                'issueComment': {
-                    'comment': 'issue body'
-                },
-            },
-            templateOptions_applyTemplate=True,
-        ),
-        mock.call().execute(http=None, num_retries=3),
-    ])
-
   def test_new_issue_with_empty_os_label(self):
     """Test new issue creation with "empty" OS label."""
     issue = self.issue_tracker.new_issue()
@@ -653,123 +581,6 @@ def test_update_issue(self):
         mock.call().execute(http=None, num_retries=3),
     ])
 
-  def test_update_issue_with_os_foundin_releaseblock_labels(self):
-    """Test updating an existing issue with OS and FoundIn labels."""
-    self.client.issues().get().execute.return_value = {
-        'issueId': '68828938',
-        'issueState': {
-            'componentId':
-                '29002',
-            'type':
-                'BUG',
-            'customFields': [
-                {
-                    'customFieldId': '1223084',
-                    'repeatedEnumValue': {
-                        'values': ['Linux']  # Existing OS-Linux.
-                    },
-                },
-                {
-                    'customFieldId': '1223086',
-                    'repeatedEnumValue': {
-                        'values': ['Dev']  # Existing ReleaseBlock-Dev.
-                    },
-                },
-            ],
-            'status':
-                'NEW',
-            'priority':
-                'P2',
-            'severity':
-                'S2',
-            'title':
-                'test',
-            'reporter': {
-                'emailAddress': '[email protected]',
-                'userGaiaStatus': 'ACTIVE'
-            },
-            'assignee': {
-                'emailAddress': '[email protected]',
-                'userGaiaStatus': 'ACTIVE'
-            },
-            'retention':
-                'COMPONENT_DEFAULT',
-            'foundInVersions': ['123'],  # Existing FoundIn-123.
-        },
-        'createdTime': '2019-06-25T01:29:30.021Z',
-        'modifiedTime': '2019-06-25T01:29:30.021Z',
-        'userData': {},
-        'accessLimit': {
-            'accessLevel': 'INTERNAL'
-        },
-        'etag': 'TmpnNE1qZzVNemd0TUMweA==',
-        'lastModifier': {
-            'emailAddress': '[email protected]',
-            'userGaiaStatus': 'ACTIVE'
-        },
-    }
-    issue = self.issue_tracker.get_issue(68828938)
-    issue.reporter = '[email protected]'
-    issue.assignee = '[email protected]'
-    issue.ccs.add('[email protected]')
-    issue.labels.add('12345')
-    issue.status = 'ASSIGNED'
-    issue.title = 'issue title2'
-    # Adding OS Android here (in addition to the Linux already set).
-    issue.labels.add('OS-Android')
-    # Adding FoundIn 789 here (in addition to the 123 already set).
-    issue.labels.add('FoundIn-789')
-    # Adding ReleaseBlock Beta and Stable (in addition to Dev already set).
-    issue.labels.add('ReleaseBlock-Beta')
-    issue.labels.add('ReleaseBlock-Stable')
-    issue.save()
-
-    self.client.issues().modify.assert_has_calls([
-        mock.call(
-            issueId='68828938',
-            body={
-                'add': {
-                    'status':
-                        'ASSIGNED',
-                    'assignee': {
-                        'emailAddress': '[email protected]'
-                    },
-                    'reporter': {
-                        'emailAddress': '[email protected]'
-                    },
-                    'title':
-                        'issue title2',
-                    'ccs': [{
-                        'emailAddress': '[email protected]'
-                    }],
-                    'customFields': [
-                        {
-                            'customFieldId': '1223084',
-                            'repeatedEnumValue': {
-                                'values': ['Android', 'Linux']
-                            }
-                        },
-                        {
-                            'customFieldId': '1223086',
-                            'repeatedEnumValue': {
-                                'values': ['Dev', 'Beta', 'Stable']
-                            }
-                        },
-                    ],
-                    'foundInVersions': ['123', '789'],
-                },
-                'addMask':
-                    'status,assignee,reporter,title,ccs,customFields,foundInVersions',
-                'remove': {},
-                'removeMask':
-                    '',
-                'significanceOverride':
-                    'MAJOR',
-            },
-        ),
-        mock.call().execute(http=None, num_retries=3),
-    ])
-
   def test_update_issue_with_empty_os(self):
     """Test updating an existing issue with an "empty" OS label."""
     self.client.issues().get().execute.return_value = {