From 7fa4a979e3608b7bc2cdb005bf9c7da19fe02c04 Mon Sep 17 00:00:00 2001 From: "Arati R." <33031346+suntala@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:20:07 +0100 Subject: [PATCH] K8s/Folders: Add write access hook before creating index server (#96030) Change order of when to add write access hook --- pkg/storage/unified/sql/server.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/storage/unified/sql/server.go b/pkg/storage/unified/sql/server.go index b2ca5b493af..7e89816cda7 100644 --- a/pkg/storage/unified/sql/server.go +++ b/pkg/storage/unified/sql/server.go @@ -48,10 +48,6 @@ func NewResourceServer(ctx context.Context, db infraDB.DB, cfg *setting.Cfg, fea opts.Diagnostics = store opts.Lifecycle = store - if features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageSearch) { - opts.Index = resource.NewResourceIndexServer(cfg, tracer) - } - if features.IsEnabledGlobally(featuremgmt.FlagKubernetesFolders) { opts.WriteAccess = resource.WriteAccessHooks{ Folder: func(ctx context.Context, user claims.AuthInfo, uid string) bool { @@ -63,6 +59,10 @@ func NewResourceServer(ctx context.Context, db infraDB.DB, cfg *setting.Cfg, fea } } + if features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageSearch) { + opts.Index = resource.NewResourceIndexServer(cfg, tracer) + } + rs, err := resource.NewResourceServer(opts) if err != nil { return nil, err