Skip to content

[BUG] Fix drift with external collaborators invite#3373

Merged
deiga merged 4 commits intointegrations:mainfrom
F-Secure-web:fix-drift-external-collaborators
Apr 28, 2026
Merged

[BUG] Fix drift with external collaborators invite#3373
deiga merged 4 commits intointegrations:mainfrom
F-Secure-web:fix-drift-external-collaborators

Conversation

@deiga
Copy link
Copy Markdown
Collaborator

@deiga deiga commented Apr 25, 2026


Before the change?

  • Adding an external collaborator would cause constant drift for as long as the invite would not have been accepted

After the change?

  • Adding an external collaborator no longer causes drift in the user state

Pull request checklist

  • Schema migrations have been created if needed (example)
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been reviewed and added / updated if needed (for bug fixes / features)

Does this introduce a breaking change?

Please see our docs on breaking changes to help!

  • Yes
  • No

deiga added 2 commits April 25, 2026 20:57
This is to prevent drift when external users have not accepted invites yet.

Signed-off-by: Timo Sand <[email protected]>
@deiga deiga added Type: Bug Something isn't working as documented vNextPatch These issues and PRs should be included in the next patch release labels Apr 25, 2026
@deiga deiga requested a review from stevehipwell April 25, 2026 18:25
@github-actions
Copy link
Copy Markdown

👋 Hi! Thank you for this contribution! Just to let you know, our GitHub SDK team does a round of issue and PR reviews twice a week, every Monday and Friday! We have a process in place for prioritizing and responding to your input. Because you are a part of this community please feel free to comment, add to, or pick up any issues/PRs that are labeled with Status: Up for grabs. You & others like you are the reason all of this works! So thank you & happy coding! 🚀

@deiga deiga added this to the v6.12.1 milestone Apr 25, 2026
@deiga
Copy link
Copy Markdown
Collaborator Author

deiga commented Apr 27, 2026

@stevehipwell Could you check this PR so that we can get 6.12.1 release cut?

Copy link
Copy Markdown
Collaborator

@stevehipwell stevehipwell left a comment

Choose a reason for hiding this comment

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

Thanks for the fix @deiga (and getting #3371 merged), I'm not sure why this code looks like it does but it looks like I messed up the end of the work on this. I've just got a couple of questions, but the code change looks good.

Comment thread github/resource_github_repository_collaborators_test.go Outdated
Comment thread github/util_user.go
@deiga
Copy link
Copy Markdown
Collaborator Author

deiga commented Apr 28, 2026

@stevehipwell thanks. Responded to the comments. Let me know if I should make changes to those

Copy link
Copy Markdown
Collaborator

@stevehipwell stevehipwell left a comment

Choose a reason for hiding this comment

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

LGTM

@deiga deiga requested a review from robert-crandall April 28, 2026 13:06
@deiga deiga merged commit add2157 into integrations:main Apr 28, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Type: Bug Something isn't working as documented vNextPatch These issues and PRs should be included in the next patch release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants