Folder Permissions tweak

internal/service/folders.go

@@ -82,7 +82,11 @@ func (s *DashNGoImpl) DownloadFolderPermissions(filter filters.Filter) []string
 			slog.Error("Unable to marshall file", "err", err, "folderName", folder.Title)
 			continue
 		}
-		dsPath := buildResourcePath(slug.Make(folder.UID), config.FolderPermissionResource)
+		fileName := folder.NestedPath
+		if fileName == "" {
+			fileName = folder.Title
+		}
+		dsPath := buildResourcePath(slug.Make(fileName), config.FolderPermissionResource)
 		if err = s.storage.WriteFile(dsPath, dsPacked); err != nil {
 			slog.Error("Unable to write file", "err", err.Error(), "filename", slug.Make(folder.Title))
 		} else {

test/common_test.go

@@ -28,8 +28,7 @@ func TestMain(m *testing.M) {
 	testModes := []string{"basicAuth", "token"}
 	if os.Getenv("DEVELOPER") == "1" {
 		slog.Debug("Limiting to single testMode and grafana version", slog.Any("grafanaVersion", grafanaTestVersions[1]), slog.String("testMode", testModes[0]))
-		// grafanaTestVersions = grafanaTestVersions[1:]
-		grafanaTestVersions = grafanaTestVersions[0:1]
+		grafanaTestVersions = grafanaTestVersions[1:]
 		// testModes = testModes[0:1]
 	}
 

test/folder_integration_test.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/gosimple/slug"
+
 	"github.com/testcontainers/testcontainers-go"
 
 	"github.com/esnet/gdg/internal/types"
@@ -70,7 +72,7 @@ func TestFolderPermissions(t *testing.T) {
 	data := apiClient.DownloadFolderPermissions(nil)
 	assert.Equal(t, len(data), 2)
 	permissionKeys := lo.Map(slices.Collect(maps.Keys(result)), func(item *types.FolderDetails, index int) string {
-		return fmt.Sprintf("test/data/org_main-org/folders-permissions/%s.json", strings.ToLower(item.UID))
+		return fmt.Sprintf("test/data/org_main-org/folders-permissions/%s.json", slug.Make(item.NestedPath))
 	})
 	for _, item := range data {
 		assert.True(t, slices.Contains(permissionKeys, item))
@@ -116,7 +118,7 @@ func TestFolderNestedPermissions(t *testing.T) {
 	data := apiClient.DownloadFolderPermissions(nil)
 	assert.Equal(t, len(data), 4)
 	permissionKeys := lo.Map(slices.Collect(maps.Keys(result)), func(item *types.FolderDetails, index int) string {
-		return fmt.Sprintf("test/data/org_testing/folders-permissions/%s.json", strings.ToLower(item.UID))
+		return fmt.Sprintf("test/data/org_testing/folders-permissions/%s.json", slug.Make(item.NestedPath))
 	})
 	for _, item := range data {
 		assert.True(t, slices.Contains(permissionKeys, item))