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

K8s: Add error to GetRestConfig (#101147)

Browse Source 
K8s: Add error to RestConfigProvider return values
This commit is contained in:
Todd Treece
2025-02-21 18:07:13 +02:00
committed by GitHub
parent 2010c66108
commit 9e80b0f913
8 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/authz/rbac.go
+2 -2
View File
@@ -159,7 +159,7 @@ func RegisterRBACAuthZService(
if folderAPIURL == "" {
folderStore = store.NewSQLFolderStore(db, tracer)
} else {
folderStore = store.NewAPIFolderStore(tracer, func(ctx context.Context) *rest.Config {
folderStore = store.NewAPIFolderStore(tracer, func(ctx context.Context) (*rest.Config, error) {
return &rest.Config{
Host: folderAPIURL,
WrapTransport: func(rt http.RoundTripper) http.RoundTripper {
@@ -167,7 +167,7 @@ func RegisterRBACAuthZService(
},
QPS: 50,
Burst: 100,
}
}, nil
})
}
pkg/services/authz/rbac/store/folder_store.go
+7 -3
View File
@@ -102,13 +102,13 @@ func (s *SQLFolderStore) ListFolders(ctx context.Context, ns types.NamespaceInfo
var _ FolderStore = (*APIFolderStore)(nil)
func NewAPIFolderStore(tracer tracing.Tracer, configProvider func(ctx context.Context) *rest.Config) *APIFolderStore {
func NewAPIFolderStore(tracer tracing.Tracer, configProvider func(ctx context.Context) (*rest.Config, error)) *APIFolderStore {
return &APIFolderStore{tracer, configProvider}
}
type APIFolderStore struct {
tracer tracing.Tracer
configProvider func(ctx context.Context) *rest.Config
configProvider func(ctx context.Context) (*rest.Config, error)
}
func (s *APIFolderStore) ListFolders(ctx context.Context, ns types.NamespaceInfo) ([]Folder, error) {
@@ -150,7 +150,11 @@ func (s *APIFolderStore) ListFolders(ctx context.Context, ns types.NamespaceInfo
}
func (s *APIFolderStore) client(ctx context.Context, namespace string) (dynamic.ResourceInterface, error) {
client, err := dynamic.NewForConfig(s.configProvider(ctx))
cfg, err := s.configProvider(ctx)
if err != nil {
return nil, err
}
client, err := dynamic.NewForConfig(cfg)
if err != nil {
return nil, err
}