Skip to content

fix: pass the actorId to the merge organizations script - #5035

Merged
skwowet merged 3 commits into
mainfrom
fix/merge-organizations-script-user
Oct 19, 2026
Merged

skwowet merged 3 commits into
mainfrom
fix/merge-organizations-script-user

Conversation

@skwowet

@skwowet skwowet commented Oct 19, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

The merge-organizations script ran without a user, so mergeSync committed the merge and then failed when starting the finishOrganizationMerging workflow, which needs the user ID. This left merges half done: the database changes were in, but activities were never moved. The script now takes the acting user so merges complete the same way they do from the UI.

Changes

  • Add a required --userId (-u) option and set it as the current user, so it's recorded on the merge action, the audit log and the workflow.
  • Print usage instead of running when --userId is missing.
  • Drop the --tenantId option and use the default tenant.

Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings October 19, 2026 20:44

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot wasn't able to review any files in this pull request. Check if the Files changed in this pull request are included in default exclusions.

Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings October 19, 2026 20:45

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot wasn't able to review any files in this pull request. Check if the Files changed in this pull request are included in default exclusions.

@skwowet skwowet changed the title fix: pass the acting user to the merge organizations script fix: pass the actorId to the merge organizations script Oct 19, 2026
Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings October 19, 2026 20:49

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot wasn't able to review any files in this pull request. Check if the Files changed in this pull request are included in default exclusions.

@skwowet
skwowet merged commit 8d6e8d4 into main Oct 19, 2026
13 checks passed
@skwowet
skwowet deleted the fix/merge-organizations-script-user branch October 19, 2026 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants