Repository navigation
ref: Replace SENTRY_DEFAULT_ORGANIZATION_ID with SUPERUSER_ORG_ID - #107774
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
Bugbot Autofix is OFF. To automatically fix reported issues with Cloud Agents, enable Autofix in the Cursor dashboard.
Consolidate two duplicate constants that reference the same organization ID. SENTRY_DEFAULT_ORGANIZATION_ID was hardcoded to 1 in server.py, while SUPERUSER_ORG_ID already exists in superuser.py for the same purpose. Changes: - Remove SENTRY_DEFAULT_ORGANIZATION_ID from conf/server.py - Add type annotation SUPERUSER_ORG_ID: int | None = None in server.py - Update SCIM member deletion to use settings.SUPERUSER_ORG_ID - Update user_can_elevate() to use settings.SUPERUSER_ORG_ID with null check - Update test fixtures to override SUPERUSER_ORG_ID setting - Add test for user_can_elevate() returning False when SUPERUSER_ORG_ID is None - Add test for SCIM deletion preserving privileges when SUPERUSER_ORG_ID is None The default value is now None instead of 1, which means privilege management is disabled unless explicitly configured. Tests that rely on the setting now explicitly set SUPERUSER_ORG_ID=1. Co-Authored-By: Claude <noreply@anthropic.com>
michelletran-sentry
force-pushed
the
ref/consolidate-superuser-org-id
branch
from
February 6, 2026 17:12
ddce379 to
8bf6c42
Compare
oioki
approved these changes
Feb 9, 2026
This branch was successfully deployed
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
@markstory informed me that there is already a way to specify the org used for superuser/staff. So I'm going to remove the custom setting that I added and use that other setting instead.
Consolidate two duplicate constants that reference the same organization ID. SENTRY_DEFAULT_ORGANIZATION_ID was hardcoded to 1 in server.py, while SUPERUSER_ORG_ID already exists in superuser.py for the same purpose.
This change:
No behavior change - both constants referenced organization 1 for privilege management in SaaS mode.