From fc2d84152dd1f0a094a3eb58634196e8ad9bf91d Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 13:51:45 +0300 Subject: [PATCH] [v11.2.x] RBAC: Always store action sets (#92855) RBAC: Always store action sets (#92833) always store action sets, even if FT is disabled (cherry picked from commit 46e81e98cfd2cda4fc9f8d361bfe612a7d569428) Co-authored-by: Ieva --- pkg/services/accesscontrol/resourcepermissions/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/accesscontrol/resourcepermissions/store.go b/pkg/services/accesscontrol/resourcepermissions/store.go index 5e4b45b7442..e7603136ce6 100644 --- a/pkg/services/accesscontrol/resourcepermissions/store.go +++ b/pkg/services/accesscontrol/resourcepermissions/store.go @@ -710,7 +710,7 @@ func (s *store) createPermissions(sess *db.Session, roleID int64, cmd SetResourc } func (s *store) shouldStoreActionSet(resource, permission string) bool { - if !(s.features.IsEnabled(context.TODO(), featuremgmt.FlagAccessActionSets) && permission != "") { + if permission == "" { return false } actionSetName := GetActionSetName(resource, permission)