|
|
@@ -2,6 +2,7 @@ package datasources
|
|
|
|
|
|
import (
|
|
|
"io/ioutil"
|
|
|
+ "os"
|
|
|
"path/filepath"
|
|
|
"strings"
|
|
|
|
|
|
@@ -24,13 +25,7 @@ func (cr *configReader) readConfig(path string) ([]*DatasourcesAsConfig, error)
|
|
|
|
|
|
for _, file := range files {
|
|
|
if strings.HasSuffix(file.Name(), ".yaml") || strings.HasSuffix(file.Name(), ".yml") {
|
|
|
- filename, _ := filepath.Abs(filepath.Join(path, file.Name()))
|
|
|
- yamlFile, err := ioutil.ReadFile(filename)
|
|
|
- if err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
-
|
|
|
- datasource, err := parseDatasourceConfig(yamlFile)
|
|
|
+ datasource, err := cr.parseDatasourceConfig(path, file)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
@@ -49,7 +44,13 @@ func (cr *configReader) readConfig(path string) ([]*DatasourcesAsConfig, error)
|
|
|
return datasources, nil
|
|
|
}
|
|
|
|
|
|
-func parseDatasourceConfig(yamlFile []byte) (*DatasourcesAsConfig, error) {
|
|
|
+func (cr *configReader) parseDatasourceConfig(path string, file os.FileInfo) (*DatasourcesAsConfig, error) {
|
|
|
+ filename, _ := filepath.Abs(filepath.Join(path, file.Name()))
|
|
|
+ yamlFile, err := ioutil.ReadFile(filename)
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
+ }
|
|
|
+
|
|
|
var apiVersion *ConfigVersion
|
|
|
err := yaml.Unmarshal(yamlFile, &apiVersion)
|
|
|
if err != nil {
|
|
|
@@ -62,8 +63,8 @@ func parseDatasourceConfig(yamlFile []byte) (*DatasourcesAsConfig, error) {
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
- return v1.mapToDatasourceFromConfig(apiVersion.ApiVersion), nil
|
|
|
|
|
|
+ return v1.mapToDatasourceFromConfig(apiVersion.ApiVersion), nil
|
|
|
}
|
|
|
|
|
|
var v0 *DatasourcesAsConfigV0
|
|
|
@@ -71,6 +72,9 @@ func parseDatasourceConfig(yamlFile []byte) (*DatasourcesAsConfig, error) {
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
+
|
|
|
+ cr.log.Warn("[Deprecated] the datasource provisioning config is outdated. please upgrade", "filename", filename)
|
|
|
+
|
|
|
return v0.mapToDatasourceFromConfig(apiVersion.ApiVersion), nil
|
|
|
}
|
|
|
|