Provisioning: Fix dual write of folders (#80140)

* Provisioning: Store folders in folders table

* Solve linting issues

* Remove a comment
This commit is contained in:
Tania
2024-01-10 16:48:28 +01:00
committed by GitHub
parent 6be6724433
commit 744c1032ee
14 changed files with 342 additions and 153 deletions
+4 -1
View File
@@ -10,6 +10,7 @@ import (
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/folder"
"github.com/grafana/grafana/pkg/setting"
@@ -177,10 +178,12 @@ func (ss *sqlStore) Get(ctx context.Context, q folder.GetFolderQuery) (*folder.F
return folder.ErrDatabaseError.Errorf("failed to get folder: %w", err)
}
if !exists {
return folder.ErrFolderNotFound.Errorf("folder not found")
// embed dashboards.ErrFolderNotFound
return folder.ErrFolderNotFound.Errorf("%w", dashboards.ErrFolderNotFound)
}
return nil
})
return foldr.WithURL(), err
}