apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Plugins: Remove plugin dependency version (#103728)

Browse Source 
remove plugin dependency version
pull/103542/head
Will Browne 3 months ago committed by GitHub
parent a255ae6b0b
commit a1b792b1f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 21 additions and 28 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      docs/sources/developers/plugins/plugin.schema.json
  2. 6
      pkg/cmd/grafana-cli/commands/install_command.go
  3. 2
      pkg/plugins/manager/installer.go
  4. 4
      pkg/plugins/manager/loader/finder/local_test.go
  5. 4
      pkg/plugins/manager/loader/loader_test.go
  6. 1
      pkg/plugins/models.go
  7. 4
      pkg/plugins/plugins_test.go
  8. 1
      pkg/plugins/storage/fs.go
  9. 1
      pkg/plugins/storage/models.go
  10. 12
      pkg/services/pluginsintegration/loader/loader_test.go

4
docs/sources/developers/plugins/plugin.schema.json
Unescape View File

@ -191,10 +191,6 @@
},
"name": {
"type": "string"
},
"version": {
"type": "string",
"pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)$"
}
}
}

6
pkg/cmd/grafana-cli/commands/install_command.go
Unescape View File

@ -125,7 +125,7 @@ func doInstallPlugin(ctx context.Context, pluginID, version string, o pluginInst
if p, ok := services.PluginVersionInstalled(pluginID, version, o.pluginDir); ok {
services.Logger.Successf("Plugin %s v%s already installed.", pluginID, version)
for _, depP := range p.JSONData.Dependencies.Plugins {
if err := doInstallPlugin(ctx, depP.ID, depP.Version, o, installing); err != nil {
if err := doInstallPlugin(ctx, depP.ID, "", o, installing); err != nil {
return err
}
}
@ -159,7 +159,7 @@ func doInstallPlugin(ctx context.Context, pluginID, version string, o pluginInst
if p, ok := services.PluginVersionInstalled(pluginID, archiveInfo.Version, o.pluginDir); ok {
services.Logger.Successf("Plugin %s v%s already installed.", pluginID, archiveInfo.Version)
for _, depP := range p.JSONData.Dependencies.Plugins {
if err = doInstallPlugin(ctx, depP.ID, depP.Version, o, installing); err != nil {
if err = doInstallPlugin(ctx, depP.ID, "", o, installing); err != nil {
return err
}
}
@ -179,7 +179,7 @@ func doInstallPlugin(ctx context.Context, pluginID, version string, o pluginInst
for _, dep := range extractedArchive.Dependencies {
services.Logger.Infof("Fetching %s dependency %s...", pluginID, dep.ID)
err = doInstallPlugin(ctx, dep.ID, dep.Version, pluginInstallOpts{
err = doInstallPlugin(ctx, dep.ID, "", pluginInstallOpts{
insecure: o.insecure,
repoURL: o.repoURL,
pluginDir: o.pluginDir,

2
pkg/plugins/manager/installer.go
Unescape View File

@ -68,7 +68,7 @@ func (m *PluginInstaller) Add(ctx context.Context, pluginID, version string, opt
for _, dep := range archive.Dependencies {
m.log.Info(fmt.Sprintf("Fetching %s dependency %s...", pluginID, dep.ID))
err = m.Add(ctx, dep.ID, dep.Version, opts)
err = m.Add(ctx, dep.ID, "", opts)
if err != nil {
var dupeErr plugins.DuplicateError
if errors.As(err, &dupeErr) {

4
pkg/plugins/manager/loader/finder/local_test.go
Unescape View File

@ -179,8 +179,8 @@ func TestFinder_Find(t *testing.T) {
Dependencies: plugins.Dependencies{
GrafanaVersion: "3.x.x",
Plugins: []plugins.Dependency{
{ID: "graphite", Type: "datasource", Name: "Graphite", Version: "1.0.0"},
{ID: "graph", Type: "panel", Name: "Graph", Version: "1.0.0"},
{ID: "graphite", Type: "datasource", Name: "Graphite"},
{ID: "graph", Type: "panel", Name: "Graph"},
},
Extensions: plugins.ExtensionsDependencies{
ExposedComponents: []string{},

4
pkg/plugins/manager/loader/loader_test.go
Unescape View File

@ -166,8 +166,8 @@ func TestLoader_Load(t *testing.T) {
Dependencies: plugins.Dependencies{
GrafanaVersion: "3.x.x",
Plugins: []plugins.Dependency{
{Type: "datasource", ID: "graphite", Name: "Graphite", Version: "1.0.0"},
{Type: "panel", ID: "graph", Name: "Graph", Version: "1.0.0"},
{Type: "datasource", ID: "graphite", Name: "Graphite"},
{Type: "panel", ID: "graph", Name: "Graph"},
},
Extensions: plugins.ExtensionsDependencies{
ExposedComponents: []string{},

1
pkg/plugins/models.go
Unescape View File

@ -177,7 +177,6 @@ type Dependency struct {
ID string `json:"id"`
Type string `json:"type"`
Name string `json:"name"`
Version string `json:"version"`
}
type BuildInfo struct {

4
pkg/plugins/plugins_test.go
Unescape View File

@ -64,8 +64,8 @@ func Test_ReadPluginJSON(t *testing.T) {
Dependencies: Dependencies{
GrafanaVersion: "3.x.x",
Plugins: []Dependency{
{Type: "datasource", ID: "graphite", Name: "Graphite", Version: "1.0.0"},
{Type: "panel", ID: "graph", Name: "Graph", Version: "1.0.0"},
{Type: "datasource", ID: "graphite", Name: "Graphite"},
{Type: "panel", ID: "graph", Name: "Graph"},
},
Extensions: ExtensionsDependencies{
ExposedComponents: []string{},

1
pkg/plugins/storage/fs.go
Unescape View File

@ -54,7 +54,6 @@ func (fs *FS) Extract(ctx context.Context, pluginID string, dirNameFunc DirNameG
for _, plugin := range pluginJSON.Dependencies.Plugins {
deps = append(deps, &Dependency{
ID: plugin.ID,
Version: plugin.Version,
})
}

1
pkg/plugins/storage/models.go
Unescape View File

@ -19,5 +19,4 @@ type ExtractedPluginArchive struct {
type Dependency struct {
ID string
Version string
}

12
pkg/services/pluginsintegration/loader/loader_test.go
Unescape View File

@ -165,8 +165,8 @@ func TestLoader_Load(t *testing.T) {
Dependencies: plugins.Dependencies{
GrafanaVersion: "3.x.x",
Plugins: []plugins.Dependency{
{Type: "datasource", ID: "graphite", Name: "Graphite", Version: "1.0.0"},
{Type: "panel", ID: "graph", Name: "Graph", Version: "1.0.0"},
{Type: "datasource", ID: "graphite", Name: "Graphite"},
{Type: "panel", ID: "graph", Name: "Graph"},
},
Extensions: plugins.ExtensionsDependencies{
ExposedComponents: []string{},
@ -979,8 +979,8 @@ func TestLoader_Load_DuplicatePlugins(t *testing.T) {
Dependencies: plugins.Dependencies{
GrafanaVersion: "3.x.x",
Plugins: []plugins.Dependency{
{Type: "datasource", ID: "graphite", Name: "Graphite", Version: "1.0.0"},
{Type: "panel", ID: "graph", Name: "Graph", Version: "1.0.0"},
{Type: "datasource", ID: "graphite", Name: "Graphite"},
{Type: "panel", ID: "graph", Name: "Graph"},
},
Extensions: plugins.ExtensionsDependencies{
ExposedComponents: []string{},
@ -1071,8 +1071,8 @@ func TestLoader_Load_SkipUninitializedPlugins(t *testing.T) {
Dependencies: plugins.Dependencies{
GrafanaVersion: "3.x.x",
Plugins: []plugins.Dependency{
{Type: "datasource", ID: "graphite", Name: "Graphite", Version: "1.0.0"},
{Type: "panel", ID: "graph", Name: "Graph", Version: "1.0.0"},
{Type: "datasource", ID: "graphite", Name: "Graphite"},
{Type: "panel", ID: "graph", Name: "Graph"},
},
Extensions: plugins.ExtensionsDependencies{
ExposedComponents: []string{},

Write Preview
Loading…
Cancel
Save