mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
parent
d5aeae3a90
commit
47d3884377
@ -47,6 +47,11 @@ func NewDashboardFileReader(cfg *DashboardsAsConfig, log log.Logger) (*fileReade
|
|||||||
log.Error("Cannot read directory", "error", err)
|
log.Error("Cannot read directory", "error", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
path, err := filepath.EvalSymlinks(path)
|
||||||
|
if err != nil {
|
||||||
|
log.Error("Failed to read content of symlinked path: %s", path)
|
||||||
|
}
|
||||||
|
|
||||||
absPath, err := filepath.Abs(path)
|
absPath, err := filepath.Abs(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Could not create absolute path ", "path", path)
|
log.Error("Could not create absolute path ", "path", path)
|
||||||
|
@ -0,0 +1,39 @@
|
|||||||
|
// +build linux
|
||||||
|
|
||||||
|
package dashboards
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/grafana/grafana/pkg/log"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
symlinkedFolder = "testdata/test-dashboards/symlink"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestProvsionedSymlinkedFolder(t *testing.T) {
|
||||||
|
cfg := &DashboardsAsConfig{
|
||||||
|
Name: "Default",
|
||||||
|
Type: "file",
|
||||||
|
OrgId: 1,
|
||||||
|
Folder: "",
|
||||||
|
Options: map[string]interface{}{"path": symlinkedFolder},
|
||||||
|
}
|
||||||
|
|
||||||
|
reader, err := NewDashboardFileReader(cfg, log.New("test-logger"))
|
||||||
|
if err != nil {
|
||||||
|
t.Error("expected err to be nil")
|
||||||
|
}
|
||||||
|
|
||||||
|
want, err := filepath.Abs(containingId)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("expected err to be nill")
|
||||||
|
}
|
||||||
|
|
||||||
|
if reader.Path != want {
|
||||||
|
t.Errorf("got %s want %s", reader.Path, want)
|
||||||
|
}
|
||||||
|
}
|
1
pkg/services/provisioning/dashboards/testdata/test-dashboards/symlink
vendored
Symbolic link
1
pkg/services/provisioning/dashboards/testdata/test-dashboards/symlink
vendored
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
containing-id/
|
Loading…
Reference in New Issue
Block a user