From 7694b78456e259960f5d47514ce062c6f6f5d9c8 Mon Sep 17 00:00:00 2001
From: Will Browne <wbrowne@users.noreply.github.com>
Date: Fri, 4 Mar 2022 15:26:35 +0100
Subject: [PATCH] mv and refactor (#46242)

---
 pkg/plugins/backend_utils.go                  | 31 -----------------
 .../backendplugin/provider/provider.go        | 33 ++++++++++++++++---
 2 files changed, 29 insertions(+), 35 deletions(-)
 delete mode 100644 pkg/plugins/backend_utils.go

diff --git a/pkg/plugins/backend_utils.go b/pkg/plugins/backend_utils.go
deleted file mode 100644
index 075635e9ef4..00000000000
--- a/pkg/plugins/backend_utils.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package plugins
-
-import (
-	"fmt"
-	"runtime"
-	"strings"
-)
-
-func ComposePluginStartCommand(executable string) string {
-	os := strings.ToLower(runtime.GOOS)
-	arch := runtime.GOARCH
-	extension := ""
-
-	if os == "windows" {
-		extension = ".exe"
-	}
-
-	return fmt.Sprintf("%s_%s_%s%s", executable, os, strings.ToLower(arch), extension)
-}
-
-func ComposeRendererStartCommand() string {
-	os := strings.ToLower(runtime.GOOS)
-	arch := runtime.GOARCH
-	extension := ""
-
-	if os == "windows" {
-		extension = ".exe"
-	}
-
-	return fmt.Sprintf("%s_%s_%s%s", "plugin_start", os, strings.ToLower(arch), extension)
-}
diff --git a/pkg/plugins/backendplugin/provider/provider.go b/pkg/plugins/backendplugin/provider/provider.go
index 4a8a18c4c9a..406f1f70639 100644
--- a/pkg/plugins/backendplugin/provider/provider.go
+++ b/pkg/plugins/backendplugin/provider/provider.go
@@ -2,7 +2,10 @@ package provider
 
 import (
 	"context"
+	"fmt"
 	"path/filepath"
+	"runtime"
+	"strings"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/plugins"
@@ -45,8 +48,7 @@ var RendererProvider PluginBackendProvider = func(_ context.Context, p *plugins.
 	if !p.IsRenderer() {
 		return nil
 	}
-	cmd := plugins.ComposeRendererStartCommand()
-	return grpcplugin.NewRendererPlugin(p.ID, filepath.Join(p.PluginDir, cmd),
+	return grpcplugin.NewRendererPlugin(p.ID, filepath.Join(p.PluginDir, rendererStartCmd()),
 		func(pluginID string, renderer pluginextensionv2.RendererPlugin, logger log.Logger) error {
 			p.Renderer = renderer
 			return nil
@@ -56,6 +58,29 @@ var RendererProvider PluginBackendProvider = func(_ context.Context, p *plugins.
 
 var DefaultProvider PluginBackendProvider = func(_ context.Context, p *plugins.Plugin) backendplugin.PluginFactoryFunc {
 	// TODO check for executable
-	cmd := plugins.ComposePluginStartCommand(p.Executable)
-	return grpcplugin.NewBackendPlugin(p.ID, filepath.Join(p.PluginDir, cmd))
+	return grpcplugin.NewBackendPlugin(p.ID, filepath.Join(p.PluginDir, pluginStartCmd(p.Executable)))
+}
+
+func pluginStartCmd(executable string) string {
+	os := strings.ToLower(runtime.GOOS)
+	arch := runtime.GOARCH
+	extension := ""
+
+	if os == "windows" {
+		extension = ".exe"
+	}
+
+	return fmt.Sprintf("%s_%s_%s%s", executable, os, strings.ToLower(arch), extension)
+}
+
+func rendererStartCmd() string {
+	os := strings.ToLower(runtime.GOOS)
+	arch := runtime.GOARCH
+	extension := ""
+
+	if os == "windows" {
+		extension = ".exe"
+	}
+
+	return fmt.Sprintf("%s_%s_%s%s", "plugin_start", os, strings.ToLower(arch), extension)
 }