From 4430ca2317b739ea9f365d5dfdaa63a7ccbdaf99 Mon Sep 17 00:00:00 2001 From: Andrew Mattheisen Date: Tue, 17 Nov 2020 01:03:16 -0600 Subject: [PATCH] build paths in an os independent way (#29143) Use filepath instead of path to manipulate filename paths in a way compatible with the target operating system-defined file paths. --- pkg/services/provisioning/provisioning.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/services/provisioning/provisioning.go b/pkg/services/provisioning/provisioning.go index 94c108d16d7..1c9a3003611 100644 --- a/pkg/services/provisioning/provisioning.go +++ b/pkg/services/provisioning/provisioning.go @@ -2,7 +2,7 @@ package provisioning import ( "context" - "path" + "path/filepath" "sync" "github.com/grafana/grafana/pkg/infra/log" @@ -115,25 +115,25 @@ func (ps *provisioningServiceImpl) Run(ctx context.Context) error { } func (ps *provisioningServiceImpl) ProvisionDatasources() error { - datasourcePath := path.Join(ps.Cfg.ProvisioningPath, "datasources") + datasourcePath := filepath.Join(ps.Cfg.ProvisioningPath, "datasources") err := ps.provisionDatasources(datasourcePath) return errutil.Wrap("Datasource provisioning error", err) } func (ps *provisioningServiceImpl) ProvisionPlugins() error { - appPath := path.Join(ps.Cfg.ProvisioningPath, "plugins") + appPath := filepath.Join(ps.Cfg.ProvisioningPath, "plugins") err := ps.provisionPlugins(appPath) return errutil.Wrap("app provisioning error", err) } func (ps *provisioningServiceImpl) ProvisionNotifications() error { - alertNotificationsPath := path.Join(ps.Cfg.ProvisioningPath, "notifiers") + alertNotificationsPath := filepath.Join(ps.Cfg.ProvisioningPath, "notifiers") err := ps.provisionNotifiers(alertNotificationsPath) return errutil.Wrap("Alert notification provisioning error", err) } func (ps *provisioningServiceImpl) ProvisionDashboards() error { - dashboardPath := path.Join(ps.Cfg.ProvisioningPath, "dashboards") + dashboardPath := filepath.Join(ps.Cfg.ProvisioningPath, "dashboards") dashProvisioner, err := ps.newDashboardProvisioner(dashboardPath) if err != nil { return errutil.Wrap("Failed to create provisioner", err)