From 5430b1412f5b2bc8933ae00b8e1648cba3f5b789 Mon Sep 17 00:00:00 2001
From: Will Browne <wbrowne@users.noreply.github.com>
Date: Wed, 27 Mar 2024 15:52:09 +0100
Subject: [PATCH] [v10.4.x] Plugins: Pass PDC info as file paths (#85279)

pass PDC filepaths
---
 pkg/plugins/envvars/envvars.go      |  6 +++---
 pkg/plugins/envvars/envvars_test.go | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkg/plugins/envvars/envvars.go b/pkg/plugins/envvars/envvars.go
index 9b343281b47..0871adfb855 100644
--- a/pkg/plugins/envvars/envvars.go
+++ b/pkg/plugins/envvars/envvars.go
@@ -150,9 +150,9 @@ func (s *Service) GetConfigMap(ctx context.Context, pluginID string, _ *auth.Ext
 
 	if s.cfg.ProxySettings.Enabled {
 		m[proxy.PluginSecureSocksProxyEnabled] = "true"
-		m[proxy.PluginSecureSocksProxyClientCert] = s.cfg.ProxySettings.ClientCert
-		m[proxy.PluginSecureSocksProxyClientKey] = s.cfg.ProxySettings.ClientKey
-		m[proxy.PluginSecureSocksProxyRootCAs] = strings.Join(s.cfg.ProxySettings.RootCAs, " ")
+		m[proxy.PluginSecureSocksProxyClientCert] = s.cfg.ProxySettings.ClientCertFilePath
+		m[proxy.PluginSecureSocksProxyClientKey] = s.cfg.ProxySettings.ClientKeyFilePath
+		m[proxy.PluginSecureSocksProxyRootCAs] = strings.Join(s.cfg.ProxySettings.RootCAFilePaths, " ")
 		m[proxy.PluginSecureSocksProxyProxyAddress] = s.cfg.ProxySettings.ProxyAddress
 		m[proxy.PluginSecureSocksProxyServerName] = s.cfg.ProxySettings.ServerName
 		m[proxy.PluginSecureSocksProxyAllowInsecure] = strconv.FormatBool(s.cfg.ProxySettings.AllowInsecure)
diff --git a/pkg/plugins/envvars/envvars_test.go b/pkg/plugins/envvars/envvars_test.go
index 9e626fe532f..3b99feaec56 100644
--- a/pkg/plugins/envvars/envvars_test.go
+++ b/pkg/plugins/envvars/envvars_test.go
@@ -682,22 +682,22 @@ func TestService_GetConfigMap(t *testing.T) {
 			cfg: &config.Cfg{
 				Features: featuremgmt.WithFeatures("feat-2", "feat-500", "feat-1"),
 				ProxySettings: setting.SecureSocksDSProxySettings{
-					Enabled:       true,
-					ShowUI:        true,
-					ClientCert:    "c3rt",
-					ClientKey:     "k3y",
-					RootCAs:       []string{"ca"},
-					ProxyAddress:  "https://proxy.grafana.com",
-					ServerName:    "secureProxy",
-					AllowInsecure: true,
+					Enabled:            true,
+					ShowUI:             true,
+					ClientCertFilePath: "./c3rt",
+					ClientKeyFilePath:  "./k3y",
+					RootCAFilePaths:    []string{"./ca"},
+					ProxyAddress:       "https://proxy.grafana.com",
+					ServerName:         "secureProxy",
+					AllowInsecure:      true,
 				},
 			},
 			expected: map[string]string{
 				"GF_INSTANCE_FEATURE_TOGGLES_ENABLE":              "feat-1,feat-2,feat-500",
 				"GF_SECURE_SOCKS_DATASOURCE_PROXY_SERVER_ENABLED": "true",
-				"GF_SECURE_SOCKS_DATASOURCE_PROXY_CLIENT_CERT":    "c3rt",
-				"GF_SECURE_SOCKS_DATASOURCE_PROXY_CLIENT_KEY":     "k3y",
-				"GF_SECURE_SOCKS_DATASOURCE_PROXY_ROOT_CA_CERT":   "ca",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_CLIENT_CERT":    "./c3rt",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_CLIENT_KEY":     "./k3y",
+				"GF_SECURE_SOCKS_DATASOURCE_PROXY_ROOT_CA_CERT":   "./ca",
 				"GF_SECURE_SOCKS_DATASOURCE_PROXY_PROXY_ADDRESS":  "https://proxy.grafana.com",
 				"GF_SECURE_SOCKS_DATASOURCE_PROXY_SERVER_NAME":    "secureProxy",
 				"GF_SECURE_SOCKS_DATASOURCE_PROXY_ALLOW_INSECURE": "true",