IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

build paths in an os independent way (#29143)

Browse Source 
Use filepath instead of path to manipulate filename paths in a way compatible with the target operating system-defined file paths.
This commit is contained in:
Andrew Mattheisen
2020-11-17 01:03:16 -06:00
committed by GitHub
parent 4f9123ebe2
commit 4430ca2317
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/services/provisioning/provisioning.go
View File

@@ -2,7 +2,7 @@ package provisioning
import ( import (
"context" "context"
"path" "path/filepath"
"sync" "sync"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
@@ -115,25 +115,25 @@ func (ps *provisioningServiceImpl) Run(ctx context.Context) error {
} }
func (ps *provisioningServiceImpl) ProvisionDatasources() error { func (ps *provisioningServiceImpl) ProvisionDatasources() error {
datasourcePath := path.Join(ps.Cfg.ProvisioningPath, "datasources") datasourcePath := filepath.Join(ps.Cfg.ProvisioningPath, "datasources")
err := ps.provisionDatasources(datasourcePath) err := ps.provisionDatasources(datasourcePath)
return errutil.Wrap("Datasource provisioning error", err) return errutil.Wrap("Datasource provisioning error", err)
} }
func (ps *provisioningServiceImpl) ProvisionPlugins() error { func (ps *provisioningServiceImpl) ProvisionPlugins() error {
appPath := path.Join(ps.Cfg.ProvisioningPath, "plugins") appPath := filepath.Join(ps.Cfg.ProvisioningPath, "plugins")
err := ps.provisionPlugins(appPath) err := ps.provisionPlugins(appPath)
return errutil.Wrap("app provisioning error", err) return errutil.Wrap("app provisioning error", err)
} }
func (ps *provisioningServiceImpl) ProvisionNotifications() error { func (ps *provisioningServiceImpl) ProvisionNotifications() error {
alertNotificationsPath := path.Join(ps.Cfg.ProvisioningPath, "notifiers") alertNotificationsPath := filepath.Join(ps.Cfg.ProvisioningPath, "notifiers")
err := ps.provisionNotifiers(alertNotificationsPath) err := ps.provisionNotifiers(alertNotificationsPath)
return errutil.Wrap("Alert notification provisioning error", err) return errutil.Wrap("Alert notification provisioning error", err)
} }
func (ps *provisioningServiceImpl) ProvisionDashboards() error { func (ps *provisioningServiceImpl) ProvisionDashboards() error {
dashboardPath := path.Join(ps.Cfg.ProvisioningPath, "dashboards") dashboardPath := filepath.Join(ps.Cfg.ProvisioningPath, "dashboards")
dashProvisioner, err := ps.newDashboardProvisioner(dashboardPath) dashProvisioner, err := ps.newDashboardProvisioner(dashboardPath)
if err != nil { if err != nil {
return errutil.Wrap("Failed to create provisioner", err) return errutil.Wrap("Failed to create provisioner", err)