From 84de76ff0a08f7de97836a5b93db29eeb7832d63 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 13 Feb 2018 15:02:27 +0100
Subject: [PATCH] provisioning: code formating

---
 .../provisioning/dashboards/config_reader.go  |  2 +-
 pkg/services/provisioning/dashboards/types.go | 74 +++++++++----------
 .../provisioning/datasources/config_reader.go |  2 +-
 3 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/pkg/services/provisioning/dashboards/config_reader.go b/pkg/services/provisioning/dashboards/config_reader.go
index 183c6e2adb2..9030ba609b9 100644
--- a/pkg/services/provisioning/dashboards/config_reader.go
+++ b/pkg/services/provisioning/dashboards/config_reader.go
@@ -46,7 +46,7 @@ func (cr *configReader) parseConfigs(file os.FileInfo) ([]*DashboardsAsConfig, e
 
 		if v0 != nil {
 			cr.log.Warn("[Deprecated] the dashboard provisioning config is outdated. please upgrade", "filename", filename)
-			return convertv0ToDashboardAsConfig(v0), nil
+			return mapV0ToDashboardAsConfig(v0), nil
 		}
 	}
 
diff --git a/pkg/services/provisioning/dashboards/types.go b/pkg/services/provisioning/dashboards/types.go
index 160188f81db..0fdc7b0c3ca 100644
--- a/pkg/services/provisioning/dashboards/types.go
+++ b/pkg/services/provisioning/dashboards/types.go
@@ -27,51 +27,15 @@ type DashboardsAsConfigV0 struct {
 	Options  map[string]interface{} `json:"options" yaml:"options"`
 }
 
-func convertv0ToDashboardAsConfig(v0 []*DashboardsAsConfigV0) []*DashboardsAsConfig {
-	var r []*DashboardsAsConfig
-
-	for _, v := range v0 {
-		r = append(r, &DashboardsAsConfig{
-			Name:     v.Name,
-			Type:     v.Type,
-			OrgId:    v.OrgId,
-			Folder:   v.Folder,
-			Editable: v.Editable,
-			Options:  v.Options,
-		})
-	}
-
-	return r
-}
-
 type ConfigVersion struct {
 	ApiVersion int64 `json:"apiVersion" yaml:"apiVersion"`
 }
 
 type DashboardAsConfigV1 struct {
-	ApiVersion int64 `json:"apiVersion" yaml:"apiVersion"`
-
-	Providers []*DashboardSource `json:"providers" yaml:"providers"`
+	Providers []*DashboardProviderConfigs `json:"providers" yaml:"providers"`
 }
 
-func (dc *DashboardAsConfigV1) mapToDashboardAsConfig() []*DashboardsAsConfig {
-	var r []*DashboardsAsConfig
-
-	for _, v := range dc.Providers {
-		r = append(r, &DashboardsAsConfig{
-			Name:     v.Name,
-			Type:     v.Type,
-			OrgId:    v.OrgId,
-			Folder:   v.Folder,
-			Editable: v.Editable,
-			Options:  v.Options,
-		})
-	}
-
-	return r
-}
-
-type DashboardSource struct {
+type DashboardProviderConfigs struct {
 	Name     string                 `json:"name" yaml:"name"`
 	Type     string                 `json:"type" yaml:"type"`
 	OrgId    int64                  `json:"orgId" yaml:"orgId"`
@@ -98,3 +62,37 @@ func createDashboardJson(data *simplejson.Json, lastModified time.Time, cfg *Das
 
 	return dash, nil
 }
+
+func mapV0ToDashboardAsConfig(v0 []*DashboardsAsConfigV0) []*DashboardsAsConfig {
+	var r []*DashboardsAsConfig
+
+	for _, v := range v0 {
+		r = append(r, &DashboardsAsConfig{
+			Name:     v.Name,
+			Type:     v.Type,
+			OrgId:    v.OrgId,
+			Folder:   v.Folder,
+			Editable: v.Editable,
+			Options:  v.Options,
+		})
+	}
+
+	return r
+}
+
+func (dc *DashboardAsConfigV1) mapToDashboardAsConfig() []*DashboardsAsConfig {
+	var r []*DashboardsAsConfig
+
+	for _, v := range dc.Providers {
+		r = append(r, &DashboardsAsConfig{
+			Name:     v.Name,
+			Type:     v.Type,
+			OrgId:    v.OrgId,
+			Folder:   v.Folder,
+			Editable: v.Editable,
+			Options:  v.Options,
+		})
+	}
+
+	return r
+}
diff --git a/pkg/services/provisioning/datasources/config_reader.go b/pkg/services/provisioning/datasources/config_reader.go
index de1aec74b22..772436987c3 100644
--- a/pkg/services/provisioning/datasources/config_reader.go
+++ b/pkg/services/provisioning/datasources/config_reader.go
@@ -52,7 +52,7 @@ func (cr *configReader) parseDatasourceConfig(path string, file os.FileInfo) (*D
 	}
 
 	var apiVersion *ConfigVersion
-	err := yaml.Unmarshal(yamlFile, &apiVersion)
+	err = yaml.Unmarshal(yamlFile, &apiVersion)
 	if err != nil {
 		return nil, err
 	}