Skip to content

SCIM: Update logic for determining if a stack is cloud or on-prem #2281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 30, 2025

Conversation

patrickeasters
Copy link
Member

The current logic for determining if the stack being modified is running in cloud versus on-prem/enterprise fails for cloud orgs using service account tokens. Because a service account token is scoped to an org, the provider sees an org_id of 1, and incorrectly assumes it's enterprise. This results in it using the default namespace which won't work.

This PR updates the logic to check for a stack_id first, before checking for org_id. This should correctly account for the cloud use cases.

@patrickeasters patrickeasters requested a review from a team as a code owner July 30, 2025 19:44
Copy link
Contributor

In order to lower resource usage and have a faster runtime, PRs will not run Cloud tests automatically.
To do so, a Grafana Labs employee must trigger the cloud acceptance tests workflow manually.

@patrickeasters patrickeasters changed the title Update logic for determining if a stack is cloud or not SCIM: Update logic for determining if a stack is cloud or on-prem Jul 30, 2025
@patrickeasters patrickeasters merged commit 235e08e into main Jul 30, 2025
31 checks passed
@patrickeasters patrickeasters deleted the scim_org_logic branch July 30, 2025 21:38
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