From ee34c015ce3e012bcef770cea47187c2735336bf Mon Sep 17 00:00:00 2001 From: Gabriel MABILLE Date: Wed, 17 Sep 2025 12:24:58 +0200 Subject: [PATCH] `grafana-iam`: Fix context for identity store queries to work (#111228) `grafana-iam`: Fix context for identity store Co-authored-by: Ieva --- .../apis/iam/resourcepermission/storage_backend.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/registry/apis/iam/resourcepermission/storage_backend.go b/pkg/registry/apis/iam/resourcepermission/storage_backend.go index 72449ce4bca..938745687e2 100644 --- a/pkg/registry/apis/iam/resourcepermission/storage_backend.go +++ b/pkg/registry/apis/iam/resourcepermission/storage_backend.go @@ -99,7 +99,8 @@ func (s *ResourcePermSqlBackend) ListIterator(ctx context.Context, req *resource Continue: token.offset, } - dbHelper, err := s.dbProvider(request.WithNamespace(ctx, ns.Value)) + ctx = request.WithNamespace(ctx, ns.Value) + dbHelper, err := s.dbProvider(ctx) if err != nil { logger := s.logger.FromContext(ctx) logger.Error("Failed to get database helper", "error", err) @@ -148,7 +149,8 @@ func (s *ResourcePermSqlBackend) ReadResource(ctx context.Context, req *resource return rsp } - dbHelper, err := s.dbProvider(request.WithNamespace(ctx, ns.Value)) + ctx = request.WithNamespace(ctx, ns.Value) + dbHelper, err := s.dbProvider(ctx) if err != nil { // Hide the error from the user, but log it logger := s.logger.FromContext(ctx) @@ -232,7 +234,8 @@ func (s *ResourcePermSqlBackend) WriteEvent(ctx context.Context, event resource. return 0, apierrors.NewBadRequest(fmt.Sprintf("invalid key %q: %v", event.Key, err.Error())) } - dbHelper, err := s.dbProvider(request.WithNamespace(ctx, ns.Value)) + ctx = request.WithNamespace(ctx, ns.Value) + dbHelper, err := s.dbProvider(ctx) if err != nil { // Hide the error from the user, but log it logger := s.logger.FromContext(ctx)