From 946aed8797ff6f0cb444abbc177bbbe48864b44a Mon Sep 17 00:00:00 2001 From: Eric Leijonmarck Date: Thu, 18 Apr 2024 14:29:38 +0100 Subject: [PATCH] move from wireoss to wire --- pkg/server/wire.go | 2 ++ pkg/server/wireexts_oss.go | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/server/wire.go b/pkg/server/wire.go index 4f0c3323d43..56fa778bf6a 100644 --- a/pkg/server/wire.go +++ b/pkg/server/wire.go @@ -37,6 +37,7 @@ import ( "github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/accesscontrol/acimpl" "github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol" + "github.com/grafana/grafana/pkg/services/accesscontrol/resourcepermissions" "github.com/grafana/grafana/pkg/services/annotations" "github.com/grafana/grafana/pkg/services/annotations/annotationsimpl" "github.com/grafana/grafana/pkg/services/anonymous/anonimpl/anonstore" @@ -379,6 +380,7 @@ var wireBasicSet = wire.NewSet( // Kubernetes API server grafanaapiserver.WireSet, apiregistry.WireSet, + resourcepermissions.NewActionSetService, ) var wireSet = wire.NewSet( diff --git a/pkg/server/wireexts_oss.go b/pkg/server/wireexts_oss.go index fc625ce30db..6b9cb1407b1 100644 --- a/pkg/server/wireexts_oss.go +++ b/pkg/server/wireexts_oss.go @@ -16,7 +16,6 @@ import ( "github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/accesscontrol/acimpl" "github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol" - "github.com/grafana/grafana/pkg/services/accesscontrol/resourcepermissions" "github.com/grafana/grafana/pkg/services/anonymous" "github.com/grafana/grafana/pkg/services/anonymous/anonimpl" "github.com/grafana/grafana/pkg/services/apiserver/standalone" @@ -103,7 +102,6 @@ var wireExtsBasicSet = wire.NewSet( wire.Bind(new(auth.IDSigner), new(*idimpl.LocalSigner)), manager.ProvideInstaller, wire.Bind(new(plugins.Installer), new(*manager.PluginInstaller)), - resourcepermissions.NewActionSetService, ) var wireExtsSet = wire.NewSet(