Skip to content

feat(bitbucket-server): extend CODEOWNER support#37161

Merged
rarkins merged 31 commits intorenovatebot:mainfrom
portly-halicore-76:feat/bbserver-codeowners-and-expandusergroups
Aug 14, 2025
Merged

feat(bitbucket-server): extend CODEOWNER support#37161
rarkins merged 31 commits intorenovatebot:mainfrom
portly-halicore-76:feat/bbserver-codeowners-and-expandusergroups

Conversation

@portly-halicore-76
Copy link
Copy Markdown
Contributor

@portly-halicore-76 portly-halicore-76 commented Jul 25, 2025 •
edited
Loading

Changes

As described in the discussion here: #36996 I've implemented the BitBucket Server CODEOWNER logic. This includes:

  • Implements expandGroupsMembers for BitBucket Server as codeOwners can contain reviewer-groups
  • Implements extractRulesFromCodeOwnersLines for BitBucket Server

Context

See related Discussion. More info about CODEOWNERS for BitBucket server can be found here

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

I believe I can't update that the expandUserGroups configuration option is implemented for BitBucket server as well, Is that generated documentation?

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Jul 25, 2025 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@RahulGautamSingh
Copy link
Copy Markdown
Collaborator

RahulGautamSingh commented Jul 28, 2025 •
edited
Loading

Thanks for the PR!

Do you think that some parts can be separated into smaller PRs so it's easier to review?

For eg. the addReviewers refactor I think, can be done separately?

@portly-halicore-76
Copy link
Copy Markdown
Contributor Author

portly-halicore-76 commented Jul 28, 2025

Thanks for the PR!

Do you think that some parts can be separated into smaller PRs so it's easier to review?

For eg. the addReviewers refactor I think, can be done separately?

Thanks for your early feedback. The refactor in addReviewers is strictly related to the CODEOWNERS implementation. However, it can be regarded as a seperate change. I will split the PR!

This was referenced Jul 28, 2025
Merged
Merged
@portly-halicore-76 portly-halicore-76 force-pushed the feat/bbserver-codeowners-and-expandusergroups branch from 708deec to 0ddc4a6 Compare July 28, 2025 17:36
@portly-halicore-76
* Implements expandGroupMembers for BitBucket Server
9a75f13 
* Implements extractRulesFromCodeOwnersLines for BitBucket Server

Signed-off-by: portly-halicore-76 <170707699+portly-halicore-76@users.noreply.github.com>
@portly-halicore-76 portly-halicore-76 force-pushed the feat/bbserver-codeowners-and-expandusergroups branch from 0ddc4a6 to 9a75f13 Compare July 28, 2025 17:47
@viceice viceice changed the title feat: BitBucket data center CODEOWNERS feat(bitbucket-server): extend CODEOWNER support Aug 1, 2025
@viceice viceice marked this pull request as draft August 1, 2025 06:43
@portly-halicore-76
Copy link
Copy Markdown
Contributor Author

portly-halicore-76 commented Aug 1, 2025

@viceice why is this marked as draft? Because of the testCoverage not met?

@viceice
Copy link
Copy Markdown
Member

viceice commented Aug 1, 2025

@viceice why is this marked as draft? Because of the testCoverage not met?

because it depends on

astellingwerf
astellingwerf reviewed Aug 5, 2025
View reviewed changes
Comment thread lib/modules/platform/bitbucket-server/index.ts Outdated
astellingwerf
astellingwerf reviewed Aug 5, 2025
View reviewed changes
Comment thread lib/modules/platform/bitbucket-server/index.ts Outdated
astellingwerf
astellingwerf reviewed Aug 5, 2025
View reviewed changes
Comment thread lib/modules/platform/bitbucket-server/index.ts Outdated
astellingwerf
astellingwerf reviewed Aug 5, 2025
View reviewed changes
Comment thread lib/modules/platform/bitbucket-server/index.ts Outdated
astellingwerf
astellingwerf reviewed Aug 5, 2025
View reviewed changes
Comment thread lib/modules/platform/bitbucket-server/index.ts Outdated
portly-halicore-76 and others added 2 commits August 7, 2025 10:09
@portly-halicore-76 @astellingwerf
Update lib/modules/platform/bitbucket-server/index.ts
98ac620 
Co-authored-by: Anne Stellingwerf <1637358+astellingwerf@users.noreply.github.com>
@portly-halicore-76
Implements review comments
9d9991b 
Signed-off-by: portly-halicore-76 <170707699+portly-halicore-76@users.noreply.github.com>
@portly-halicore-76 portly-halicore-76 marked this pull request as ready for review August 7, 2025 09:45
@portly-halicore-76
Adds missing modifier test
c751885 
Signed-off-by: portly-halicore-76 <170707699+portly-halicore-76@users.noreply.github.com>
@portly-halicore-76
Adds missing modifier test
a09127a 
Signed-off-by: portly-halicore-76 <170707699+portly-halicore-76@users.noreply.github.com>
@portly-halicore-76
Uses regEx util
f26c925 
Signed-off-by: portly-halicore-76 <170707699+portly-halicore-76@users.noreply.github.com>
@portly-halicore-76
Uses regEx util correctly
504077a 
Signed-off-by: portly-halicore-76 <170707699+portly-halicore-76@users.noreply.github.com>
rarkins
rarkins previously approved these changes Aug 13, 2025
View reviewed changes
@rarkins rarkins added this pull request to the merge queue Aug 13, 2025
viceice
viceice reviewed Aug 13, 2025
View reviewed changes
Comment thread lib/modules/platform/bitbucket-server/schema.ts Outdated
Comment thread lib/modules/platform/bitbucket-server/utils.ts Outdated
Comment thread lib/modules/platform/bitbucket-server/utils.ts Outdated
@viceice viceice removed this pull request from the merge queue due to a manual request Aug 13, 2025
@rarkins @viceice
Update lib/modules/platform/bitbucket-server/utils.ts
3a7acc8 
Co-authored-by: Michael Kriese <michael.kriese@gmx.de>
@rarkins rarkins requested a review from viceice August 13, 2025 14:59
@rarkins rarkins enabled auto-merge August 13, 2025 15:00
viceice
viceice reviewed Aug 13, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see comments

@viceice viceice mentioned this pull request Aug 13, 2025
Merged
6 tasks
@portly-halicore-76 @viceice
Update lib/modules/platform/bitbucket-server/schema.ts
4599857 
Co-authored-by: Michael Kriese <michael.kriese@gmx.de>
auto-merge was automatically disabled August 13, 2025 15:51

Head branch was pushed to by a user without write access

@portly-halicore-76
Update index.ts
df7df10
@portly-halicore-76
Merge remote-tracking branch 'upstream/main' into feat/bbserver-codeo…
ceb376b 
…wners-and-expandusergroups
@portly-halicore-76
Implements review comments
99f5448 
Signed-off-by: portly-halicore-76 <170707699+portly-halicore-76@users.noreply.github.com>
@portly-halicore-76
Replaces String.raw with escaped spaces.
0dcf39e 
Signed-off-by: portly-halicore-76 <170707699+portly-halicore-76@users.noreply.github.com>
viceice
viceice reviewed Aug 14, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

otherwise LGTM 🤗

Comment thread lib/modules/platform/bitbucket-server/schema.ts Outdated
Comment thread lib/modules/platform/bitbucket-server/utils.ts Outdated
@portly-halicore-76
Resolves comments
4e2d065 
Signed-off-by: portly-halicore-76 <170707699+portly-halicore-76@users.noreply.github.com>
@rarkins rarkins enabled auto-merge August 14, 2025 09:31
@rarkins rarkins added this pull request to the merge queue Aug 14, 2025
Merged via the queue into renovatebot:main with commit c59727f Aug 14, 2025
40 checks passed
@renovate-release
Copy link
Copy Markdown

renovate-release commented Aug 14, 2025

🎉 This PR is included in version 41.72.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@portly-halicore-76 portly-halicore-76 mentioned this pull request Aug 14, 2025
Merged
6 tasks
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Sep 14, 2025
@setchy setchy added the platform:bitbucket-server Bitbucket Data Center and Server platform label Dec 10, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@RahulGautamSingh RahulGautamSingh Awaiting requested review from RahulGautamSingh

@viceice viceice Awaiting requested review from viceice

3 more reviewers

@astellingwerf astellingwerf astellingwerf approved these changes

@Churro Churro Churro approved these changes

@rarkins rarkins rarkins approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

platform:bitbucket-server Bitbucket Data Center and Server platform

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@portly-halicore-76 @CLAassistant @RahulGautamSingh @viceice @renovate-release @Churro @astellingwerf @rarkins @setchy