From d11f8c7bc37ddbde5ab265bcdd7d86b1a7ed3993 Mon Sep 17 00:00:00 2001 From: jackyin Date: Thu, 1 Aug 2024 18:47:11 +0800 Subject: [PATCH] Plugins: Ensure grafana cli can install multiple plugin dependencies (#91230) * fix cli can only install one dep * handle error --- pkg/cmd/grafana-cli/commands/install_command.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go index ed82430edbe..bb39301cd40 100644 --- a/pkg/cmd/grafana-cli/commands/install_command.go +++ b/pkg/cmd/grafana-cli/commands/install_command.go @@ -152,11 +152,14 @@ 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) - return doInstallPlugin(ctx, dep.ID, dep.Version, pluginInstallOpts{ + err = doInstallPlugin(ctx, dep.ID, dep.Version, pluginInstallOpts{ insecure: o.insecure, repoURL: o.repoURL, pluginDir: o.pluginDir, }, installing) + if err != nil { + return err + } } return nil }