admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PRESUBMIT.py: Use input_api.owners_client to check DEPS includes owners.

Browse Source 
Replace input_api.owners_db with input_api.owners_client,
a common interface to check owners using Depot Tools owners
implementation and Gerrit Code-Owners plugin.

Bug: chromium:1175847
No-Presubmit: true
Change-Id: I6f526cdee7676b3fb85bcfacc579f43445e5fb0d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/206140
Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33209}
This commit is contained in:
Edward Lesmes 2021-02-05 14:08:32 -08:00 committed by Commit Bot
parent abf5701c37
commit bef085068b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PRESUBMIT.py
View File

@ -1319,10 +1319,10 @@ def _CalculateAddedDeps(os_path, old_contents, new_contents):
def CheckAddedDepsHaveTargetApprovals(input_api, output_api): def CheckAddedDepsHaveTargetApprovals(input_api, output_api):
"""When a dependency prefixed with + is added to a DEPS file, we """When a dependency prefixed with + is added to a DEPS file, we
want to make sure that the change is reviewed by an OWNER of the want to make sure that the change is reviewed by an OWNER of the
target file or directory, to avoid layering violations from being target file or directory, to avoid layering violations from being
introduced. This check verifies that this happens. introduced. This check verifies that this happens.
""" """
virtual_depended_on_files = set() virtual_depended_on_files = set()
file_filter = lambda f: not input_api.re.match( file_filter = lambda f: not input_api.re.match(
@ -1362,20 +1362,19 @@ def CheckAddedDepsHaveTargetApprovals(input_api, output_api):
else: else:
output = output_api.PresubmitNotifyResult output = output_api.PresubmitNotifyResult
owners_db = input_api.owners_db
owner_email, reviewers = ( owner_email, reviewers = (
input_api.canned_checks.GetCodereviewOwnerAndReviewers( input_api.canned_checks.GetCodereviewOwnerAndReviewers(
input_api, input_api,
owners_db.email_regexp, None,
approval_needed=input_api.is_committing)) approval_needed=input_api.is_committing))
owner_email = owner_email or input_api.change.author_email owner_email = owner_email or input_api.change.author_email
reviewers_plus_owner = set(reviewers) approval_status = input_api.owners_client.GetFilesApprovalStatus(
if owner_email: virtual_depended_on_files, reviewers.union([owner_email]), [])
reviewers_plus_owner.add(owner_email) missing_files = [
missing_files = owners_db.files_not_covered_by(virtual_depended_on_files, f for f in virtual_depended_on_files
reviewers_plus_owner) if approval_status[f] != input_api.owners_client.APPROVED]
# We strip the /DEPS part that was added by # We strip the /DEPS part that was added by
# _FilesToCheckForIncomingDeps to fake a path to a file in a # _FilesToCheckForIncomingDeps to fake a path to a file in a
@ -1398,7 +1397,8 @@ def CheckAddedDepsHaveTargetApprovals(input_api, output_api):
'modified in this CL:\n %s' % 'modified in this CL:\n %s' %
'\n '.join(sorted(unapproved_dependencies))) '\n '.join(sorted(unapproved_dependencies)))
] ]
suggested_owners = owners_db.reviewers_for(missing_files, owner_email) suggested_owners = input_api.owners_client.SuggestOwners(
missing_files, exclude=[owner_email])
output_list.append( output_list.append(
output('Suggested missing target path OWNERS:\n %s' % output('Suggested missing target path OWNERS:\n %s' %
'\n '.join(suggested_owners or []))) '\n '.join(suggested_owners or [])))