Add folder logic for pull workflow

Author: Patrick-Eichhorn

pkg/plugin/git_api.go

@@ -166,34 +166,53 @@ func (gitApi GitApi) PullRepo(repository git.Repository) {
 }
 
 // GetFileContent get the given content of a file from the in memory filesystem
-func (gitApi GitApi) GetFileContent() map[string][]byte {
-	// read current in memory filesystem
-	files, err := gitApi.inMemoryFileSystem.ReadDir("./")
+func (gitApi GitApi) GetFileContent() map[string]map[string][]byte {
+	// read current in memory filesystem to get dirs
+	filesOrDirs, err := gitApi.inMemoryFileSystem.ReadDir("./")
 	if err != nil {
 		log.DefaultLogger.Error("inMemoryFileSystem error" , "error", err)
 		return nil
 	}
 
-	fileMap := make(map[string][]byte)
+	var dirMap []string
 
-	for _, file := range files {
-		log.DefaultLogger.Debug("File name", "name", file.Name())
-		if file.IsDir() {
-			continue
+	for _, fileOrDir := range filesOrDirs {
+		if fileOrDir.IsDir() {
+			dirName := fileOrDir.Name()
+			dirMap = append(dirMap, dirName)
 		}
+	}
 
-		src, err := gitApi.inMemoryFileSystem.Open(file.Name())
+	fileMap := make(map[string]map[string][]byte)
 
+	for _, dir := range dirMap {
+		// read current in memory filesystem to get files
+		files, err := gitApi.inMemoryFileSystem.ReadDir("./" + dir + "/")
 		if err != nil {
-			log.DefaultLogger.Error("inMemoryFileSystem error" , "error", err)
+			log.DefaultLogger.Error("inMemoryFileSystem error", "error", err)
 			return nil
 		}
-		byteFile, err := ioutil.ReadAll(src)
-		if err != nil {
-			log.DefaultLogger.Error("read error" , "error", err)
-		} else {
-			fileMap[file.Name()] = byteFile
-			src.Close()
+
+		for _, file := range files {
+
+			if file.IsDir() {
+				continue
+			}
+
+			src, err := gitApi.inMemoryFileSystem.Open(file.Name())
+
+			if err != nil {
+				log.DefaultLogger.Error("inMemoryFileSystem error", "error", err)
+				return nil
+			}
+			byteFile, err := ioutil.ReadAll(src)
+			if err != nil {
+				log.DefaultLogger.Error("read error", "error", err)
+			} else {
+				fileMap[dir] = make(map[string][]byte)
+				fileMap[dir][file.Name()] = byteFile
+				src.Close()
+			}
 		}
 	}
 	return fileMap

pkg/plugin/grafana_api.go

@@ -47,14 +47,48 @@ func (grafanaApi GrafanaApi) UpdateDashboardObjectByID(dashboard sdk.Board, fold
 	return statusMessage, err
 }
 
+// CreateFolder create a folder in Grafana
+func (grafanaApi GrafanaApi) CreateFolder(folderName string) int {
+	folder := sdk.Folder{Title: folderName}
+	folder, err := grafanaApi.grafanaClient.CreateFolder(context.Background(), folder)
+	if err != nil {
+		log.DefaultLogger.Error("get folders error", "error", err.Error())
+	}
+	return folder.ID
+}
+
+// GetOrCreateFolderID returns the ID of a given folder or create it
+func (grafanaApi GrafanaApi) GetOrCreateFolderID(folderName string) int {
+	folders, err := grafanaApi.grafanaClient.GetAllFolders(context.Background())
+	if err != nil {
+		log.DefaultLogger.Error("get folders error", "error", err.Error())
+	}
+	for _, folder := range folders {
+		if folder.Title == folderName {
+			return folder.ID
+		}
+	}
+	generatedFolderID := grafanaApi.CreateFolder(folderName)
+	return generatedFolderID
+}
+
 // CreateDashboardObjects set a Dashboard with the given raw dashboard object
-func (grafanaApi GrafanaApi) CreateDashboardObjects(fileMap map[string][]byte) {
-	for dashboardName, rawDashboard := range fileMap {
-		_, err := grafanaApi.grafanaClient.SetRawDashboard(context.Background(), rawDashboard)
-		if err != nil {
-			log.DefaultLogger.Error("set dashboard error", "error", err.Error())
+func (grafanaApi GrafanaApi) CreateDashboardObjects(fileMap map[string]map[string][]byte) {
+	for dashboardDir, dashboardFile := range fileMap {
+		dirID := grafanaApi.GetOrCreateFolderID(dashboardDir)
+		for dashboardName, rawDashboard := range dashboardFile {
+			_, err := grafanaApi.grafanaClient.SetRawDashboardWithParam(context.Background(), sdk.RawBoardRequest{
+				Dashboard: rawDashboard,
+				Parameters: sdk.SetDashboardParams{
+					Overwrite: false,
+					FolderID:  dirID,
+				},
+			})
+			if err != nil {
+				log.DefaultLogger.Error("set dashboard error", "error", err.Error())
+			}
+			log.DefaultLogger.Info("Dashboard created", "name", dashboardName)
 		}
-		log.DefaultLogger.Info("Dashboard created", "name", dashboardName)
 	}
 }