opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 00:52:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Advisor: Ensure User-Agent header is set for checks (#105122)

Browse Source
This commit is contained in:
Andres Martinez Gotor
2025-05-09 13:57:17 +02:00
committed by GitHub
parent 0978ec5e91
commit 8ef8185379
9 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/plugins/manager/fakes/fakes.go
View File

@ -272,7 +272,7 @@ func (r *FakePluginRepo) PluginVersion(ctx context.Context, pluginID, version st
return repo.VersionData{}, nil
}
func (r *FakePluginRepo) PluginInfo(ctx context.Context, pluginID string) (*repo.PluginInfo, error) {
func (r *FakePluginRepo) PluginInfo(ctx context.Context, pluginID string, compatOpts repo.CompatOpts) (*repo.PluginInfo, error) {
return &repo.PluginInfo{}, nil
}

2
pkg/plugins/repo/ifaces.go
View File

@ -17,7 +17,7 @@ type Service interface {
// PluginVersion will return plugin version based on the requested information.
PluginVersion(ctx context.Context, pluginID, version string, compatOpts CompatOpts) (VersionData, error)
// PluginInfo will return generic plugin information from grafana.com/api/plugins.
PluginInfo(ctx context.Context, pluginID string) (*PluginInfo, error)
PluginInfo(ctx context.Context, pluginID string, compatOpts CompatOpts) (*PluginInfo, error)
}
type CompatOpts struct {

4
pkg/plugins/repo/service.go
View File

@ -132,7 +132,7 @@ func (m *Manager) grafanaCompatiblePluginVersions(ctx context.Context, pluginID
return v.Versions, nil
}
func (m *Manager) PluginInfo(ctx context.Context, pluginID string) (*PluginInfo, error) {
func (m *Manager) PluginInfo(ctx context.Context, pluginID string, compatOpts CompatOpts) (*PluginInfo, error) {
u, err := url.Parse(m.client.grafanaComAPIURL)
if err != nil {
return nil, err
@ -140,7 +140,7 @@ func (m *Manager) PluginInfo(ctx context.Context, pluginID string) (*PluginInfo,
u.Path = path.Join(u.Path, pluginID)
body, err := m.client.SendReq(ctx, u, CompatOpts{})
body, err := m.client.SendReq(ctx, u, compatOpts)
if err != nil {
return nil, err
}

2
pkg/plugins/repo/service_test.go
View File

@ -126,7 +126,7 @@ func TestPluginInfo(t *testing.T) {
BaseURL: srv.URL,
Logger: log.NewTestPrettyLogger(),
})
pi, err := m.PluginInfo(context.Background(), pluginID)
pi, err := m.PluginInfo(context.Background(), pluginID, CompatOpts{})
require.NoError(t, err)
require.Equal(t, 1, pi.ID)
require.Equal(t, pluginID, pi.Slug)