public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Fix apiserver circular dependencies (#89918)

Browse Source
This commit is contained in:
Todd Treece
2024-07-01 11:42:34 -04:00
committed by GitHub
parent 6761ed863f
commit 9c6d3590a2
34 changed files with 94 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/scope/find.go
+1 -1
View File
@@ -59,7 +59,7 @@ func (r *findREST) NewConnectOptions() (runtime.Object, bool, string) {
}
func (r *findREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
// See: /pkg/apiserver/builder/helper.go#L34
// See: /pkg/services/apiserver/builder/helper.go#L34
// The name is set with a rewriter hack
if name != "name" {
return nil, errors.NewNotFound(schema.GroupResource{}, name)
pkg/registry/apis/scope/find_scope_dashboards.go
+1 -1
View File
@@ -57,7 +57,7 @@ func (f *findScopeDashboardsREST) NewConnectOptions() (runtime.Object, bool, str
}
func (f *findScopeDashboardsREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
// See: /pkg/apiserver/builder/helper.go#L34
// See: /pkg/services/apiserver/builder/helper.go#L34
// The name is set with a rewriter hack
if name != "name" {
return nil, errors.NewNotFound(schema.GroupResource{}, name)
pkg/registry/apis/scope/register.go
+1 -1
View File
@@ -16,8 +16,8 @@ import (
"k8s.io/kube-openapi/pkg/validation/spec"
scope "github.com/grafana/grafana/pkg/apis/scope/v0alpha1"
"github.com/grafana/grafana/pkg/apiserver/builder"
grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
"github.com/grafana/grafana/pkg/services/apiserver/builder"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/prometheus/client_golang/prometheus"
)