Plugins: Make grafana-com API URL usage consistent (#86920)

Plugins: Fix grafana-com API URL usage

pkg/plugins/config/config.go

@@ -18,7 +18,7 @@ type PluginManagementCfg struct {
 
 	PluginsCDNURLTemplate string
 
-	GrafanaComURL string
+	GrafanaComAPIURL string
 
 	GrafanaAppURL string
 
@@ -37,7 +37,7 @@ type Features struct {
 // NewPluginManagementCfg returns a new PluginManagementCfg.
 func NewPluginManagementCfg(devMode bool, pluginsPath string, pluginSettings setting.PluginSettings, pluginsAllowUnsigned []string,
 	pluginsCDNURLTemplate string, appURL string, features Features, angularSupportEnabled bool,
-	grafanaComURL string, disablePlugins []string, hideAngularDeprecation []string, forwardHostEnvVars []string,
+	grafanaComAPIURL string, disablePlugins []string, hideAngularDeprecation []string, forwardHostEnvVars []string,
 ) *PluginManagementCfg {
 	return &PluginManagementCfg{
 		PluginsPath:            pluginsPath,
@@ -46,7 +46,7 @@ func NewPluginManagementCfg(devMode bool, pluginsPath string, pluginSettings set
 		PluginsAllowUnsigned:   pluginsAllowUnsigned,
 		DisablePlugins:         disablePlugins,
 		PluginsCDNURLTemplate:  pluginsCDNURLTemplate,
-		GrafanaComURL:          grafanaComURL,
+		GrafanaComAPIURL:       grafanaComAPIURL,
 		GrafanaAppURL:          appURL,
 		Features:               features,
 		AngularSupportEnabled:  angularSupportEnabled,

pkg/plugins/repo/service.go

@@ -22,7 +22,7 @@ type Manager struct {
 }
 
 func ProvideService(cfg *config.PluginManagementCfg) (*Manager, error) {
-	baseURL, err := url.JoinPath(cfg.GrafanaComURL, "/api/plugins")
+	baseURL, err := url.JoinPath(cfg.GrafanaComAPIURL, "/plugins")
 	if err != nil {
 		return nil, err
 	}