Fix CHANGE_AUTHOR and CHANGE_AUTHOR_DISPLAY_NAME #325
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jglick
commented
Jul 2, 2020
...va/com/cloudbees/jenkins/plugins/bitbucket/client/events/BitbucketCloudPullRequestEvent.java
Outdated
Show resolved
Hide resolved
jglick
commented
Jul 2, 2020
| public Author(String username) { | ||
| this.username = username; | ||
| } | ||
|
|
||
| public String getUsername() { | ||
| return username; | ||
| } | ||
|
|
||
| public void setUsername(String username) { | ||
| this.username = username; | ||
| } | ||
|
|
||
| public String getIdentifier() { | ||
| return identifier; | ||
| } | ||
|
|
||
| public void setIndentifier(String identifier) { | ||
| public void setIdentifier(String identifier) { |
jglick
commented
Jul 2, 2020
Comment on lines
-73
to
+81
| if (this.pullRequest.getSource().getRepository().getOwnerName().equals(this.pullRequest.getAuthorLogin())) { | ||
| if (!this.pullRequest.getSource().getRepository().getOwnerName().equals(repository.getOwnerName())) { // i.e., a fork | ||
| BitbucketCloudRepositoryOwner owner = new BitbucketCloudRepositoryOwner(); | ||
| owner.setUsername(this.pullRequest.getAuthorLogin()); | ||
| owner.setDisplayName(this.pullRequest.getAuthorDisplayName()); | ||
| owner.setUsername(this.pullRequest.getSource().getRepository().getOwnerName()); | ||
| owner.setDisplayName(this.pullRequest.getAuthorLogin()); | ||
| if (repository.isPrivate()) { | ||
| this.pullRequest.getSource().getRepository().setPrivate(repository.isPrivate()); | ||
| } | ||
| this.pullRequest.getSource().getRepository().setOwner(owner); | ||
| } else if (this.pullRequest.getSource().getRepository().getOwnerName().equals(repository.getOwnerName())) { | ||
| } else { // origin branch |
There was a problem hiding this comment.
Possibly fixes a bug with the handling of webhooks for forked PRs in BB Cloud, though I am not sure how to test that outside a mock context (discovered due to unit test failures): I cannot find any non-test usages of BitbucketRepository.getOwner except for code in this reconstructMissingData method which sets an owner field. Perhaps @stephenc can clarify if he still remembers anything about it (but this was over three years ago).
jglick
changed the title
dwnusbaum
approved these changes
Jul 2, 2020
5 tasks
car-roll
approved these changes
Jul 6, 2020
bitwiseman
approved these changes
Jul 6, 2020
fcojfernandez
approved these changes
Jul 8, 2020
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #195, which is not a plugin regression, but a cloud API regression to satisfy GDPR. There is apparently no way to set
CHANGE_AUTHORto the previous value. (CHANGE_FORK, or its first component if/-separated, is probably the same thing, though this is not necessarily the author.) Nor isCHANGE_AUTHOR_EMAILpossible.Also, for Server, the display name was mistakenly being bound to the variable intended for the (code) username.
Example variables with BB Cloud, before:
after:
With BB Server 7, before:
and after: