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

LibraryPanels/RBAC: Fix issue where folder scopes weren't being correctly inherited #82700

Merged
merged 2 commits into from
Feb 16, 2024

Conversation

kaydelaney
Copy link
Contributor

Fixes an issue where folder scopes were not being correctly inherited.

@kaydelaney kaydelaney added type/bug area/backend add to changelog area/frontend/library-panels area/auth/rbac Grafana role-based access control backport v10.3.x Mark PR for automatic backport to v10.3.x labels Feb 15, 2024
@kaydelaney kaydelaney requested review from IevaVasiljeva and a team February 15, 2024 18:03
@kaydelaney kaydelaney self-assigned this Feb 15, 2024
@kaydelaney kaydelaney requested a review from a team as a code owner February 15, 2024 18:03
@kaydelaney kaydelaney requested review from joshhunt and JoaoSilvaGrafana and removed request for a team February 15, 2024 18:03
@grafana-delivery-bot grafana-delivery-bot bot added this to the 10.4.x milestone Feb 15, 2024
Copy link
Contributor

This PR must be merged before a backport PR will be created.

1 similar comment
Copy link
Contributor

This PR must be merged before a backport PR will be created.

Copy link
Contributor

@IevaVasiljeva IevaVasiljeva left a comment

Choose a reason for hiding this comment

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

LGTM, but would be good to add a test for library panels in the "general" folder.

@kaydelaney kaydelaney merged commit 82e3e2e into main Feb 16, 2024
12 checks passed
@kaydelaney kaydelaney deleted the lib-panel-rbac-general-fix branch February 16, 2024 14:17
Copy link
Contributor

The backport to v10.3.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-82700-to-v10.3.x origin/v10.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 82e3e2e5582c49fa793cb9a0c143b7b76cbdfb58

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-82700-to-v10.3.x
# Create the PR body template
PR_BODY=$(gh pr view 82700 --json body --template 'Backport 82e3e2e5582c49fa793cb9a0c143b7b76cbdfb58 from #82700{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.3.x] LibraryPanels/RBAC: Fix issue where folder scopes weren't being correctly inherited" --body-file - --label "type/bug" --label "area/backend" --label "add to changelog" --label "area/frontend/library-panels" --label "area/auth/rbac" --label "backport" --base v10.3.x --milestone 10.3.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-82700-to-v10.3.x

# Create a pull request where the `base` branch is `v10.3.x` and the `compare`/`head` branch is `backport-82700-to-v10.3.x`.

# Remove the local backport branch
git switch main
git branch -D backport-82700-to-v10.3.x

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label Feb 16, 2024
kaydelaney added a commit that referenced this pull request Feb 16, 2024
kaydelaney added a commit that referenced this pull request Feb 16, 2024
…eing correctly inherited (#82902)

LibraryPanels/RBAC: Fix issue where folder scopes weren't being correctly inherited (#82700)

(cherry picked from commit 82e3e2e)
@aangelisc aangelisc modified the milestones: 10.4.x, 10.4.0 Mar 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/auth/rbac Grafana role-based access control area/backend area/frontend/library-panels backport v10.3.x Mark PR for automatic backport to v10.3.x backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. type/bug
Projects
Status: 🚀 Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants