Kaynağa Gözat

Revert "provisioning: turn relative symlinked path into absolut paths"

This reverts commit d089b5e05dccfd60d49b802be3a28ec3530fb0e8.
bergquist 7 yıl önce
ebeveyn
işleme
cd4026da6b

+ 0 - 9
pkg/services/provisioning/dashboards/file_reader.go

@@ -48,25 +48,16 @@ func NewDashboardFileReader(cfg *DashboardsAsConfig, log log.Logger) (*fileReade
 	}
 
 	copy := path
-
-	// get absolut path of config file
 	path, err := filepath.Abs(path)
 	if err != nil {
 		log.Error("Could not create absolute path ", "path", path)
 	}
 
-	// follow the symlink to get the real path
 	path, err = filepath.EvalSymlinks(path)
 	if err != nil {
 		log.Error("Failed to read content of symlinked path: %s", path)
 	}
 
-	// get the absolut path in case the symlink is relative
-	path, err = filepath.Abs(path)
-	if err != nil {
-		log.Error("Could not create absolute path ", "path", path)
-	}
-
 	if path == "" {
 		path = copy
 		log.Info("falling back to original path due to EvalSymlink/Abs failure")