Skip to content
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

Users: Fix org user always getting org id = 1 on auto assign false #63708

Merged
merged 6 commits into from
Feb 24, 2023

Conversation

Jguer
Copy link
Contributor

@Jguer Jguer commented Feb 24, 2023

What is this feature?

Fix org user always getting org id = 1 on auto assign false.

Why do we need this feature?

[Add a description of the problem the feature is trying to solve.]

Who is this feature for?

[Add information on what kind of user the feature is for.]

Which issue(s) does this PR fix?:

Fixes #63562

Special notes for your reviewer:

@Jguer Jguer added add to changelog backport v9.4.x Mark PR for automatic backport to v9.4.x labels Feb 24, 2023
@Jguer Jguer self-assigned this Feb 24, 2023
@Jguer Jguer requested a review from a team as a code owner February 24, 2023 10:27
@Jguer Jguer requested review from sakjur, zserge and mildwonkey and removed request for a team February 24, 2023 10:27
@Jguer Jguer added this to the 9.4.1 milestone Feb 24, 2023
@grafanabot
Copy link
Contributor

Hello @Jguer!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@Jguer Jguer requested a review from a team as a code owner February 24, 2023 11:44
@Jguer Jguer requested review from vtorosyan and eleijonmarck and removed request for a team February 24, 2023 11:44
@Jguer Jguer requested a review from a team February 24, 2023 11:50
Copy link
Contributor

@eleijonmarck eleijonmarck left a comment

Choose a reason for hiding this comment

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

LGTM, did not test locally, just pulled and check through code

@vtorosyan
Copy link
Contributor

#63562 related issue

@Jguer Jguer merged commit c8db771 into main Feb 24, 2023
@Jguer Jguer deleted the jguer/admin-create-users branch February 24, 2023 17:08
@grafanabot
Copy link
Contributor

The backport to v9.4.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-63708-to-v9.4.x origin/v9.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x c8db771939f783d1533421876ccf17648d77019e
# Push it to GitHub
git push --set-upstream origin backport-63708-to-v9.4.x
git switch main
# Remove the local backport branch
git branch -D backport-63708-to-v9.4.x

Then, create a pull request where the base branch is v9.4.x and the compare/head branch is backport-63708-to-v9.4.x.

@grafanabot grafanabot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label Feb 24, 2023
Jguer added a commit that referenced this pull request Feb 24, 2023
…63708)

* fix org user always getting org id = 1 on auto assign false

* make tests explicit

* use correct cfg in service accounts

* fix api tests

* fix database test of ac

* fix InsertOrgUser returning affected rows as orgID

(cherry picked from commit c8db771)
@zerok zerok modified the milestones: 9.4.1, 9.4.2 Feb 27, 2023
Jguer added a commit that referenced this pull request Feb 27, 2023
Users: Fix org user always getting org id = 1 on auto assign false (#63708)

* fix org user always getting org id = 1 on auto assign false

* make tests explicit

* use correct cfg in service accounts

* fix api tests

* fix database test of ac

* fix InsertOrgUser returning affected rows as orgID

(cherry picked from commit c8db771)
ryantxu pushed a commit that referenced this pull request Mar 2, 2023
…63708)

* fix org user always getting org id = 1 on auto assign false

* make tests explicit

* use correct cfg in service accounts

* fix api tests

* fix database test of ac

* fix InsertOrgUser returning affected rows as orgID
@zerok zerok modified the milestones: 9.4.2, 9.4.3, 9.4.4 Mar 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/backend backport v9.4.x Mark PR for automatic backport to v9.4.x backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. type/bug
Projects
None yet
6 participants