673: PR author should be able to use /reviewers command #820

edvbld · 2020-09-14T16:03:01Z

Hi all,

please review this patch that allows pull request author's to issue the /reviewers command (sometimes the PR author knows ahead of time that it is a complicated to PR to review).

Testing:

make test passes on Linux x64
Added one additional unit test

Thanks,
Erik

Progress

Change must not contain extraneous whitespace
Change must be properly reviewed

Issue

SKARA-673: PR author should be able to use /reviewers command

Reviewers

Robin Westberg (@rwestberg - Reviewer)
Kevin Rushforth (@kevinrushforth - no project role)

Download

$ git fetch https://git.openjdk.java.net/skara pull/820/head:pull/820
$ git checkout pull/820

bridgekeeper · 2020-09-14T16:03:12Z

👋 Welcome back ehelin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2020-09-14T16:03:31Z

@edvbld The following label will be automatically applied to this pull request: bots.

When this pull request is ready to be reviewed, an RFR email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label (add|remove) "label" command.

mlbridge · 2020-09-14T16:05:52Z

Webrevs

kevinrushforth · 2020-09-14T16:07:51Z

I presume that the author cannot reduce the number of reviewers once it has been increased, unless they are also a "R"eviewer?

kevinrushforth · 2020-09-14T16:26:07Z

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ReviewersCommand.java

@@ -49,8 +49,8 @@ private void showHelp(PrintWriter reply) {

    @Override
    public void handle(PullRequestBot bot, PullRequest pr, CensusInstance censusInstance, Path scratchPath, CommandInvocation command, List<Comment> allComments, PrintWriter reply) {
-        if (!censusInstance.isReviewer(command.user())) {
-            reply.println("Only [Reviewers](https://openjdk.java.net/bylaws#reviewer) are allowed to change the number of required reviewers.");
+        if (!pr.author().equals(command.user()) && !censusInstance.isReviewer(command.user())) {


This would suggest that my assumption is wrong, and that an author can reduce the number of reviewers required even if they are not a Reviewer. I think this might not be what we want.

I think it is fine to let them increase it.

Agreed. It's the case of an author reducing it after a Reviewer has increased it that I think should be disallowed.

@kevinrushforth and @prrace - I agree, see changes in commit 347594f

rwestberg

Looks good, but you can probably simplify it a bit since the "exclude" parameter isn't really used. :)

rwestberg · 2020-09-15T09:01:57Z

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ReviewersTracker.java

+        return additionalRequiredReviewers(botUser, comments, null);
+    }
+
+    static Optional<AdditionalRequiredReviewers> additionalRequiredReviewers(HostUser botUser, List<Comment> comments, Comment exclude) {


The exclude comment parameter probably isn't the one you are looking for, as the reply marker isn't in the command comment but the reply.

Thanks, fixed in 7b17768

rwestberg · 2020-09-15T09:01:57Z

bots/pr/src/main/java/org/openjdk/skara/bots/pr/CommandInvocation.java


-    CommandInvocation(String id, HostUser user, CommandHandler handler, String name, String args) {
+    CommandInvocation(String id, HostUser user, CommandHandler handler, String name, String args, Comment comment) {


Think you can drop this parameter if you drop the exclude param!

Yep, fixed in 7b17768

kevinrushforth

Looks good with one minor suggestion (feel free to ignore it).

kevinrushforth · 2020-09-15T12:54:48Z

bots/pr/src/main/java/org/openjdk/skara/bots/pr/ReviewersCommand.java

@@ -83,6 +108,21 @@ public void handle(PullRequestBot bot, PullRequest pr, CensusInstance censusInst
            role = roleMappings.get(splitArgs[1].toLowerCase());
        }

+        if (pr.author().equals(command.user()) && !censusInstance.isReviewer(command.user())) {


Maybe simplify this to just ! isReviewer? Including the test for is author doesn't really add value (removing it seems to better reflect the intent and might be safer / more future proof).

No, we don't want people who are not the PR author and who are not Reviewers to be able to increase the required number of reviewers. Allowing that makes it possible to harass pull request by e.g. registering a spam account and just drop a bunch /reviewers 9 in a number of PRs.

I agree, but that isn't related to this block (your concern is a good one and is handled by the previous block). By adding the author && to !reviewer it makes this less restrictive not more. In any case, it doesn't matter...at least not given the prior test.

rwestberg

Looks good!

openjdk · 2020-09-15T13:34:49Z

@edvbld This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

673: PR author should be able to use /reviewers command

Reviewed-by: rwestberg, kcr

If you would like to add a summary, use the /summary command.
To credit additional contributors, use the /contributor command.
To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 2 commits pushed to the master branch:

9dd7150: Set or update the resolved in build field when new tags arrive
b86ed56: 672: Support pulling tags in checkout bot

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 9dd71506093142c7364bcb604ab4acafd6d22ec7.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

edvbld · 2020-09-15T14:27:08Z

/integrate

openjdk · 2020-09-15T14:27:31Z

@edvbld Since your change was applied there have been 2 commits pushed to the master branch:

9dd7150: Set or update the resolved in build field when new tags arrive
b86ed56: 672: Support pulling tags in checkout bot

Your commit was automatically rebased without conflicts.

Pushed as commit 82aa583.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

673

eef2478

openjdk bot changed the title ~~673~~ 673: PR author should be able to use /reviewers command Sep 14, 2020

openjdk bot added the rfr label Sep 14, 2020

openjdk bot added the bots label Sep 14, 2020

kevinrushforth reviewed Sep 14, 2020

View changes

PR authors should not be allowed to decrease

347594f

rwestberg reviewed Sep 15, 2020

View changes

Simplify code based on reviewer feedback

7b17768

kevinrushforth approved these changes Sep 15, 2020

View changes

rwestberg approved these changes Sep 15, 2020

View changes

openjdk bot added the ready label Sep 15, 2020

openjdk bot closed this Sep 15, 2020

openjdk bot added integrated and removed ready rfr labels Sep 15, 2020

673: PR author should be able to use /reviewers command #820

673: PR author should be able to use /reviewers command #820

edvbld commented Sep 14, 2020 •

edited by openjdk[bot] bot

bridgekeeper bot commented Sep 14, 2020

openjdk bot commented Sep 14, 2020

mlbridge bot commented Sep 14, 2020 •

edited

kevinrushforth commented Sep 14, 2020

kevinrushforth Sep 14, 2020

prrace Sep 14, 2020

kevinrushforth Sep 14, 2020

edvbld Sep 15, 2020

rwestberg left a comment

rwestberg Sep 15, 2020

edvbld Sep 15, 2020

rwestberg Sep 15, 2020

edvbld Sep 15, 2020

kevinrushforth left a comment

kevinrushforth Sep 15, 2020

edvbld Sep 15, 2020 •

edited

kevinrushforth Sep 15, 2020

rwestberg left a comment

openjdk bot commented Sep 15, 2020

edvbld commented Sep 15, 2020

openjdk bot commented Sep 15, 2020


		CommandInvocation(String id, HostUser user, CommandHandler handler, String name, String args) {
		CommandInvocation(String id, HostUser user, CommandHandler handler, String name, String args, Comment comment) {

673: PR author should be able to use /reviewers command #820

673: PR author should be able to use /reviewers command #820

Conversation

edvbld commented Sep 14, 2020 • edited by openjdk[bot] bot

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Sep 14, 2020

openjdk bot commented Sep 14, 2020

mlbridge bot commented Sep 14, 2020 • edited

Webrevs

kevinrushforth commented Sep 14, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rwestberg left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kevinrushforth left a comment

Choose a reason for hiding this comment

edvbld Sep 15, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rwestberg left a comment

openjdk bot commented Sep 15, 2020

edvbld commented Sep 15, 2020

openjdk bot commented Sep 15, 2020

edvbld commented Sep 14, 2020 •

edited by openjdk[bot] bot

mlbridge bot commented Sep 14, 2020 •

edited

edvbld Sep 15, 2020 •

edited